Commit Graph

559395 Commits

Author SHA1 Message Date
TreeHugger Robot
b224a4ba92 Merge "Grant access to the URI when forwarding intent from InstallStart to InstallInstalling" into rvc-qpr-dev am: 1df7cf9bf1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12994918

Change-Id: I04dce87ad4d68a9a41ef85426fc6c828f57ab23d
2020-11-09 17:28:01 +00:00
TreeHugger Robot
1df7cf9bf1 Merge "Grant access to the URI when forwarding intent from InstallStart to InstallInstalling" into rvc-qpr-dev 2020-11-09 16:55:26 +00:00
Andrei-Valentin Onea
e945dc22c0 Merge "Update DISALLOW_DUPLICATE_FIELD_IN_SKELETON" am: 5bba56e147 am: 81eb255fa2 am: 0e6d9772c2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490737

Change-Id: I264b82318fb8331f85811a3d45c589d3c2bfeba9
2020-11-09 15:59:58 +00:00
Mathew Inwood
a176e55214 [automerger skipped] Merge "Add maxTargetSdk restriction to unused APIs." am: f8abe13db4 am: eb80316624 am: 5a448e27ed -s ours
am skip reason: Change-Id I626caf7c1fe46c5ab1f39c2895b42a34319f771a with SHA-1 5f0edaaaf5 is in history

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

Change-Id: I121b7837c0d2a65bb2a8d264c7f92c2a477def67
2020-11-09 15:59:31 +00:00
Andrei-Valentin Onea
0e6d9772c2 Merge "Update DISALLOW_DUPLICATE_FIELD_IN_SKELETON" am: 5bba56e147 am: 81eb255fa2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490737

Change-Id: Ic9912a9f7ed423c13060b0daf4a2fae7c2d3a378
2020-11-09 15:24:36 +00:00
Mathew Inwood
5a448e27ed Merge "Add maxTargetSdk restriction to unused APIs." am: f8abe13db4 am: eb80316624
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1468245

Change-Id: I60222cb1879651cf283e385519b5c4d156ab68a1
2020-11-09 15:24:20 +00:00
Andrei-Valentin Onea
81eb255fa2 Merge "Update DISALLOW_DUPLICATE_FIELD_IN_SKELETON" am: 5bba56e147
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490737

Change-Id: Ifb31bb97e89c434e7556826bc4c618e902c7932d
2020-11-09 15:12:35 +00:00
Mathew Inwood
eb80316624 Merge "Add maxTargetSdk restriction to unused APIs." am: f8abe13db4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1468245

Change-Id: I35f65987f7f9287cf03418e9feb27c81f4fd1878
2020-11-09 15:09:11 +00:00
Andrei-Valentin Onea
5bba56e147 Merge "Update DISALLOW_DUPLICATE_FIELD_IN_SKELETON" 2020-11-09 14:58:38 +00:00
Mathew Inwood
f8abe13db4 Merge "Add maxTargetSdk restriction to unused APIs." 2020-11-09 14:41:20 +00:00
Dario Freni
f15608a4ab Merge "Add ability to stage multiple apexs." am: 7bd2a5e4fd am: 20d93a701c am: 5401dfbfb2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490738

Change-Id: Ie31a889460f3b3d87a5a6515fbeef50b5d105f19
2020-11-09 12:29:54 +00:00
Dario Freni
5401dfbfb2 Merge "Add ability to stage multiple apexs." am: 7bd2a5e4fd am: 20d93a701c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490738

Change-Id: I8fbd4352b3575a9f95ed3e560bd615ba3f981552
2020-11-09 12:07:11 +00:00
Dario Freni
20d93a701c Merge "Add ability to stage multiple apexs." am: 7bd2a5e4fd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490738

