Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
661,772 Commits 3 Branches 0 Tags
59cdac45ce58023918437705279da352803d3607
Commit Graph

661772 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
64f36a1646 [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 skip reason: subject contains skip directive

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

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

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

Change-Id: Id9581db45a6bbf1233af5b30be6dfc0ec1b2feec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 11:24:20 +00:00
Ganesh Olekar
1dd4d7a13b [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 skip reason: subject contains skip directive

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

Change-Id: I61366ced6d7420d3177b605de16e09f8700bc1bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 10:49:13 +00:00
Ganesh Olekar
a9c783eff8 [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 skip reason: subject contains skip directive

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

Change-Id: I78650b8623fa87e0aa2ed93ca9efa61443fb902b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 10:49:03 +00:00
Ganesh Olekar
e37a0ac9f8 DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q 
Test: Manually install app apks targeting Q and verifying that AR permission is not auto-granted
Test: atest ActivityRecognitionPermissionTest
Bug: 210065877
Change-Id: I90adf45a6611ab8bc953765c72af77a6a4f7aae8
(cherry picked from commit 84b1160cfc)
 2022-08-15 10:47:16 +00:00
Ganesh Olekar
191abef1fa [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 skip reason: subject contains skip directive

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

Change-Id: Icc8ef5da62fe7413a50c86aa8e396b0a549d323d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 10:30:49 +00:00
Ganesh Olekar
c0994ae1c9 [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 skip reason: subject contains skip directive

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

Change-Id: Icd3ec52f922427f9dff4b4385df85261185922bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 10:30:19 +00:00
Ganesh Olekar
e0cb2beeae [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 skip reason: subject contains skip directive

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

Change-Id: Ibeda38633536962746a52ec868cdec0d6c3af581
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 10:14:08 +00:00
Ganesh Olekar
6bfd59aabf [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 skip reason: subject contains skip directive

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

Change-Id: If3afaa8ec98a89c24b850e35699e0ce155629261
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 10:13:47 +00:00
Ganesh Olekar
0f8fc1a47e [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 skip reason: subject contains skip directive

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

Change-Id: Ic974d67a09adfde7137fac9d90b67d69f38133a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 09:55:28 +00:00
Ganesh Olekar
6732f3304f [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 skip reason: subject contains skip directive

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

Change-Id: If7d552e9ede491bff1daf95515eea4d5b04e7cf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 09:55:04 +00:00
Ganesh Olekar
dc45b9fed3 Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into qt-dev am: e893eff6f2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18327410

Change-Id: I782fb9a0fe395df6413d543b27812112a531cfea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 09:38:09 +00:00
Ganesh Olekar
0a761a9510 [conflict] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: 84b1160cfc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18327410

Change-Id: I439bf33ed4be4f0bf2439f5565b57c9bdc398504
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 06:35:33 +00:00
Ganesh Olekar
e893eff6f2 Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into qt-dev 2022-08-15 06:08:20 +00:00
Louis Chang
84ffde6aee [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into rvc-dev am: 34f726089c -s ours am: 62767d9c63 -s ours am: 5a13803145 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I564688b67c22fbbd651d438775c2a2d93ad0fc19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 01:19:21 +00:00
Louis Chang
e57322da82 [automerger skipped] [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo am: 834812c423 -s ours am: 13d83ff367 -s ours am: c8ee8aa4b6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I558effa82d3be5e682d4eeceaf4b9745f87aa656
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 01:19:04 +00:00
Louis Chang
5a13803145 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into rvc-dev am: 34f726089c -s ours am: 62767d9c63 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If1d2dd03673bac844eb986f5616f4186661101bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 01:01:38 +00:00
Louis Chang
c8ee8aa4b6 [automerger skipped] [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo am: 834812c423 -s ours am: 13d83ff367 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I96ee0c51f7080bee5f8fd5b6482466116a3351ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 01:01:22 +00:00
Louis Chang
62767d9c63 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into rvc-dev am: 34f726089c -s ours 
am skip reason: Merged-In I854dd825bfd9a2c08851980d480d1f3a177af6cf with SHA-1 b9a9340645 is already in history

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

Change-Id: I3bd05469fbbc1f9de82b11850c9edf155aabcd0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 00:44:48 +00:00
Louis Chang
13d83ff367 [automerger skipped] [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo am: 834812c423 -s ours 
am skip reason: Merged-In I854dd825bfd9a2c08851980d480d1f3a177af6cf with SHA-1 b9a9340645 is already in history

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

Change-Id: I23dabc778ae73387e01f8045e6e5e1276198a069
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 00:44:32 +00:00
Louis Chang
34f726089c Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into rvc-dev 2022-08-15 00:21:27 +00:00
TreeHugger Robot
cc9f928062 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-08-12 18:52:00 +00:00
TreeHugger Robot
bd67b85760 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-08-12 18:52:00 +00:00
TreeHugger Robot
d11c19eee1 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-08-12 18:52:00 +00:00
Bill Yi
259c1605c5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If07d7eda8ffbde4a504351071811ede99caa020d
 2022-08-12 07:05:45 -07:00
Bill Yi
2ee61bde16 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I76bf3751a77c380d1379fdbd00cb29d751acd24f
 2022-08-11 18:25:22 -07:00
Bill Yi
65f2e4546a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I88616d22c0394c85b15501b77e6274f481398eff
 2022-08-11 16:01:26 -07:00
TreeHugger Robot
8ddfb724a4 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into qt-dev am: 750c978db5 am: b302dca798 -s ours am: 192f2e6360 -s ours am: 201e93d899 -s ours am: e16f53a4f4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9bc48eea2897ca285cfb775d981260b072877522
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 18:12:01 +00:00
Louis Chang
2f8a15c0a9 [automerger skipped] [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo am: b9a9340645 am: 53c6a79cfd -s ours am: b38b3eaccb -s ours am: 7ca38bea98 -s ours am: 2f75f308be -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifc9617eeabe6409c2777d3012e49738c5b2f6e40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 18:11:44 +00:00
TreeHugger Robot
e16f53a4f4 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into qt-dev am: 750c978db5 am: b302dca798 -s ours am: 192f2e6360 -s ours am: 201e93d899 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If02392bbbd41af80746fe76a5b50914ce515506f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 17:31:41 +00:00
Louis Chang
2f75f308be [automerger skipped] [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo am: b9a9340645 am: 53c6a79cfd -s ours am: b38b3eaccb -s ours am: 7ca38bea98 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaef6c494e9fcbb2758a8e4d3fb0fe3213e3b4572
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 17:31:22 +00:00
TreeHugger Robot
201e93d899 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into qt-dev am: 750c978db5 am: b302dca798 -s ours am: 192f2e6360 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7e3e4394a6658872b17d5cd4423cb8f8f8f8dcd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 17:06:40 +00:00
Louis Chang
7ca38bea98 [automerger skipped] [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo am: b9a9340645 am: 53c6a79cfd -s ours am: b38b3eaccb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I53b370d38eee3f2c7986dea88390fb61e941c9e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 17:06:33 +00:00
TreeHugger Robot
192f2e6360 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into qt-dev am: 750c978db5 am: b302dca798 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I37fb6ef29c8bf945b2d2201b71d18a8589effcf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 16:49:35 +00:00
Louis Chang
b38b3eaccb [automerger skipped] [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo am: b9a9340645 am: 53c6a79cfd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9334f8f8223d74767a6ae95f5e74a8c9abebfd0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 16:49:12 +00:00
TreeHugger Robot
b302dca798 Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into qt-dev am: 750c978db5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19518948

Change-Id: I04e528e35f4c860b0f989e7c3e063a9bc5e23cf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 16:17:37 +00:00
Louis Chang
53c6a79cfd [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo am: b9a9340645 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19518948

Change-Id: I298a415227f87fa71a196cfad35c88319f265e50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 16:17:21 +00:00
TreeHugger Robot
753f094d4f [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into sc-dev am: 860327234e -s ours 
am skip reason: Merged-In I854dd825bfd9a2c08851980d480d1f3a177af6cf with SHA-1 89ebc8c43f is already in history

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

Change-Id: I5c7c93eb3edb602f3b4ace0d0e843300d0e31290
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 16:16:58 +00:00
TreeHugger Robot
750c978db5 Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into qt-dev 2022-08-11 15:41:19 +00:00
TreeHugger Robot
f0e3514d8e Merge changes from topic "new-intent-navUp-sc" into sc-mainline-prod 
* changes:
  [automerge] [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo 2p: 89ebc8c43f
  [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo
 2022-08-11 15:40:55 +00:00
TreeHugger Robot
860327234e Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into sc-dev 2022-08-11 15:40:54 +00:00
Yuri Lin
0245ef047a [automerger skipped] Merge changes from topic "cherrypick-cherrypick-jr-owner-azffbn1bzv-wo9su3lsju" into rvc-dev am: 4d015c710d -s ours am: b93dab4bb9 -s ours am: badff3883f -s ours 
am skip reason: Merged-In I35daf9a24f546ae25a78a2d841be39072cdc5641 with SHA-1 55d8e634dc is already in history

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

Change-Id: Ica0e34de6dec41e17ca2d402f9903a6483db028a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 03:16:38 +00:00
Yuri Lin
47e4e53d03 [automerger skipped] Enforce zen rule limit on a package level. am: 468dd54e8b -s ours am: 1efafda612 -s ours am: adbdf8019e -s ours 
am skip reason: Merged-In I35daf9a24f546ae25a78a2d841be39072cdc5641 with SHA-1 55d8e634dc is already in history

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

Change-Id: Icd1c852b37e65b2e480f8d3cbaaadb955c8ad4e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 03:16:35 +00:00
Yuri Lin
badff3883f [automerger skipped] Merge changes from topic "cherrypick-cherrypick-jr-owner-azffbn1bzv-wo9su3lsju" into rvc-dev am: 4d015c710d -s ours am: b93dab4bb9 -s ours 
am skip reason: Merged-In I35daf9a24f546ae25a78a2d841be39072cdc5641 with SHA-1 55d8e634dc is already in history

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

Change-Id: I073b9d54e225b9ddc1dc45506966957a43a325d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 02:51:56 +00:00
Yuri Lin
adbdf8019e [automerger skipped] Enforce zen rule limit on a package level. am: 468dd54e8b -s ours am: 1efafda612 -s ours 
am skip reason: Merged-In I35daf9a24f546ae25a78a2d841be39072cdc5641 with SHA-1 55d8e634dc is already in history

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

Change-Id: Ie7fa9bbad5410c46d72f531256637c179c22aed9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 02:51:28 +00:00
Yuri Lin
b93dab4bb9 [automerger skipped] Merge changes from topic "cherrypick-cherrypick-jr-owner-azffbn1bzv-wo9su3lsju" into rvc-dev am: 4d015c710d -s ours 
am skip reason: Merged-In I35daf9a24f546ae25a78a2d841be39072cdc5641 with SHA-1 55d8e634dc is already in history

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

Change-Id: I754fc047ab9b5834f905d538be92919042b12c8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 02:26:26 +00:00
Yuri Lin
1efafda612 [automerger skipped] Enforce zen rule limit on a package level. am: 468dd54e8b -s ours 
am skip reason: Merged-In I35daf9a24f546ae25a78a2d841be39072cdc5641 with SHA-1 55d8e634dc is already in history

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

Change-Id: Iec40cec2312835a929ca162defc470f58bef44cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 02:26:05 +00:00
Louis Chang
b9a9340645 [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo 
The new Intent was delivered to a non-exported activity while
#navigateUpTo was called from an Activity of a different uid.

Bug: 238605611
Test: atest StartActivityTests
Change-Id: I854dd825bfd9a2c08851980d480d1f3a177af6cf
Merged-In: I854dd825bfd9a2c08851980d480d1f3a177af6cf
 2022-08-11 02:03:47 +00:00