Commit Graph

766980 Commits

Author SHA1 Message Date
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
7faed5aaff Merge "Reland: Remove workarounds by data_device_bins" into tm-dev 2022-08-15 19:05:42 +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
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
f0c41b828c [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 skip reason: subject contains skip directive

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

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

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

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

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

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

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

Change-Id: I036b75fd8f9905de29dd7ef068d1e752ff91224a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15 11:26:06 +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
cd81d678a7 [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: e2f3821ed7 -s ours
am skip reason: subject contains skip directive

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

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

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

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

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

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

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

Change-Id: I31274f61eba94e1488a4f3e15dc93459d4094f4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15 01:56:12 +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
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
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
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