Julia Reynolds
77e088c8b5
[automerger skipped] Merge "DO NOT MERGE Prevent apps from creating blocked channel groups" into qt-dev am: f1dc5b1ee1 am: 960d42c069 -s ours am: 2675838e1b -s ours am: 09a1321d8d -s ours am: b9894cc610 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16621952
Change-Id: I88f0365e55e107be2c39cc96731bf1bc95d21936
2022-01-21 04:07:36 +00:00
Julia Reynolds
ee2cc5a448
[automerger skipped] DO NOT MERGE Prevent apps from creating blocked channel groups am: b993531c0d am: d761dbd934 -s ours am: 8b386cd940 -s ours am: 222443606d -s ours am: a51336f4e6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16621952
Change-Id: I3a34907994628d9af25631a96c0aea3bfdc8e368
2022-01-21 04:07:09 +00:00
Julia Reynolds
b9894cc610
[automerger skipped] Merge "DO NOT MERGE Prevent apps from creating blocked channel groups" into qt-dev am: f1dc5b1ee1 am: 960d42c069 -s ours am: 2675838e1b -s ours am: 09a1321d8d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16621952
Change-Id: I0490ee1542c7005e20f8cf35a02223902c9cdb2f
2022-01-21 03:49:04 +00:00
Julia Reynolds
a51336f4e6
[automerger skipped] DO NOT MERGE Prevent apps from creating blocked channel groups am: b993531c0d am: d761dbd934 -s ours am: 8b386cd940 -s ours am: 222443606d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16621952
Change-Id: I55234fe5f425adf3510cc92b17bdc49fe6b23c41
2022-01-21 03:48:44 +00:00
Julia Reynolds
09a1321d8d
[automerger skipped] Merge "DO NOT MERGE Prevent apps from creating blocked channel groups" into qt-dev am: f1dc5b1ee1 am: 960d42c069 -s ours am: 2675838e1b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16621952
Change-Id: I9a6597ab4b8bbda62b7c9b18bc58c8153e218ee7
2022-01-21 03:30:42 +00:00
Julia Reynolds
222443606d
[automerger skipped] DO NOT MERGE Prevent apps from creating blocked channel groups am: b993531c0d am: d761dbd934 -s ours am: 8b386cd940 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16621952
Change-Id: If70b13ac707b10106482d267e1ce6bbbf6109c62
2022-01-21 03:30:32 +00:00
Julia Reynolds
2675838e1b
[automerger skipped] Merge "DO NOT MERGE Prevent apps from creating blocked channel groups" into qt-dev am: f1dc5b1ee1 am: 960d42c069 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16621952
Change-Id: I308e0832337098a5aa76866462f388376e600998
2022-01-21 03:14:02 +00:00
Julia Reynolds
8b386cd940
[automerger skipped] DO NOT MERGE Prevent apps from creating blocked channel groups am: b993531c0d am: d761dbd934 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16621952
Change-Id: I54461007f75b5744e6e3473489f052ca81f28ad5
2022-01-21 03:13:57 +00:00
Julia Reynolds
960d42c069
Merge "DO NOT MERGE Prevent apps from creating blocked channel groups" into qt-dev am: f1dc5b1ee1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16621952
Change-Id: I82685952d905e11a0f2fec6a2ae1bee2977b0508
2022-01-21 02:55:13 +00:00
Julia Reynolds
d761dbd934
DO NOT MERGE Prevent apps from creating blocked channel groups am: b993531c0d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16621952
Change-Id: I5b403d7736e1951f3cc75d650c8680bb137d549c
2022-01-21 02:55:00 +00:00
Julia Reynolds
f1dc5b1ee1
Merge "DO NOT MERGE Prevent apps from creating blocked channel groups" into qt-dev
2022-01-21 02:33:54 +00:00
TreeHugger Robot
94b016162b
[automerger skipped] Merge "Prevent apps from creating blocked channel groups" into qt-qpr1-dev am: 59300f1715 -s ours am: dc2e9bd10f -s ours am: 93769d75c3 -s ours am: d9df899df2 -s ours
...
am skip reason: skipped by user juliacr
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16624026
Change-Id: I97fafa2392db78ea092eb2c9325b010ee1a22495
2022-01-20 20:54:03 +00:00
TreeHugger Robot
2f4dcb69c1
[automerger skipped] Merge "Prevent apps from creating blocked channel groups" into qt-qpr1-dev am: 59300f1715 -s ours am: dc2e9bd10f -s ours am: ec769a7559 -s ours am: 87c76c5af6 -s ours
...
am skip reason: skipped by user juliacr
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16624026
Change-Id: Ia4cc40dd5e6da42100aad34982b1e0d87ee29909
2022-01-20 20:53:52 +00:00
TreeHugger Robot
d9df899df2
[automerger skipped] Merge "Prevent apps from creating blocked channel groups" into qt-qpr1-dev am: 59300f1715 -s ours am: dc2e9bd10f -s ours am: 93769d75c3 -s ours
...
am skip reason: skipped by user juliacr
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16624026
Change-Id: I5a06ee19e43207e75d87526a0132f2cad108f2bc
2022-01-20 20:38:18 +00:00
TreeHugger Robot
87c76c5af6
[automerger skipped] Merge "Prevent apps from creating blocked channel groups" into qt-qpr1-dev am: 59300f1715 -s ours am: dc2e9bd10f -s ours am: ec769a7559 -s ours
...
am skip reason: skipped by user juliacr
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16624026
Change-Id: Iba1b42de85033832b1dfa1e7ffd73541ae681746
2022-01-20 20:37:17 +00:00
TreeHugger Robot
93769d75c3
[automerger skipped] Merge "Prevent apps from creating blocked channel groups" into qt-qpr1-dev am: 59300f1715 -s ours am: dc2e9bd10f -s ours
...
am skip reason: skipped by user juliacr
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16624026
Change-Id: Ibf0d0c19e5d93eaacd6b577e54f06e737b7479eb
2022-01-20 20:19:19 +00:00
TreeHugger Robot
ec769a7559
[automerger skipped] Merge "Prevent apps from creating blocked channel groups" into qt-qpr1-dev am: 59300f1715 -s ours am: dc2e9bd10f -s ours
...
am skip reason: skipped by user juliacr
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16624026
Change-Id: I5ba71a7a71fba49c9415685eb408c10c0c67ae7b
2022-01-20 20:18:17 +00:00
Automerger Merge Worker
25adc0a063
Merge "Merge "Prevent apps from creating blocked channel groups" into rvc-dev am: fc06439710 am: 5f9f8f23df" into sc-dev am: 6f4654c616
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16624024
Change-Id: I1fa439f79be0a9ba66c825f1c9a266109777fc68
2022-01-20 20:13:33 +00:00
TreeHugger Robot
17795cfab6
Merge "Prevent apps from creating blocked channel groups" into rvc-dev am: fc06439710 am: 3e759cc3a5 am: 5e918c2148
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16624024
Change-Id: I4a1bdfeb313b80bdb74fe57fe57044f238b43cd8
2022-01-20 20:12:40 +00:00
TreeHugger Robot
dc2e9bd10f
[automerger skipped] Merge "Prevent apps from creating blocked channel groups" into qt-qpr1-dev am: 59300f1715 -s ours
...
am skip reason: skipped by user juliacr
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16624026
Change-Id: I77e5ec7ed4765d755f9471141def9d6341d65d48
2022-01-20 20:00:12 +00:00
Automerger Merge Worker
6f4654c616
Merge "Merge "Prevent apps from creating blocked channel groups" into rvc-dev am: fc06439710 am: 5f9f8f23df" into sc-dev
2022-01-20 19:55:59 +00:00
TreeHugger Robot
5e918c2148
Merge "Prevent apps from creating blocked channel groups" into rvc-dev am: fc06439710 am: 3e759cc3a5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16624024
Change-Id: Ia76ba167a040f606c4a847b62546c6fcada1d530
2022-01-20 19:54:40 +00:00
TreeHugger Robot
631386661c
Merge "Prevent apps from creating blocked channel groups" into rvc-dev am: fc06439710 am: 5f9f8f23df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16624024
Change-Id: I63d62cd6994f4de188c23ca21d99d4c20e5607eb
2022-01-20 19:54:05 +00:00
TreeHugger Robot
3e759cc3a5
Merge "Prevent apps from creating blocked channel groups" into rvc-dev am: fc06439710
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16624024
Change-Id: I4cc732fba700dba73d695166435f4f22994b7e31
2022-01-20 19:38:20 +00:00
TreeHugger Robot
5f9f8f23df
Merge "Prevent apps from creating blocked channel groups" into rvc-dev am: fc06439710
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16624024
Change-Id: I3424a6090a1646c995a47f6e82371b04b8d668cd
2022-01-20 19:38:02 +00:00
TreeHugger Robot
fc06439710
Merge "Prevent apps from creating blocked channel groups" into rvc-dev
2022-01-20 19:21:42 +00:00
TreeHugger Robot
59300f1715
Merge "Prevent apps from creating blocked channel groups" into qt-qpr1-dev
2022-01-20 18:36:45 +00:00
Julia Reynolds
657648b98a
Merge "Prevent apps from creating blocked channel groups" into rvc-qpr-dev am: f8994409fe am: bf4e84b7ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16623721
Change-Id: I33e2c8957e80528745c6d863ed247818b6081040
2022-01-20 17:38:12 +00:00
Julia Reynolds
bf4e84b7ad
Merge "Prevent apps from creating blocked channel groups" into rvc-qpr-dev am: f8994409fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16623721
Change-Id: I0d9da9d18fd1b256847774d3028219700a23b397
2022-01-20 17:33:37 +00:00
Julia Reynolds
7b65e59992
Merge "Prevent apps from creating blocked channel groups" into sc-dev am: 5769ab47bf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16623717
Change-Id: Id23bcb71048f8f5b49decb2b7b343d24747da1da
2022-01-20 17:33:22 +00:00
Julia Reynolds
5769ab47bf
Merge "Prevent apps from creating blocked channel groups" into sc-dev
2022-01-20 17:17:48 +00:00
Julia Reynolds
f8994409fe
Merge "Prevent apps from creating blocked channel groups" into rvc-qpr-dev
2022-01-20 17:17:35 +00:00
Julia Reynolds
b993531c0d
DO NOT MERGE Prevent apps from creating blocked channel groups
...
setBlocked is a hidden API, so apps should not be calling
the method, but fix up the data in case they do
Test: PreferencesHelperTest; manual with ApiDemos FGS
Bug: 209966086
Change-Id: Icc709a6b0d0a8c5f2d9243959992f1b6764354db
Merged-In: I8a27853c7ed05d9dfd38a3142fbbe185946c3992
2022-01-20 16:42:59 +00:00
TreeHugger Robot
66a37b067b
[automerger skipped] Merge "Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first"" into qt-dev am: 13ad919ff5 am: c4ee9df900 -s ours am: 9523520806 -s ours am: da52474c71 -s ours am: d38a74d2b6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16630308
Change-Id: I77b33ca2a46c9b8b76c31f9038d46139ff0287e9
2022-01-19 23:22:46 +00:00
Wu Ahan
c6cc906c27
[automerger skipped] Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first" am: b6509bdc18 am: 14bfa0cbd0 -s ours am: 5336a5afbb -s ours am: 5ce8479b9a -s ours am: 14985d3e9d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16630308
Change-Id: I98356025741ec350a65a3122d1cef463f57fdeef
2022-01-19 23:22:40 +00:00
TreeHugger Robot
f179be0ed9
[automerger skipped] Merge "Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first"" into qt-dev am: 13ad919ff5 am: c4ee9df900 -s ours am: 9523520806 -s ours am: 5c2e89e268 -s ours am: 25f8c85ab5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16630308
Change-Id: Ic851a03c57f5c84d01ec62fa88a0616665b8a8d5
2022-01-19 23:22:28 +00:00
Wu Ahan
4c5ac4f54c
[automerger skipped] Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first" am: b6509bdc18 am: 14bfa0cbd0 -s ours am: 5336a5afbb -s ours am: 81a32d5eb5 -s ours am: 4fc95f8684 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16630308
Change-Id: I9e8bdf8d65fc8591ed35a3f5a00f4b1930edf4a7
2022-01-19 23:22:20 +00:00
TreeHugger Robot
d38a74d2b6
[automerger skipped] Merge "Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first"" into qt-dev am: 13ad919ff5 am: c4ee9df900 -s ours am: 9523520806 -s ours am: da52474c71 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16630308
Change-Id: Ib9d37dfa231509668f83d82f5d593e1b46b442d8
2022-01-19 23:04:26 +00:00
Wu Ahan
14985d3e9d
[automerger skipped] Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first" am: b6509bdc18 am: 14bfa0cbd0 -s ours am: 5336a5afbb -s ours am: 5ce8479b9a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16630308
Change-Id: Ib2d92d8c41ea1e01f3d925f5cacf845388c1dd64
2022-01-19 23:04:06 +00:00
TreeHugger Robot
25f8c85ab5
[automerger skipped] Merge "Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first"" into qt-dev am: 13ad919ff5 am: c4ee9df900 -s ours am: 9523520806 -s ours am: 5c2e89e268 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16630308
Change-Id: If81def7bc1defd58ffb6283dcda5cabc4a6e923d
2022-01-19 23:03:34 +00:00
Wu Ahan
4fc95f8684
[automerger skipped] Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first" am: b6509bdc18 am: 14bfa0cbd0 -s ours am: 5336a5afbb -s ours am: 81a32d5eb5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16630308
Change-Id: Ida7fb9ede86913b6013b53bfc14e43ad566c304b
2022-01-19 23:03:06 +00:00
TreeHugger Robot
f6581b2443
[automerger skipped] Merge "Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first"" into rvc-dev am: 57095ccbeb am: 49a8f9ebd7 -s ours am: c14fe55f10 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16631185
Change-Id: Idadc01bb0acefd289e5476a3bae73c1a1932de81
2022-01-19 22:46:18 +00:00
Wu Ahan
5018200a5f
[automerger skipped] Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first" am: cc4fe8984a am: 38cd0a81dd -s ours am: c4fafb31a6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16631185
Change-Id: If4fa84e484fbc14c897ba89aa36f7a061961de6f
2022-01-19 22:46:04 +00:00
TreeHugger Robot
da52474c71
[automerger skipped] Merge "Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first"" into qt-dev am: 13ad919ff5 am: c4ee9df900 -s ours am: 9523520806 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16630308
Change-Id: I130da6f8976c568d8c7d2053933d20316c526b95
2022-01-19 22:45:41 +00:00
Wu Ahan
5ce8479b9a
[automerger skipped] Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first" am: b6509bdc18 am: 14bfa0cbd0 -s ours am: 5336a5afbb -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16630308
Change-Id: I3a4dbd7793ff8caed01dccd2264e6f51e4cef8c5
2022-01-19 22:45:38 +00:00
TreeHugger Robot
954e2ef6d5
[automerger skipped] Merge "Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first"" into rvc-dev am: 57095ccbeb am: 83a82c4919 -s ours am: 136021e23d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16631185
Change-Id: I08a2446bef1e13d8e379e6d93715da98be72ca91
2022-01-19 22:45:18 +00:00
Wu Ahan
eb07af5607
[automerger skipped] Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first" am: cc4fe8984a am: 64479d2daf -s ours am: eda5c14742 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16631185
Change-Id: Ief0f687aef37ace0ccb9c03b17dcf81a8ab4c185
2022-01-19 22:45:12 +00:00
TreeHugger Robot
5c2e89e268
[automerger skipped] Merge "Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first"" into qt-dev am: 13ad919ff5 am: c4ee9df900 -s ours am: 9523520806 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16630308
Change-Id: I8cfa0e06b4ad7d7356a2157ca41005ef61b98538
2022-01-19 22:44:59 +00:00
Wu Ahan
81a32d5eb5
[automerger skipped] Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first" am: b6509bdc18 am: 14bfa0cbd0 -s ours am: 5336a5afbb -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16630308
Change-Id: Id3215a1ad42982a73498cc757f9566f21991b756
2022-01-19 22:44:48 +00:00
TreeHugger Robot
c14fe55f10
[automerger skipped] Merge "Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first"" into rvc-dev am: 57095ccbeb am: 49a8f9ebd7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16631185
Change-Id: I4fbffa4d846bf385c1f2b5e217e146975dac8149
2022-01-19 22:40:11 +00:00
