aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-10-08[automerger skipped] Merge "Merge Android 12" am: f601f40512 -s ours am: ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Xin Li
430a585802 -s ours am: b0ab7df290 -s ours am skip reason: Merged-In Icf7492e392cf20986990be2752e6357d4cdb352c with SHA-1 2fe8554eae is already in history Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1847313 Change-Id: I621e60e077d18aa33704b79f635f33b4000c7d23
2021-10-08[automerger skipped] Merge "Merge Android 12" am: f601f40512 -s ours am: ↵Xin Li
430a585802 -s ours am skip reason: Merged-In Icf7492e392cf20986990be2752e6357d4cdb352c with SHA-1 2fe8554eae is already in history Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1847313 Change-Id: I93bf2a928c29a8a87e185b375fdcc2c728110200
2021-10-08[automerger skipped] Merge "Merge Android 12" am: f601f40512 -s oursXin Li
am skip reason: Merged-In Icf7492e392cf20986990be2752e6357d4cdb352c with SHA-1 2fe8554eae is already in history Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1847313 Change-Id: I3aa715c5e25f32607dc96630bc0ac233c6d35b02
2021-10-07Merge "Merge Android 12"android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Xin Li
2021-10-06Merge Android 12Xin Li
Bug: 202323961 Merged-In: Icf7492e392cf20986990be2752e6357d4cdb352c Change-Id: I8980bf56fe03eb3dc5306d50d529e6417248934c
2021-09-16[automerger skipped] Add android:exported tag am: 2fe8554eae -s ours am: ↵Colin Cross
6d9b730332 -s ours am skip reason: Merged-In Icf7492e392cf20986990be2752e6357d4cdb352c with SHA-1 c61b39439e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/samples/android/+/15828964 Change-Id: I6d1577f41d4e0597864ca45205d26e70c1b99789
2021-09-16[automerger skipped] Add android:exported tag am: 2fe8554eae -s oursColin Cross
am skip reason: Merged-In Icf7492e392cf20986990be2752e6357d4cdb352c with SHA-1 c61b39439e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/samples/android/+/15828964 Change-Id: I5a798959c8bd28746b91dfcf3a0c93c1bccbe5b5
2021-09-14Add android:exported tagtemp_sam_202323961Colin Cross
These are now required to be explicitly specified for apps targetting API 31. Bug: 195988762 Test: make Change-Id: Icf7492e392cf20986990be2752e6357d4cdb352c Merged-In: Icf7492e392cf20986990be2752e6357d4cdb352c (cherry picked from commit 9a342bde5ebf5c4367346093e6c181e1749c196e)
2021-08-18Add android:exported tag am: c61b39439eColin Cross
Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/samples/android/+/15600751 Change-Id: I50bd6fafd1a7cb10fb45e54989e11ce9e4bfe56a
2021-08-17Add android:exported tagColin Cross
These are now required to be explicitly specified for apps targetting API 31. Bug: 195988762 Test: make Change-Id: Icf7492e392cf20986990be2752e6357d4cdb352c Merged-In: Icf7492e392cf20986990be2752e6357d4cdb352c (cherry picked from commit 9a342bde5ebf5c4367346093e6c181e1749c196e)
2021-04-30Merge "Convert src/main/Android.mk to Android.bp" am: 3c3a5d95b6 am: ↵Yuntao Xu
8184c3c810 am: a927501359 am: 3dbb547fc2 Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1690211 Change-Id: I82edeb768f33ccd64281cb20ea3451ad3380262f
2021-04-30Merge "Convert src/main/Android.mk to Android.bp" am: 3c3a5d95b6 am: ↵android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devYuntao Xu
8184c3c810 am: a927501359 Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1690211 Change-Id: I233f2c5cea9ef78f64d963c4a9d10234723a6676
2021-04-30Merge "Convert src/main/Android.mk to Android.bp" am: 3c3a5d95b6 am: 8184c3c810Yuntao Xu
Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1690211 Change-Id: I25e2744b0bea9fbfedf6b6d8a413554ed987ea62
2021-04-30Merge "Convert src/main/Android.mk to Android.bp" am: 3c3a5d95b6android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Yuntao Xu
Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1690211 Change-Id: Ic8c3a89b04ad07e763be1a98f534cb3efcdd815a
2021-04-30Merge "Convert src/main/Android.mk to Android.bp"android-s-beta-2android-s-beta-1Yuntao Xu
2021-04-28Convert src/main/Android.mk to Android.bpYuntao Xu
Convert the Make file to a Soong one Bug: 186677673 Test: compared the two apk files built by Make and Soong Test: TreeHugger Change-Id: I90506bd1d462f56b588907bbb8f8974a78e06229
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to developers/samples/android" am: ↵Treehugger Robot
7d23920f2b am: c0d9c71791 am: 02af27736f Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1682207 Change-Id: I294a3ec3e3279ca292fc855cd7b6b14a605d91fb
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to developers/samples/android" am: ↵Treehugger Robot
7d23920f2b am: c0d9c71791 Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1682207 Change-Id: Iee43e7fcc34efdb0d03b0d13840f527ac0f71d0f
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to developers/samples/android" am: ↵Treehugger Robot
7d23920f2b Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1682207 Change-Id: If2ac34fb2039f39f01788907ab22f233400a484a
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to developers/samples/android"Treehugger Robot
2021-04-20[LSC] Add LOCAL_LICENSE_KINDS to developers/samples/androidBob Badour
Added SPDX-license-identifier-Apache-2.0 to: security/FingerprintDialog/Application/src/main/Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I4ce8436201b26f13f926804ea91a0fed1d687893
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: ad509e0e1d -s ↵Xin Li
ours am: f547fbc1c8 -s ours am skip reason: Change-Id I0e1120aafae610027333fd7f1c995d908f6e089a with SHA-1 e581b694ac is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I17b6867153d1581f517df33a48908e9d66fb32e0
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: ad509e0e1d -s oursXin Li
am skip reason: Change-Id I0e1120aafae610027333fd7f1c995d908f6e089a with SHA-1 e581b694ac is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia416253bce1c4eaff620bdc478aedb95115317f3
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: I0e1120aafae610027333fd7f1c995d908f6e089a Change-Id: I5e282a1d9c93f15a3f2d6a3269ee96dab3b90da8
2020-11-24Mark ab/6881855 as merged am: bae055f6ff am: e581b694acXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/samples/android/+/13111968 Change-Id: I1ceff7a8db2845e677173b99545978be11a3e3b1
2020-11-24Mark ab/6881855 as merged am: bae055f6ffXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/samples/android/+/13111968 Change-Id: I0e1120aafae610027333fd7f1c995d908f6e089a
2020-11-23Mark ab/6881855 as mergedandroid-s-preview-1Xin Li
Bug: 172690556 Change-Id: Ib34a906538821d3fecbdb4dd77b8803ad2e27659
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 63bd46a79d -s ours am: ↵Xin Li
f4b69e1ffe -s ours am: 9b0c53db9a -s ours am skip reason: Change-Id I86165be8b788aaa750d9a1d00d3188801d735bd6 with SHA-1 37708888fb is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/samples/android/+/12794722 Change-Id: I4994475774c43e0798f3a202a00273e5838cdec2
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 63bd46a79d -s ours am: ↵Xin Li
f4b69e1ffe -s ours am skip reason: Change-Id I86165be8b788aaa750d9a1d00d3188801d735bd6 with SHA-1 37708888fb is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/samples/android/+/12794722 Change-Id: I8e3aaa18d7bd7c69e8b16881e1fee556dd048bfe
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 63bd46a79d -s oursXin Li
am skip reason: Change-Id I86165be8b788aaa750d9a1d00d3188801d735bd6 with SHA-1 37708888fb is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/samples/android/+/12794722 Change-Id: I89bda30ff043b812b89af06d38dedf776e44f34b
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I86165be8b788aaa750d9a1d00d3188801d735bd6 Change-Id: I4c04e98fe8861c8a6d4a007cbd15ca6973c7f53a
2020-09-11[automerger skipped] Merge "Merge Android R" am: ddb9444be0 -s ours am: ↵Xin Li
46d255c5ee -s ours am: 79e6f36845 -s ours am: c1c1d6bf6c -s ours am: 48f1fed848 -s ours am skip reason: Change-Id I3eacc623ecb0e0c2fb65633d5d6ab9df811c61dd with SHA-1 3f8d030a1f is in history Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1422288 Change-Id: Ida40da640ec072962780e7dc1c732227b4f12314
2020-09-11[automerger skipped] Merge "Merge Android R" am: ddb9444be0 -s ours am: ↵Xin Li
46d255c5ee -s ours am: 79e6f36845 -s ours am: c1c1d6bf6c -s ours am skip reason: Change-Id I3eacc623ecb0e0c2fb65633d5d6ab9df811c61dd with SHA-1 3f8d030a1f is in history Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1422288 Change-Id: Ifff2652f8c190fcc64d55adadf35cb2c19a7bc8a
2020-09-11[automerger skipped] Merge "Merge Android R" am: ddb9444be0 -s ours am: ↵Xin Li
46d255c5ee -s ours am: 79e6f36845 -s ours am skip reason: Change-Id I3eacc623ecb0e0c2fb65633d5d6ab9df811c61dd with SHA-1 3f8d030a1f is in history Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1422288 Change-Id: Ib73632928b186f77be7f9375ecd04dac50aca146
2020-09-11[automerger skipped] Merge "Merge Android R" am: ddb9444be0 -s ours am: ↵Xin Li
46d255c5ee -s ours am skip reason: Change-Id I3eacc623ecb0e0c2fb65633d5d6ab9df811c61dd with SHA-1 3f8d030a1f is in history Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1422288 Change-Id: I6a8a83d84bad18f01deb1a35f8b7c482f0af9eb8
2020-09-11[automerger skipped] Merge "Merge Android R" am: ddb9444be0 -s oursXin Li
am skip reason: Change-Id I3eacc623ecb0e0c2fb65633d5d6ab9df811c61dd with SHA-1 3f8d030a1f is in history Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1422288 Change-Id: I982ea524e06a3fa8f02850f9e6b5ddf465729d81
2020-09-10Merge "Merge Android R"Xin Li
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: I3eacc623ecb0e0c2fb65633d5d6ab9df811c61dd Change-Id: I8944af4a5023a95b2328255ab550804726d287bb
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 3f8d030a1f -s ours am: 63b8591043 -s ours am: 52d9ebfd54 -s ours am: 40bd1579bd -s ours am skip reason: Change-Id I7ebdd475c17377ecd3b6a7586442b55a12e32c37 with SHA-1 ca2402d8eb is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/samples/android/+/12469979 Change-Id: I8fe0b3cd610dbb7ebd9359e2f0fbf703a87dcdad
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 3f8d030a1f -s ours am: 63b8591043 -s ours am: 52d9ebfd54 -s ours am skip reason: Change-Id I7ebdd475c17377ecd3b6a7586442b55a12e32c37 with SHA-1 ca2402d8eb is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/samples/android/+/12469979 Change-Id: Ifae6f0e3a0c6c569f650abb0bc83f53173d92b3a
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 3f8d030a1f -s ours am: 63b8591043 -s ours am skip reason: Change-Id I7ebdd475c17377ecd3b6a7586442b55a12e32c37 with SHA-1 ca2402d8eb is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/samples/android/+/12469979 Change-Id: I9dad8e5607a89b8bd0b9bbce89cf36509941495c
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 3f8d030a1f -s ours am skip reason: Change-Id I7ebdd475c17377ecd3b6a7586442b55a12e32c37 with SHA-1 ca2402d8eb is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/samples/android/+/12469979 Change-Id: I42711ce9d2a0d33403b695084704136f477a3bbc
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: I7ebdd475c17377ecd3b6a7586442b55a12e32c37 Change-Id: I3eacc623ecb0e0c2fb65633d5d6ab9df811c61dd
2020-08-19Merge "Update language to comply with Android's inclusive language guidance" ↵Joanne Chung
am: 4cd108aef6 am: d951dc8e29 am: d0435400ab am: b799234bc6 am: 05ca7c47e6 Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1402487 Change-Id: Ie3951291e578754ec41eb64ecbecbf6f47140adb
2020-08-19Merge "Update language to comply with Android's inclusive language guidance" ↵Joanne Chung
am: 4cd108aef6 am: d951dc8e29 am: d0435400ab am: b799234bc6 Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1402487 Change-Id: Ib23a985c3941ae99ac245f9c29926bae3e9e5ba4
2020-08-19Merge "Update language to comply with Android's inclusive language guidance" ↵Joanne Chung
am: 4cd108aef6 am: d951dc8e29 am: d0435400ab Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1402487 Change-Id: Ic692a35b5819777dbdca8b9f6cc019b603ac43e8
2020-08-19Merge "Update language to comply with Android's inclusive language guidance" ↵Joanne Chung
am: 4cd108aef6 am: d951dc8e29 Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1402487 Change-Id: Ia26b0c80df080afb36dd723740abca78aeb6ce25
2020-08-19Merge "Update language to comply with Android's inclusive language guidance" ↵Joanne Chung
am: 4cd108aef6 Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1402487 Change-Id: Ifef7030a615b225ff28bc1de06b4ba69ccf982a1
2020-08-19Merge "Update language to comply with Android's inclusive language guidance"Joanne Chung
2020-08-17Update language to comply with Android's inclusive language guidanceJoanne Chung
See https://source.android.com/setup/contribute/respectful-code for reference Bug: 162536543 Test: ./gradlew :Application:build Test: install success and see the changed text Change-Id: Ia04bd65ed9c7ac2116f0ff898fc57b9d9ecc3745
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 05:48:27 +0000