Change-Id: I2db219e6e6e9f2ba6c685cb2462da66bcbe5f91f
2020-11-09 11:32:45 +00:00
Dario Freni
7bd2a5e4fd Merge "Add ability to stage multiple apexs." 2020-11-09 11:00:02 +00:00
Dario Freni
5f541cbb88 Add ability to stage multiple apexs.
Test: atest sharedlibs_hosts_test
Change-Id: I9dfc6b783fd63c555622932d59712c0e0b9b073e
2020-11-09 10:27:04 +00:00
TreeHugger Robot
f6bdb84e9a Merge "Add disconnect message constant Bug: b/171255813 Test: make Change-Id: Ia300b12ecf7d0c1d7d057b48a801b2928354315e" into rvc-qpr-dev am: 265a962d72
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12987248

Change-Id: Id8d13e2cd4b52a616b4e36331d43ba8084033151
2020-11-07 20:36:24 +00:00
TreeHugger Robot
265a962d72 Merge "Add disconnect message constant Bug: b/171255813 Test: make Change-Id: Ia300b12ecf7d0c1d7d057b48a801b2928354315e" into rvc-qpr-dev 2020-11-07 20:05:38 +00:00
Dmitry Dementyev
203b8de32e [automerger skipped] Ignore GrantCredentials call with unexpected calling uid. am: 88787b77a0 am: 2e5fe473e1 am: 2d868147e4 -s ours am: d6d6f2621d -s ours am: 74112f0ef9 -s ours am: 89824dff8a -s ours am: ff76d65706 -s ours am: 9e6fd1aeae -s ours am: b0fe0debbc -s ours
am skip reason: Change-Id I983fa with SHA-1 4f0084580d is in history

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

Change-Id: I1172b3f40cf519fd02dcf179af75f81bcf72153b
2020-11-07 01:08:16 +00:00
Dmitry Dementyev
8d63401cc0 [automerger skipped] Ignore GrantCredentials call with unexpected calling uid. am: 88787b77a0 am: 2e5fe473e1 am: 2d868147e4 -s ours am: d6d6f2621d -s ours am: 74112f0ef9 -s ours am: 89824dff8a -s ours am: ff76d65706 -s ours am: 9e6fd1aeae -s ours am: 6ad890e9e9 -s ours
am skip reason: Change-Id I983fa with SHA-1 4f0084580d is in history

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

Change-Id: I805299d72f370367cb3c9cc042c68522c1f40b70
2020-11-07 01:07:59 +00:00
Dmitry Dementyev
b0fe0debbc [automerger skipped] Ignore GrantCredentials call with unexpected calling uid. am: 88787b77a0 am: 2e5fe473e1 am: 2d868147e4 -s ours am: d6d6f2621d -s ours am: 74112f0ef9 -s ours am: 89824dff8a -s ours am: ff76d65706 -s ours am: 9e6fd1aeae -s ours
am skip reason: Change-Id I983fa with SHA-1 4f0084580d is in history

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

Change-Id: If7ebf33c25347d6bc08847e6da6fa29f0a8a302b
2020-11-07 00:46:28 +00:00
Dmitry Dementyev
6ad890e9e9 [automerger skipped] Ignore GrantCredentials call with unexpected calling uid. am: 88787b77a0 am: 2e5fe473e1 am: 2d868147e4 -s ours am: d6d6f2621d -s ours am: 74112f0ef9 -s ours am: 89824dff8a -s ours am: ff76d65706 -s ours am: 9e6fd1aeae -s ours
am skip reason: Change-Id I983fa with SHA-1 4f0084580d is in history

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

Change-Id: I3ffb397cde26417c9dcf9c950f5addc087881e17
2020-11-07 00:46:11 +00:00
TreeHugger Robot
b1650deb9f Merge "FileBridge: fix fd ownership mismanagement." into rvc-qpr-dev am: 5bb11a9de6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13007527

Change-Id: If7ddda6654654011b1fe47317368b8d8ec4eb28d
2020-11-07 00:34:16 +00:00
Dmitry Dementyev
9e6fd1aeae [automerger skipped] Ignore GrantCredentials call with unexpected calling uid. am: 88787b77a0 am: 2e5fe473e1 am: 2d868147e4 -s ours am: d6d6f2621d -s ours am: 74112f0ef9 -s ours am: 89824dff8a -s ours am: ff76d65706 -s ours
am skip reason: Change-Id I983fa with SHA-1 4f0084580d is in history

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

