Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
778,116 Commits 3 Branches 0 Tags
d281b00a09876a504bb0f945475fe6213fd4b5de
Commit Graph

778116 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
d281b00a09 Merge changes from topic "am-c578ca2d19f34632bed4427749a87116" into tm-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Reland: Remove workarounds by data_device_bins" into tm-dev am: 7faed5aaff -s ours am: 3a4d8b05da -s ours
  [automerger skipped] Reland: Remove workarounds by data_device_bins am: 921da951ef -s ours am: 3ad97eb688 -s ours
 2022-08-15 20:12:12 +00:00
TreeHugger Robot
5a89e99c48 [automerger skipped] Merge "Reland: Remove workarounds by data_device_bins" into tm-dev am: 7faed5aaff -s ours am: 3a4d8b05da -s ours 
am skip reason: Merged-In Iccb457131d74a83b9f5cb8457833d7c5ea495b05 with SHA-1 13a0652e35 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19098483

Change-Id: Ice4a797f0882dfd8bf3493d101045e32d15d5797
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 20:11:51 +00:00
TreeHugger Robot
f654873181 [automerger skipped] Merge "Reland: Remove workarounds by data_device_bins" into tm-dev am: 7faed5aaff am: 79f899dfd4 -s ours 
am skip reason: Merged-In Iccb457131d74a83b9f5cb8457833d7c5ea495b05 with SHA-1 13a0652e35 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19098483

Change-Id: I7b6cfdb0b0e87fe092b507865ab56df9fcdce4bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 20:11:49 +00:00
Victor Hsieh
3523c08179 [automerger skipped] Reland: Remove workarounds by data_device_bins am: 921da951ef -s ours am: 3ad97eb688 -s ours 
am skip reason: Merged-In Iccb457131d74a83b9f5cb8457833d7c5ea495b05 with SHA-1 13a0652e35 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19098483

Change-Id: I21364530e41a499a637d8fec490bb132071ec14c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 20:11:31 +00:00
TreeHugger Robot
79f899dfd4 Merge "Reland: Remove workarounds by data_device_bins" into tm-dev am: 7faed5aaff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19098483

Change-Id: Ieb88df032f18ac75b10b49fe6fc8675b4c6d14d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 19:53:38 +00:00
TreeHugger Robot
3a4d8b05da [automerger skipped] Merge "Reland: Remove workarounds by data_device_bins" into tm-dev am: 7faed5aaff -s ours 
am skip reason: Merged-In Iccb457131d74a83b9f5cb8457833d7c5ea495b05 with SHA-1 13a0652e35 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19098483

Change-Id: I5ce428d07735ffdf0c8982b9f68e2087adc89b9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 19:52:08 +00:00
Victor Hsieh
3ad97eb688 [automerger skipped] Reland: Remove workarounds by data_device_bins am: 921da951ef -s ours 
am skip reason: Merged-In Iccb457131d74a83b9f5cb8457833d7c5ea495b05 with SHA-1 13a0652e35 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19098483

Change-Id: I66fe3fe0a5e409eaf1ea091a4ac7513b61fc8a1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 19:51:46 +00:00
TreeHugger Robot
7faed5aaff Merge "Reland: Remove workarounds by data_device_bins" into tm-dev 2022-08-15 19:05:42 +00:00
Jack Yu
ba2b0f06df Merge "Temporarily reduced owners during refactoring" am: f6e4707393 am: ca9ea94b2d am: debac03f26 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2184606

Change-Id: I5ea19e36e483ee518cae023e47abc7948a02a848
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 19:00:43 +00:00
Jack Yu
debac03f26 Merge "Temporarily reduced owners during refactoring" am: f6e4707393 am: ca9ea94b2d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2184606

Change-Id: Ied38e1295e9edc3deec8cf458ad23da55efb29e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 18:15:38 +00:00
Jack Yu
ca9ea94b2d Merge "Temporarily reduced owners during refactoring" am: f6e4707393 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2184606

Change-Id: I5ad87189f9087cce52e579cace2d516147265553
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 17:50:03 +00:00
Jack Yu
f6e4707393 Merge "Temporarily reduced owners during refactoring" 2022-08-15 17:31:01 +00:00
Treehugger Robot
b1f233a113 Merge "Remove the suggestion to AsyncTask.SERIAL_EXECUTOR" am: 863a88ef07 am: 82c1a3d0bf am: abab02f668 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2185016

Change-Id: I57ebf8c2a9ad9297daa002cc55c8c5fc512bf3ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 16:24:17 +00:00
Treehugger Robot
abab02f668 Merge "Remove the suggestion to AsyncTask.SERIAL_EXECUTOR" am: 863a88ef07 am: 82c1a3d0bf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2185016

