summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: cda9aae0e8 -s ↵android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-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-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-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-devandroid-s-v2-preview-1Xin Li
ours am: 9c124a91fc -s ours am skip reason: Change-Id Ib22844f68373f63ed255bff680f8015aee25cb4c with SHA-1 b43a76598d is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1a4886d18f9e256d6ab85b61d0dc2d954589e6d0
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: cda9aae0e8 -s oursXin Li
am skip reason: Change-Id Ib22844f68373f63ed255bff680f8015aee25cb4c with SHA-1 b43a76598d is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iec637f085ea5caf003e3da01124a6299fece079d
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: Ib22844f68373f63ed255bff680f8015aee25cb4c Change-Id: I19a674300097bad8b0583319cf6b0a319f0d7268
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Test/connectivity am: ↵Bob Badour
85dd8e34a7 am: 5b0e88f753 am: a45e2bf879 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Test/connectivity/+/1575502 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I92951dcbdd6d755d7f4c8e4e53f913b7561050d4
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Test/connectivity am: ↵Bob Badour
85dd8e34a7 am: 5b0e88f753 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Test/connectivity/+/1575502 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I69af93e7bd0af73e6b779de99c7341a0d5ca0643
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Test/connectivity am: 85dd8e34a7Bob Badour
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Test/connectivity/+/1575502 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I018caf990e86f584e5b85c4438930462d9097c61
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Test/connectivityandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 to: PMC/Android.bp UID/Android.bp Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-MIT to: Android.bp sl4n/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I33c53517fdc1221df61b44758b9b0338c4030b33
2020-11-23Mark ab/6881855 as merged am: 8bf0e297c8 am: b43a76598dXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Test/connectivity/+/13112991 Change-Id: I0780ad96f6f70291844c219c9ab053bad2978268
2020-11-23Mark ab/6881855 as merged am: 8bf0e297c8Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Test/connectivity/+/13112991 Change-Id: Ib22844f68373f63ed255bff680f8015aee25cb4c
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: Iae58e61160e4a3353911658c91ae17da6ff91d99
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 5a8971a7b5 -s ours am: ↵Xin Li
1f01a745ea -s ours am: ab1def8cc2 -s ours am skip reason: Change-Id Ie4d05cab5a7809218243038f40c5ef935b189452 with SHA-1 05b2abfab9 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Test/connectivity/+/12796903 Change-Id: I68f65a3bf64be0e4174ee3ebeb28931f1c65e779
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 5a8971a7b5 -s ours am: ↵Xin Li
1f01a745ea -s ours am skip reason: Change-Id Ie4d05cab5a7809218243038f40c5ef935b189452 with SHA-1 05b2abfab9 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Test/connectivity/+/12796903 Change-Id: I604797b26c7e5d40cd400f1b73b6c7d4c6bbba48
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 5a8971a7b5 -s oursXin Li
am skip reason: Change-Id Ie4d05cab5a7809218243038f40c5ef935b189452 with SHA-1 05b2abfab9 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Test/connectivity/+/12796903 Change-Id: Ie96284b8a7f3061a9317de6d2e7d9d35131d484f
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: Ie4d05cab5a7809218243038f40c5ef935b189452 Change-Id: I6506fee897549f05000b4335c7c044a9f1eea331
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: c6279e3440 -s ours am: 1fbaacffd8 -s ours am: 8a5a2a8701 -s ours am: 9cd60ff8b4 -s ours am skip reason: Change-Id Ibc3421f2c9664d78f409046e7f7eef098714bf43 with SHA-1 3e7402f56e is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Test/connectivity/+/12469129 Change-Id: I233923cbccd051475ee34541cdd596865de7e8d1
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: c6279e3440 -s ours am: 1fbaacffd8 -s ours am: 8a5a2a8701 -s ours am skip reason: Change-Id Ibc3421f2c9664d78f409046e7f7eef098714bf43 with SHA-1 3e7402f56e is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Test/connectivity/+/12469129 Change-Id: Ibb6a8671fb3f7aceafbaa77a7883a12e5f54d158
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: c6279e3440 -s ours am: 1fbaacffd8 -s ours am skip reason: Change-Id Ibc3421f2c9664d78f409046e7f7eef098714bf43 with SHA-1 3e7402f56e is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Test/connectivity/+/12469129 Change-Id: I27cbc5d50dd12965c85b5f5571d2d86c5b3b404f
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: c6279e3440 -s ours am skip reason: Change-Id Ibc3421f2c9664d78f409046e7f7eef098714bf43 with SHA-1 3e7402f56e is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Test/connectivity/+/12469129 Change-Id: Iede53dedd3f41add5df639b3ceb3e296787b22fa
2020-08-27Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li
Bug: 166295507 Merged-In: Ibc3421f2c9664d78f409046e7f7eef098714bf43 Change-Id: I4f33817f35db9a1149959c1ebd1b71abd2c58e90
2020-08-04Update language to comply with Android's inclusive language guidance am: ↵Chiachang Wang
abd1a25df0 am: 10aa5d182d am: 4393cf2266 am: 05b2abfab9 am: 6acc633cca Original change: https://android-review.googlesource.com/c/platform/packages/apps/Test/connectivity/+/1384539 Change-Id: Ie072c985c0bba42f012ec0909fba29b0859b3c9c
2020-08-04Update language to comply with Android's inclusive language guidance am: ↵Chiachang Wang
abd1a25df0 am: 10aa5d182d am: 4393cf2266 am: 05b2abfab9 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Test/connectivity/+/1384539 Change-Id: Idd1b238ad0df66a1ee1f87a11a4770f6deb965be
2020-08-04Update language to comply with Android's inclusive language guidance am: ↵Chiachang Wang
abd1a25df0 am: 10aa5d182d am: 4393cf2266 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Test/connectivity/+/1384539 Change-Id: Ie4d05cab5a7809218243038f40c5ef935b189452
2020-08-04Update language to comply with Android's inclusive language guidance am: ↵Chiachang Wang
abd1a25df0 am: 10aa5d182d Original change: https://android-review.googlesource.com/c/platform/packages/apps/Test/connectivity/+/1384539 Change-Id: I52c281c180879fe5ba173a7f6e14ef7df84bef6d
2020-08-04Update language to comply with Android's inclusive language guidance am: ↵Chiachang Wang
abd1a25df0 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Test/connectivity/+/1384539 Change-Id: I9e476c08c2360115b4fe525e49da76e7d4d07447
2020-08-03Update language to comply with Android's inclusive language guidanceChiachang Wang
See https://source.android.com/setup/contribute/respectful-code for reference. Bug: 161896447 Test: m Change-Id: Ie48cc310e84588742651bb838294ea96624d436e
2020-07-27Update language to comply with Android’s inclusive language guidance am: ↵Xevi Miro Bruix
c416090af3 am: 56c7da26df am: 6db7b6e599 am: f878deb3b8 am: 4a92f0405a Original change: https://android-review.googlesource.com/c/platform/packages/apps/Test/connectivity/+/1371721 Change-Id: Id7ee18028c38c55afb11fc400099be9d40f2a901
2020-07-27Update language to comply with Android’s inclusive language guidance am: ↵Xevi Miro Bruix
c416090af3 am: 56c7da26df am: 6db7b6e599 am: f878deb3b8 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Test/connectivity/+/1371721 Change-Id: Ied7f6a08a4909bb07dea7e4f94028651bcd24c0d
2020-07-27Update language to comply with Android’s inclusive language guidance am: ↵Xevi Miro Bruix
c416090af3 am: 56c7da26df am: 6db7b6e599 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Test/connectivity/+/1371721 Change-Id: I0b4bfc70568eb70a6da23490c281f89049c9008a
2020-07-27Update language to comply with Android’s inclusive language guidance am: ↵Xevi Miro Bruix
c416090af3 am: 56c7da26df Original change: https://android-review.googlesource.com/c/platform/packages/apps/Test/connectivity/+/1371721 Change-Id: I30d398afbc17876904b7f9f4c708805eb7de1e44
2020-07-27Update language to comply with Android’s inclusive language guidance am: ↵Xevi Miro Bruix
c416090af3 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Test/connectivity/+/1371721 Change-Id: Ic97569014f55a03ab196faef804c69489491d4b1
2020-07-23Update language to comply with Android’s inclusive language guidanceXevi Miro Bruix
See https://source.android.com/setup/contribute/respectful-code for reference inclusivefixit Bug: 161896447 Test: Changed documentation Change-Id: Idd06f68e81afa3abe388135047ae9fac749a186d
2020-05-20Add an exported flag in manifest am: 82d25a918b am: 7399fcc91f am: ↵Ashwini Oruganti
3e7402f56e am: bbf85ca47b am: 85dbb59c1d Change-Id: If815f7768e876a76c828e650e2c02f00193c742b
2020-05-20Add an exported flag in manifest am: 82d25a918b am: 7399fcc91f am: ↵Ashwini Oruganti
3e7402f56e am: bbf85ca47b Change-Id: I9df6f7e357485a3b3e4e74f1688eadfd08883727
2020-05-20Add an exported flag in manifest am: 82d25a918b am: 7399fcc91f am: 3e7402f56eAshwini Oruganti
Change-Id: I16f04bd9c61a16104364375c9baf3fabc749f1a1
2020-05-20Add an exported flag in manifest am: 82d25a918b am: 7399fcc91fAshwini Oruganti
Change-Id: Ibc3421f2c9664d78f409046e7f7eef098714bf43
2020-05-20Add an exported flag in manifest am: 82d25a918bandroid-r-beta-3android-r-beta-2Ashwini Oruganti
Change-Id: I290b1397573d77dfe89598a2ac4b8929ae578346
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 9d44df65fb -s ours am: 7316721b2f am: e07131980e am: 53b7884958 -s ours am skip reason: subject contains skip directive Change-Id: Iab6ceaedf708989deced829a85c3447a7fbfcb60
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 9d44df65fb -s ours am: 7316721b2f am: e07131980e Change-Id: I8ba51777ff7bda13b208a4968e45228458d4fc3c
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 9d44df65fb -s ours am: 7316721b2f Change-Id: Iffaab44e65edebd6321b0c03ac1a400911582543
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 9d44df65fb -s ours am skip reason: subject contains skip directive Change-Id: I64b12ccd1386a08bfa913834d115ac5ba828236a
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: Iad20b9202089401f122bd53d5ffc14e26352a604
2020-03-23Add an exported flag in manifestAshwini Oruganti
With b/150232615, we will need an explicit value set for the exported flag when intent filters are present, as the default behavior is changing for S+. This change adds the value reflecting the previous default to the manifest. These changes were made using an automated tool, the xml file may be reformatted slightly creating a larger diff. The only "real" change is the addition of "android:exported" to activities, services, and receivers that have one or more intent-filters. Bug: 150232615 Test: TH Exempt-From-Owner-Approval: mechanical refactoring Change-Id: I6437ef5c94ac98a93a663b661e8718043b0c5a3d
2020-03-19[automerger skipped] Revert "Revert "Pass in active device to all ↵Rahul Sabnis
BluetoothA2dp APIs ..." am: e5d120d1e9 am: 1da08e535c -s ours am: f5bf66bb92 -s ours am: 2ce7c1326b -s ours am: cf073bcbde -s ours am skip reason: Change-Id Ibbfa5cf5f189ca28b3589af827815747dbc4085e with SHA-1 39b5b839bd is in history Change-Id: I73fd7ed0477ba8f8c8630f19e707a70fadc6b563
2020-03-19[automerger skipped] Revert "Revert "Pass in active device to all ↵Rahul Sabnis
BluetoothA2dp APIs ..." am: e5d120d1e9 am: 1da08e535c -s ours am: f5bf66bb92 -s ours am: 2ce7c1326b -s ours am skip reason: Change-Id Ibbfa5cf5f189ca28b3589af827815747dbc4085e with SHA-1 39b5b839bd is in history Change-Id: I0cae986f38079c28c35d0b5e1a80af6e2c8e37c3
2020-03-19[automerger skipped] Revert "Revert "Pass in active device to all ↵Rahul Sabnis
BluetoothA2dp APIs ..." am: e5d120d1e9 am: 1da08e535c -s ours am: f5bf66bb92 -s ours am skip reason: Change-Id Ibbfa5cf5f189ca28b3589af827815747dbc4085e with SHA-1 39b5b839bd is in history Change-Id: I2a9397dc9dbf8c166aec009748e20d38108f87f7
2020-03-19Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..." am: ↵Rahul Sabnis
e5d120d1e9 am: 1da08e535c Change-Id: I00e7e5f2bc95c2009ece8a607c800d88d2663b9d
2020-03-19[automerger skipped] Revert "Revert "Pass in active device to all ↵Rahul Sabnis
BluetoothA2dp APIs ..." am: e5d120d1e9 am: 1da08e535c -s ours am skip reason: Change-Id Ibbfa5cf5f189ca28b3589af827815747dbc4085e with SHA-1 39b5b839bd is in history Change-Id: I2e5e8e8a4a9c0916d0596cf7902d12e26a2828d6
2020-03-19Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..." am: ↵Rahul Sabnis
e5d120d1e9 Change-Id: I8c6644030e1c6fd310c6fd3845c09d747ec212b8
2020-03-12Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."Rahul Sabnis
Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..." Revert submission 10303287-revert-10253996-bt-a2dp-no-null-FQRXACWPIA Reason for revert: Fixing breakage Reverted Changes: I4d9f2f819:Revert "Make sure calls to BluetoothA2dp APIs pass... I771ca0d57:Revert "Need to now pass in active device instead ... I76529c7a1:Revert "Pass in active device to all BluetoothA2dp... I297bda68d:Revert "Require user pass in a non-null BluetoothD... I525327959:Revert "Pass in active device to all BluetoothA2dp... I1d8660b11:Revert "Pass in active device to all BluetoothA2dp... Bug: 147287141 Test: Manual Merged-In: Ibbfa5cf5f189ca28b3589af827815747dbc4085e Change-Id: Ibbfa5cf5f189ca28b3589af827815747dbc4085e
2020-03-05[automerger skipped] Revert "Revert "Pass in active device to all ↵Automerger Merge Worker
BluetoothA2dp APIs ..." am: 39b5b839bd am: 18ae74f65a am: 22d6ee3363 am: 70b9ee6d08 -s ours am: 6501779c3a -s ours am skip reason: Change-Id Ibbfa5cf5f189ca28b3589af827815747dbc4085e with SHA-1 39b5b839bd is in history Change-Id: I0d02c32519a512ed70e744056af7e38aff897446
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 14:07:57 +0000