Change-Id: I4b084631fb2c567f9035ae3924e8e899d8205440
2020-11-07 00:34:09 +00:00
TreeHugger Robot
5bb11a9de6 Merge "FileBridge: fix fd ownership mismanagement." into rvc-qpr-dev 2020-11-06 23:55:26 +00:00
Dmitry Dementyev
ff76d65706 [automerger skipped] Ignore GrantCredentials call with unexpected calling uid. am: 88787b77a0 am: 2e5fe473e1 am: 2d868147e4 -s ours am: d6d6f2621d -s ours am: 74112f0ef9 -s ours am: 89824dff8a -s ours
am skip reason: Change-Id I983fa with SHA-1 4f0084580d is in history

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

Change-Id: I7e3f3995e2a087f9a28f5f1836628d9f56170ab4
2020-11-06 23:44:15 +00:00
Dmitry Dementyev
89824dff8a [automerger skipped] Ignore GrantCredentials call with unexpected calling uid. am: 88787b77a0 am: 2e5fe473e1 am: 2d868147e4 -s ours am: d6d6f2621d -s ours am: 74112f0ef9 -s ours
am skip reason: Change-Id I983fa with SHA-1 4f0084580d is in history

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

Change-Id: I5f38bd9cea50f00aa357e4924dbcb6dae2fbc0cb
2020-11-06 23:31:05 +00:00
Dmitry Dementyev
74112f0ef9 [automerger skipped] Ignore GrantCredentials call with unexpected calling uid. am: 88787b77a0 am: 2e5fe473e1 am: 2d868147e4 -s ours am: d6d6f2621d -s ours
am skip reason: Change-Id I983fa with SHA-1 4f0084580d is in history

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

Change-Id: I4ae22cd07e6f913e0431a1da89867670907d6157
2020-11-06 23:18:05 +00:00
TreeHugger Robot
bf0eb57f15 Merge "Ignore GrantCredentials call with unexpected calling uid." into pi-dev am: 5409071886 am: 9bca2e2c06 am: 36fabac3e9 am: 4b9ee68510 am: 50f534a82e am: f143a2eb14
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12933114

Change-Id: Ief605f0f1714dbf6e2dd444598f7791a70dfbf56
2020-11-06 23:04:45 +00:00
Dmitry Dementyev
d6d6f2621d [automerger skipped] Ignore GrantCredentials call with unexpected calling uid. am: 88787b77a0 am: 2e5fe473e1 am: 2d868147e4 -s ours
am skip reason: Change-Id I983fa with SHA-1 4f0084580d is in history

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

Change-Id: I682bf1891bcaa033e7c8d415876cdcd8e7977c5e
2020-11-06 23:04:36 +00:00
Treehugger Robot
94386f5b00 Merge "Use ILights.DESCRIPTOR to refer to AIDL HAL" am: 26b017aae2 am: 2901676439 am: 8cb52df72a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426850

Change-Id: Icb01023451a93ab4924b2d4ff0158d2e1517f6d0
2020-11-06 22:56:43 +00:00
TreeHugger Robot
740099f6fc Merge "Ignore GrantCredentials call with unexpected calling uid." into pi-dev am: 5409071886 am: 9bca2e2c06 am: 36fabac3e9 am: 4b9ee68510 am: 50f534a82e am: 2260e04189
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12933114

Change-Id: Id3af39324f7e87f72c3080eaced253345d6e4b6a
2020-11-06 22:56:31 +00:00
TreeHugger Robot
b85b558656 [automerger skipped] Merge changes from topic "12933478" into pi-dev am: a15664c01f -s ours am: df71b0f3a5 -s ours am: 8b8dba96db -s ours am: 4f68954df7 -s ours am: 9f415e9bad -s ours am: d2b6d3cba4 -s ours
am skip reason: Change-Id If3b420067b4d7111dcf67ae6f98e42176158b679 with SHA-1 60c41ae4a6 is in history

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