Change-Id: I4cd880a40713d70fe19a62e315b652e7d8ce493d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 16:04:45 +00:00
Treehugger Robot
82c1a3d0bf Merge "Remove the suggestion to AsyncTask.SERIAL_EXECUTOR" am: 863a88ef07 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2185016

Change-Id: Ic35c9c2bff296f0f8419354e9a79ebcbb3fad57b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 15:46:41 +00:00
Summers Pittman
b62f6629c8 Merge "Remove extraneous help text for pm set-app-links-allowed command" am: a28a44c82e am: 660b6eeb96 am: 6ba3ceec68 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2179915

Change-Id: Id84a9ff488816ec3a487b810e6745a621314655c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 15:39:22 +00:00
Treehugger Robot
863a88ef07 Merge "Remove the suggestion to AsyncTask.SERIAL_EXECUTOR" 2022-08-15 15:26:56 +00:00
Summers Pittman
6ba3ceec68 Merge "Remove extraneous help text for pm set-app-links-allowed command" am: a28a44c82e am: 660b6eeb96 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2179915

Change-Id: Iba4509dfd0a0f21b1679cb0bb1218c416b3a3734
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 15:22:25 +00:00
Summers Pittman
660b6eeb96 Merge "Remove extraneous help text for pm set-app-links-allowed command" am: a28a44c82e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2179915

Change-Id: Ica0a59faf463523e91bcdbda28636cc6f381bff1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 15:04:57 +00:00
Summers Pittman
a28a44c82e Merge "Remove extraneous help text for pm set-app-links-allowed command" 2022-08-15 14:35:13 +00:00
Adrian Roos
317f7a4e35 Merge "Better OWNERS for system_messages.proto" am: 74a44839b9 am: d283ac489f am: 10fb42f313 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2186207

Change-Id: Ie9ccbdb576fd2f581026948166dc01f01b22d95f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 14:30:30 +00:00
Adrian Roos
10fb42f313 Merge "Better OWNERS for system_messages.proto" am: 74a44839b9 am: d283ac489f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2186207

Change-Id: Ic731f162fbaed0e2b6d8328d20703d8e3c0a1ce5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 14:05:28 +00:00
Automerger Merge Worker
3b56370767 Merge "[automerger skipped] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: e37a0ac9f8 -s ours am: 26f72ff555 -s ours am: 64f36a1646 -s ours am: 5bcb8a2fea -s ours am: 25e9954181 -s ours am: 79649ba2a8 -s ours am: 561afceeeb -s ours am: ac7ad80be8 -s ours" into tm-d1-dev-plus-aosp 2022-08-15 13:39:40 +00:00
Automerger Merge Worker
0f4c08b935 Merge "[automerger skipped] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: e37a0ac9f8 -s ours am: 26f72ff555 -s ours am: 64f36a1646 -s ours am: 5bcb8a2fea -s ours am: 25e9954181 -s ours am: 79649ba2a8 -s ours am: 561afceeeb -s ours am: 37a0d4d5e7 -s ours" into tm-d1-dev-plus-aosp 2022-08-15 13:39:22 +00:00
Ganesh Olekar
ae321e0467 [automerger skipped] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: e37a0ac9f8 -s ours am: 26f72ff555 -s ours am: 64f36a1646 -s ours am: 5bcb8a2fea -s ours am: 25e9954181 -s ours am: 79649ba2a8 -s ours am: 561afceeeb -s ours am: ac7ad80be8 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19599668

Change-Id: I9751d795bb00ce0d796860178b63a06118a905db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 13:39:22 +00:00
Ganesh Olekar
90af5b1291 [automerger skipped] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: e37a0ac9f8 -s ours am: 26f72ff555 -s ours am: 64f36a1646 -s ours am: 5bcb8a2fea -s ours am: 25e9954181 -s ours am: 79649ba2a8 -s ours am: 561afceeeb -s ours am: 37a0d4d5e7 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19599668

Change-Id: Ie272ce23b9eae3866bc3c445f2fc354bb0a52f57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 13:39:18 +00:00
Automerger Merge Worker
7d60d043c6 Merge "[automerger skipped] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: e37a0ac9f8 -s ours am: 26f72ff555 -s ours am: 64f36a1646 -s ours am: 5bcb8a2fea -s ours am: 59cdac45ce -s ours am: 24283b6dd6 -s ours am: a09af2c7c2 -s ours" into tm-d1-dev-plus-aosp 2022-08-15 13:39:04 +00:00
Ganesh Olekar
39b67eb6b7 [automerger skipped] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: e37a0ac9f8 -s ours am: 26f72ff555 -s ours am: 64f36a1646 -s ours am: 5bcb8a2fea -s ours am: 59cdac45ce -s ours am: 24283b6dd6 -s ours am: 976455746c -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19599668

