Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
763,036 Commits 3 Branches 0 Tags
561afceeeb3bd4fc5dfddc340257f316abad8be9
Commit Graph

763036 Commits

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

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

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

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

Change-Id: Ia741064bdcb8418842e5efacdc10882a52fea447
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 11:24:25 +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
727120aa1f [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 skip reason: subject contains skip directive

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

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

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

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

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

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

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

Change-Id: I1015d73ea115629a760d1926571462abe0e107e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 11:08:54 +00:00
Ganesh Olekar
108fb60e32 [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: I6d80becaccd64167042e815f497fe7ab1a5fd7be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 10:50:16 +00:00
Ganesh Olekar
5d8583773a [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: Ib4acc617fbcbf2d02649878facb975d5d34d52d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 10:50:11 +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
e2f3821ed7 [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: e43ee48e5d -s ours am: 01d360f872 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idca54116a95e2674f1249a9382f928d2a38d5900
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 01:55:13 +00:00
Louis Chang
52b43739ab [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: 4c8ff444cd -s ours am: d02b903a96 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic3f582126050f051dba479c92af99ec6adc5051d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 01:54:41 +00:00
Louis Chang
bb77da695a [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: 84ffde6aee -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7de55f2d7c12c6aec3df37987fec0b85f70f3920
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 01:38:32 +00:00
Louis Chang
01d360f872 [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: e43ee48e5d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ied6594b05bd07ea296cf6ac872ce095b048c5793
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 01:38:19 +00:00
Louis Chang
d02b903a96 [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: 4c8ff444cd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie808a0ded0b864a88997faf819825d10ede826fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 01:38:07 +00:00
Louis Chang
304cb179a6 [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: e57322da82 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I98f4a9ea559d29411f909643ef41d9efb9908e8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 01:38:07 +00:00
Louis Chang
e43ee48e5d [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: I156aae3aa2546dfddf3167d67541e5bdc0c2baee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 01:20:14 +00:00
Louis Chang
4c8ff444cd [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: I4f3e0222550de5566b21da7132d1202e435e5a9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 01:20:11 +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
Shaowei Shen
9e042e9da2 Merge "[Output Switcher] Add platform config for Output Switcher" into tm-dev 2022-08-13 17:02:23 +00:00
TreeHugger Robot
4415aeb96b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: cc9f928062 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5f4f46b44ff2889957a2f919fe9c4b084553ecf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-13 04:03:31 +00:00
Bill Yi
3cedb8305d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 259c1605c5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I635d852f29bfb5d767e2df1b61bf8894e6849ccb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-13 04:03:11 +00:00
TreeHugger Robot
38f37a79c3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: bd67b85760 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7c3579f2c9d017d986a723ea6625e498e5def765
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-13 04:02:35 +00:00
Bill Yi
95dce8993b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65f2e4546a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If9e57ed7f04ff65d7c0676647eeee46e01107e06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-13 04:02:22 +00:00
TreeHugger Robot
08676fc5d7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: d11c19eee1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0d6c6b0b0edb5568c483cb1c31ec6ae7fef444e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-13 04:01:53 +00:00
Bill Yi
9b748c30f5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ee61bde16 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9b7983039e83a04480f2f7b8df10258af0916140
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-13 04:01:17 +00:00