Change-Id: I62297736110d320b2b86e1b9b48792743e350521
2020-11-06 22:56:17 +00:00
TreeHugger Robot
66e14ea228 [automerger skipped] Merge "Hide overlays over uninstall confirm dialog" into qt-dev am: 75826a6664 am: 0bfb8a8808 -s ours am: 0e03f74361 -s ours am: 12a6173e62 -s ours am: 50dc8e60ee -s ours
am skip reason: Change-Id I38b6d85871064d76f2911e20acc74b4ab76406b3 with SHA-1 d75105e74b is in history

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

Change-Id: Ic65d481ab870606e30eb054b79057de5299d3f79
2020-11-06 22:55:34 +00:00
TreeHugger Robot
267f1c5586 [automerger skipped] Merge "DO NOT MERGE Revoke install permissions when the permission defining app is uninstalled." into qt-dev am: 368a03507a am: e3a416b6ff -s ours am: 182544aa8b am: c35433cb4e am: 9a4e85cb22
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12787259

Change-Id: I440bac0d1673fc7d651543cb0ed0aa2c6e8c057a
2020-11-06 22:55:05 +00:00
Hai Zhang
dedbc312cf [automerger skipped] DO NOT MERGE Revoke install permissions when the permission defining app is uninstalled. am: 719c9c5206 am: a2cf5c1df1 -s ours am: 87339a9c22 am: 039b1ef74b am: be7ae14c4a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12787259

Change-Id: I345053c06289380af7372c2d9ffd5f23fec2fbab
2020-11-06 22:54:57 +00:00
TreeHugger Robot
4e1879fada [automerger skipped] Merge changes from topic "12933388" into qt-dev am: ebf67ea3b2 am: da1ea4bc80 -s ours am: d39d8ce033 -s ours am: 014fe5e136 -s ours am: 37e1b5a099 -s ours
am skip reason: Change-Id If3b420067b4d7111dcf67ae6f98e42176158b679 with SHA-1 60c41ae4a6 is in history

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

Change-Id: I821e4c0731d13a5fb92859e1198d741ff0db09b8
2020-11-06 22:54:41 +00:00
Nate Myren
4c64aaa8a5 [automerger skipped] Ensure permissions are revoked on state changes am: bc71724034 am: f31a906eba -s ours am: cef551dc4f -s ours am: e980626fb4 -s ours am: f9e5ef415b -s ours
am skip reason: Change-Id I0dec9eb7c2fecd3147e33e04d3f79f6dffcf7721 with SHA-1 a162e9592d is in history

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

Change-Id: I5cfb08e2fe47338ba3f55c6361eeb05a837fc505
2020-11-06 22:54:38 +00:00
TreeHugger Robot
3a1f7259d3 [automerger skipped] Merge "remove sensitive pii from safetynet logging" into pi-dev am: f2972ed9cb -s ours am: d2827da33b -s ours am: 3f350251c7 -s ours am: c5b49da5b2 -s ours am: 9a1b6f155b -s ours am: bdd8151746 -s ours
am skip reason: Change-Id I8f1be55971672c7e8f5aa8848f65b1b9d9f40fb5 with SHA-1 6d9794aa9f is in history

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

Change-Id: I5733e16ff12e2ce51ce4850d10a19becd9cefe03
2020-11-06 22:54:24 +00:00
TreeHugger Robot
9c2c375552 [automerger skipped] Merge "remove sensitive pii from safetynet logging" into qt-dev am: b7e4356258 -s ours am: 42a1a00dd9 -s ours am: 92fbc460fd -s ours am: 418e62c276 -s ours am: 755dfd4bb0 -s ours
am skip reason: Change-Id I8f1be55971672c7e8f5aa8848f65b1b9d9f40fb5 with SHA-1 6d9794aa9f is in history

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

Change-Id: I36e9ebacdb5e5bc7c6f021a7586cd77acd769145
2020-11-06 22:54:14 +00:00
TreeHugger Robot
376cf6af23 [automerger skipped] Merge "Revoke install permissions when the permission defining app is uninstalled." into rvc-dev am: 9004d4ce59 am: 7458f015f8 am: 6e4d7bc41c -s ours
am skip reason: Change-Id I4a5ecd9bede6f11d5023b3e8345b61d5b04e566f with SHA-1 719c9c5206 is in history

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