Change-Id: Id5c2c22919c76b052499a7de28fbfe2c9ac49e80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 13:38:59 +00:00
Ganesh Olekar
e5e08da427 [automerger skipped] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: e37a0ac9f8 -s ours am: 26f72ff555 -s ours am: 64f36a1646 -s ours am: 5bcb8a2fea -s ours am: 59cdac45ce -s ours am: 24283b6dd6 -s ours am: a09af2c7c2 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19599668

Change-Id: I1e8becce9db7527ab4e7abb792c7a415d0baf6ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 13:38:57 +00:00
Adrian Roos
d283ac489f Merge "Better OWNERS for system_messages.proto" am: 74a44839b9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2186207

Change-Id: I12dcc6ee79a83b06a79e820da82ab99ff8aeef4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 13:38:07 +00:00
Ganesh Olekar
37a0d4d5e7 [automerger skipped] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: e37a0ac9f8 -s ours am: 26f72ff555 -s ours am: 64f36a1646 -s ours am: 5bcb8a2fea -s ours am: 25e9954181 -s ours am: 79649ba2a8 -s ours am: 561afceeeb -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19599668

Change-Id: I46f2ca22a0d2c39ecd42ad5758a53c7f29498163
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 13:20:11 +00:00
Adrian Roos
74a44839b9 Merge "Better OWNERS for system_messages.proto" 2022-08-15 13:15:44 +00:00
Ganesh Olekar
ac7ad80be8 [automerger skipped] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: e37a0ac9f8 -s ours am: 26f72ff555 -s ours am: 64f36a1646 -s ours am: 5bcb8a2fea -s ours am: 25e9954181 -s ours am: 79649ba2a8 -s ours am: 561afceeeb -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19599668

Change-Id: I6bf481c3162047206f3c7cd6b69dd81ba980fb46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 13:13:25 +00:00
Ganesh Olekar
a09af2c7c2 [automerger skipped] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: e37a0ac9f8 -s ours am: 26f72ff555 -s ours am: 64f36a1646 -s ours am: 5bcb8a2fea -s ours am: 59cdac45ce -s ours am: 24283b6dd6 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19599668

Change-Id: Ifbac3799f83bcd168520586b435c29024e2a8253
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 13:13:10 +00:00
Ganesh Olekar
561afceeeb [automerger skipped] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: e37a0ac9f8 -s ours am: 26f72ff555 -s ours am: 64f36a1646 -s ours am: 5bcb8a2fea -s ours am: 25e9954181 -s ours am: 79649ba2a8 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19599668

Change-Id: I6dc1e7d1aa5b42480d246cd93a15e5289ee807ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 13:11:38 +00:00
Ganesh Olekar
976455746c [automerger skipped] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: e37a0ac9f8 -s ours am: 26f72ff555 -s ours am: 64f36a1646 -s ours am: 5bcb8a2fea -s ours am: 59cdac45ce -s ours am: 24283b6dd6 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19599668

Change-Id: I741f95b4ca46f3eecf098f35cfb4370a95415b26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 13:11:38 +00:00
Adrian Roos
718fd088eb Better OWNERS for system_messages.proto 
This file notification ids to be used anywhere in the android package (e.g. system_server). Match platform resource OWNERS that has similar scope.

Change-Id: I2d525d59c24df63429ef090e41e45952506c1c59
 2022-08-15 13:06:18 +00:00
Ganesh Olekar
24283b6dd6 [automerger skipped] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: e37a0ac9f8 -s ours am: 26f72ff555 -s ours am: 64f36a1646 -s ours am: 5bcb8a2fea -s ours am: 59cdac45ce -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19599668

Change-Id: I0602f86b1c095cdb4debd3124fbeed31f981aa81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 12:55:57 +00:00
Ganesh Olekar
79649ba2a8 [automerger skipped] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: e37a0ac9f8 -s ours am: 26f72ff555 -s ours am: 64f36a1646 -s ours am: 5bcb8a2fea -s ours am: 25e9954181 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19599668

Change-Id: Ic0557ed727e5e0b5c1778f8b63173d3fb01d4de8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 12:55:57 +00:00
Ganesh Olekar
25e9954181 [automerger skipped] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: e37a0ac9f8 -s ours am: 26f72ff555 -s ours am: 64f36a1646 -s ours am: 5bcb8a2fea -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19599668

Change-Id: Ieeaefcd7dc2da64f59a54d275f87e8a201c9a454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 12:38:53 +00:00
Ganesh Olekar
59cdac45ce [automerger skipped] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: e37a0ac9f8 -s ours am: 26f72ff555 -s ours am: 64f36a1646 -s ours am: 5bcb8a2fea -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19599668

Change-Id: Ie1c5e21ca0e1d4532f3e74eaef98e9c062db120b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 12:37:52 +00:00
Ganesh Olekar
5bcb8a2fea [automerger skipped] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: e37a0ac9f8 -s ours am: 26f72ff555 -s ours am: 64f36a1646 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19599668

Change-Id: I84edc763097829e3e56a0f4c8b5222fe832607e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 12:18:29 +00:00
Ganesh Olekar
f8a8744467 [automerger skipped] Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into qt-dev am: e893eff6f2 am: dc45b9fed3 -s ours am: 0f8fc1a47e -s ours am: e0cb2beeae -s ours am: 191abef1fa -s ours am: 108fb60e32 -s ours am: 516b24e8bd -s ours am: ebcf70b06f -s ours am: f0c41b828c -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18327410

Change-Id: I33d80ec8de7cda827d1371d5d428196da354d2b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 11:54:04 +00:00
Ganesh Olekar
22a6fbe72b [automerger skipped] [conflict] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: 84b1160cfc am: 0a761a9510 -s ours am: 6732f3304f -s ours am: 6bfd59aabf -s ours am: c0994ae1c9 -s ours am: 5d8583773a -s ours am: 2e886b1bbc -s ours am: 07dab0c685 -s ours am: fbce91828a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19622507

Change-Id: I0e535dc52de655680e7251a994fd27a36350e7ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 11:53:50 +00:00
Ganesh Olekar
ac712e3ba4 [automerger skipped] Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into qt-dev am: e893eff6f2 am: dc45b9fed3 -s ours am: 0f8fc1a47e -s ours am: e0cb2beeae -s ours am: 191abef1fa -s ours am: 1dd4d7a13b -s ours am: 727120aa1f -s ours am: b4800202ea -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18327410

Change-Id: Ieb89b3d362912ddcc08c3728f1cde65b72d435df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 11:53:31 +00:00
Ganesh Olekar
f0993f6f9f [automerger skipped] Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into qt-dev am: e893eff6f2 am: dc45b9fed3 -s ours am: 0f8fc1a47e -s ours am: e0cb2beeae -s ours am: 191abef1fa -s ours am: 108fb60e32 -s ours am: 516b24e8bd -s ours am: ebcf70b06f -s ours am: 049515f1d5 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18327410

Change-Id: Ib5e16cfe5167a0a9ccc51727a94274b8c8ac5a53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 11:53:25 +00:00
Automerger Merge Worker
9ca9971f98 Merge "[automerger skipped] [conflict] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: 84b1160cfc am: 0a761a9510 -s ours am: 6732f3304f -s ours am: 6bfd59aabf -s ours am: c0994ae1c9 -s ours am: a9c783eff8 -s ours am: 6e1514c3b5 -s ours am: 389b814e93 -s ours" into tm-d1-dev-plus-aosp 2022-08-15 11:53:20 +00:00
Ganesh Olekar
8fdd8a1510 [automerger skipped] [conflict] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: 84b1160cfc am: 0a761a9510 -s ours am: 6732f3304f -s ours am: 6bfd59aabf -s ours am: c0994ae1c9 -s ours am: 5d8583773a -s ours am: 2e886b1bbc -s ours am: 07dab0c685 -s ours am: fec43f98f1 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19622507

Change-Id: I69edbac17a981c51c7c142cd3945bab963cf8ac3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 11:53:15 +00:00
Ganesh Olekar
0310d64627 [automerger skipped] Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into qt-dev am: e893eff6f2 am: dc45b9fed3 -s ours am: 0f8fc1a47e -s ours am: e0cb2beeae -s ours am: 191abef1fa -s ours am: 1dd4d7a13b -s ours am: 727120aa1f -s ours am: d5706ee091 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18327410

Change-Id: I1dc21abc99f8b0e483957b9ccf1d6f11a88d949e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 11:53:05 +00:00
Ganesh Olekar
4dd93efa4d [automerger skipped] [conflict] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: 84b1160cfc am: 0a761a9510 -s ours am: 6732f3304f -s ours am: 6bfd59aabf -s ours am: c0994ae1c9 -s ours am: a9c783eff8 -s ours am: 6e1514c3b5 -s ours am: 389b814e93 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19622507

Change-Id: Ieb827341aa80d4afccb10b9177e9134d7764e91f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 11:52:53 +00:00