Change-Id: I7a4c5cda5433386634aa85901fb78f343fb58f45
2020-11-06 22:53:59 +00:00
Colin Cross
3c21dc5ade Merge "Revert "Add genrule for combined srcjar of modules"" am: 4d506d7420 am: ddf88a50cc am: 7a8204d670
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490422

Change-Id: I825e55b27c1a429ce4631599b6d8824dafc3dc91
2020-11-06 22:53:10 +00:00
Treehugger Robot
8cb52df72a Merge "Use ILights.DESCRIPTOR to refer to AIDL HAL" am: 26b017aae2 am: 2901676439
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426850

Change-Id: If94b4b15a762e850826a1ebbb0867cc115da2788
2020-11-06 22:53:04 +00:00
TreeHugger Robot
f143a2eb14 Merge "Ignore GrantCredentials call with unexpected calling uid." into pi-dev am: 5409071886 am: 9bca2e2c06 am: 36fabac3e9 am: 4b9ee68510 am: 50f534a82e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12933114

Change-Id: I83bc7b71b6aa99c5fef803fd55075f56df23ec1b
2020-11-06 22:52:53 +00:00
Dmitry Dementyev
2d868147e4 Ignore GrantCredentials call with unexpected calling uid. am: 88787b77a0 am: 2e5fe473e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12940344

Change-Id: Id30e803ed372bff60a3242a1667c5bd52cb12728
2020-11-06 22:52:46 +00:00
Treehugger Robot
2901676439 Merge "Use ILights.DESCRIPTOR to refer to AIDL HAL" am: 26b017aae2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426850

Change-Id: I4984eeb50a8c35a89099e6d300d3f6b6a36e62e4
2020-11-06 22:04:38 +00:00
Dmitry Dementyev
2e5fe473e1 Ignore GrantCredentials call with unexpected calling uid. am: 88787b77a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12940344

Change-Id: I87590ebfc45dea9c8a9d0ad46882ef03eb8fd5b9
2020-11-06 22:04:03 +00:00
TreeHugger Robot
2260e04189 Merge "Ignore GrantCredentials call with unexpected calling uid." into pi-dev am: 5409071886 am: 9bca2e2c06 am: 36fabac3e9 am: 4b9ee68510 am: 50f534a82e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12933114

Change-Id: I3cb3c2c8f6f87bc5313bbc85e0b2817e15df4db3
2020-11-06 22:03:10 +00:00
TreeHugger Robot
d2b6d3cba4 [automerger skipped] Merge changes from topic "12933478" into pi-dev am: a15664c01f -s ours am: df71b0f3a5 -s ours am: 8b8dba96db -s ours am: 4f68954df7 -s ours am: 9f415e9bad -s ours
am skip reason: Change-Id If3b420067b4d7111dcf67ae6f98e42176158b679 with SHA-1 dd41b25a83 is in history

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

Change-Id: Id3c1ebfa515f1fdbcf486c155bf3a9a777ed44c2
2020-11-06 22:02:45 +00:00
TreeHugger Robot
50dc8e60ee [automerger skipped] Merge "Hide overlays over uninstall confirm dialog" into qt-dev am: 75826a6664 am: 0bfb8a8808 -s ours am: 0e03f74361 -s ours am: 12a6173e62 -s ours
am skip reason: Change-Id I38b6d85871064d76f2911e20acc74b4ab76406b3 with SHA-1 cdec871e66 is in history

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

Change-Id: Id06762e18390dbb27731287de0fcf7bf249e97b1
2020-11-06 22:02:18 +00:00
TreeHugger Robot
9a4e85cb22 [automerger skipped] Merge "DO NOT MERGE Revoke install permissions when the permission defining app is uninstalled." into qt-dev am: 368a03507a am: e3a416b6ff -s ours am: 182544aa8b am: c35433cb4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12787259

Change-Id: I7af6e8848e86eec561f18fe6a3cfa0bacc6c8a70
2020-11-06 22:01:59 +00:00