Benedict Wong
|
1cdff0cb4f
|
Merge "Revert "Revert "Listen for individual subscription mobile data toggles""" am: ab7f5b533d am: 1ff62d0578
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1949076
Change-Id: I3df0695929bfcdd60225aacb1b31871eb8cf3b4b
|
2022-01-20 05:35:44 +00:00 |
|
Junyu Lai
|
dba45b947a
|
Merge "[MS24] Remove FileUtils.sync dependencies" am: f1245786d6 am: ff3bbac2a1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1934457
Change-Id: I0c921d46aec1ffde844c91fc95edb8b18331198d
|
2022-01-20 05:35:28 +00:00 |
|
Treehugger Robot
|
b9f8d8b613
|
Merge "Remove ServiceManager usage from IpSecTransform" am: 5a1c3525f1 am: dfffffedcb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1933095
Change-Id: I071e5c02bde272f5a79081c8a0164594d41f2c91
|
2022-01-20 05:35:15 +00:00 |
|
Junyu Lai
|
385a5e8cc0
|
Merge changes I16418791,I210f5ddc am: b52609172e am: 86811b5fba
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1948617
Change-Id: Ib2a5252323f702e7d0d9847558e5b4da16703f29
|
2022-01-20 05:35:00 +00:00 |
|
Frank Li
|
c9925f1579
|
Merge "[DU04-1]Remove NetworkPolicyManagerInternal from NetworkStatsService" am: df246f3c62 am: ff2f7802ff
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1944531
Change-Id: I9243bb9123a1e6db47e55bd80ecb579f934c3c16
|
2022-01-20 05:34:39 +00:00 |
|
Aaron Huang
|
fede4b95bc
|
Merge "Replace buildTemplate* with NetworkTemplate.Builder" am: b892406528 am: 2b319b14e2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1933089
Change-Id: I8b868833c50a8401ee751e8e95f3ee3e54f9a222
|
2022-01-20 05:34:14 +00:00 |
|
Xiao Ma
|
b283a388c8
|
Merge "Fix the Preconditions dependency in EthernetNetworkSpecifier." am: 13dbbcbc09 am: 6814385379
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1952108
Change-Id: Ie543f7859c93cff3d47cf0f6c4b8b35d0c025e38
|
2022-01-20 05:32:44 +00:00 |
|
Roopa Sattiraju
|
d4b3e9dfa6
|
Merge "Merge "Migrating frameworks/base BT files" am: 070f2b0502 am: 6d8e9705c9" into sc-qpr1-dev-plus-aosp
|
2022-01-20 05:28:09 +00:00 |
|
Treehugger Robot
|
b53d3cef23
|
Merge "Migrating frameworks/base BT files" am: 070f2b0502 am: 6d8e9705c9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1952596
Merged-In: Idb55371e9d678296fe46e5f4231ec2d12ec8b978
Change-Id: I57e083e4893583540c2005e393c692c01d63d775
|
2022-01-20 00:03:29 +00:00 |
|
TreeHugger Robot
|
b1144cacf8
|
[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: c3571ee944 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16630308
Change-Id: I7d30c3fd483c703ccb165fe905f9f6b97c309bb7
|
2022-01-19 23:47:38 +00:00 |
|
Wu Ahan
|
dd398d368f
|
[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: b4e4fabe96 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16630308
Change-Id: I3da8de4d34fb57ccef8478abb1dbe551c9d5dd35
|
2022-01-19 23:47:00 +00:00 |
|
TreeHugger Robot
|
00b18609fa
|
[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: 55ba19a4af -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16630308
Change-Id: I1091af4047ad17f574d77c3c14276c3a3aad2666
|
2022-01-19 23:46:33 +00:00 |
|
Wu Ahan
|
0435f96381
|
[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: 2be97bbf33 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16630308
Change-Id: Ifbf8ded237565297f17971a8b5184199a1a9caf1
|
2022-01-19 23:46:05 +00:00 |
|
TreeHugger Robot
|
c3571ee944
|
[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: I0326bb2b1b2fabff921acfeb13082ccb98812ee5
|
2022-01-19 23:23:43 +00:00 |
|
Wu Ahan
|
b4e4fabe96
|
[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: I688dea9b93ffd60db8e8c076607d378aee443527
|
2022-01-19 23:23:34 +00:00 |
|
TreeHugger Robot
|
55ba19a4af
|
[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: If2679bcfe839c7c93871eac78636149efbc41ce5
|
2022-01-19 23:23:13 +00:00 |
|
Wu Ahan
|
2be97bbf33
|
[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: I72e0ed752094cb5727bd1b4669743fac5ed49193
|
2022-01-19 23:23:10 +00:00 |
|
Ayush Sharma
|
1ae887c0e9
|
Merge "Return PO or DO for POLICY_SUSPEND_PACKAGES" into sc-qpr1-dev am: 3c7c22f4d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16659231
Change-Id: Id4dcc42814ea9c5579411b968c5a7d17d9e25805
|
2022-01-19 23:10:50 +00:00 |
|
Ayush Sharma
|
3c7c22f4d9
|
Merge "Return PO or DO for POLICY_SUSPEND_PACKAGES" into sc-qpr1-dev
|
2022-01-19 23:08:37 +00:00 |
|
TreeHugger Robot
|
c1ff156be4
|
[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: 03f15493ac -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16631185
Change-Id: I22629213521127b9553026b3831c33b547a091bc
|
2022-01-19 23:05:08 +00:00 |
|
Wu Ahan
|
bcd8ab4b70
|
[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: aa63ae33c9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16631185
Change-Id: I84ac50001965ad16d2fc04e61917b077547f9f6d
|
2022-01-19 23:04:56 +00:00 |
|
TreeHugger Robot
|
c2b81bd40c
|
[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: f2c3d1e71f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16631185
Change-Id: I410064e9e7ec4e93aac567601a80c38b65aed6a4
|
2022-01-19 23:04:35 +00:00 |
|
Wu Ahan
|
96a7b3afe9
|
[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: 607c953378 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16631185
Change-Id: I4a1953d5a77cedf9d4cd734a7fc77135a18fd82d
|
2022-01-19 23:04:28 +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
|
03f15493ac
|
[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: I33b62f083fb498d71df171554df77c252d4c1b8a
|
2022-01-19 22:46:26 +00:00 |
|
Wu Ahan
|
aa63ae33c9
|
[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: I3c9aca7924650cfc8e6176e6b5941aa81c090b08
|
2022-01-19 22:46:25 +00:00 |
|
TreeHugger Robot
|
f2c3d1e71f
|
[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: Id642f491327c92bdeafdedbe38c9379b42fe860f
|
2022-01-19 22:46:04 +00:00 |
|
Wu Ahan
|
607c953378
|
[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: I24e156936edfc384a428c3b356d561de2ad6d0c9
|
2022-01-19 22:45:59 +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
|
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 |
|
Wu Ahan
|
c4fafb31a6
|
[automerger skipped] Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first" am: cc4fe8984a am: 38cd0a81dd -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16631185
Change-Id: I25fe8bf52b405cd7464f4aa5dd4525bb1d34c3ca
|
2022-01-19 22:39:43 +00:00 |
|
TreeHugger Robot
|
3b268c0dcd
|
Merge "Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first"" into sc-dev am: 9edf1a7140 am: 806633ad66
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16630307
Change-Id: I4eb770f4fc9d701021a127e5d6368d35fd3d5cd4
|
2022-01-19 22:34:30 +00:00 |
|
Wu Ahan
|
dcf263a2bc
|
Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first" am: 4c5f09cab3 am: 96c0c34fb9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16630307
Change-Id: Ic8ec587e86ec11f8d0fe8b1b4bce756c7f813d66
|
2022-01-19 22:34:15 +00:00 |
|
TreeHugger Robot
|
9523520806
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16630308
Change-Id: I417eb895fe579b1e92c8eaecc687101cc37a6efc
|
2022-01-19 22:33:44 +00:00 |
|
Wu Ahan
|
5336a5afbb
|
[automerger skipped] Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first" am: b6509bdc18 am: 14bfa0cbd0 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16630308
Change-Id: I59008a3b8e8a0e3ba8a04414cde129cffbd50637
|
2022-01-19 22:33:24 +00:00 |
|
TreeHugger Robot
|
136021e23d
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16631185
Change-Id: Id69139fa7d072ca51fd2b1333506b3e648cbd388
|
2022-01-19 22:33:11 +00:00 |
|
Wu Ahan
|
eda5c14742
|
[automerger skipped] Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first" am: cc4fe8984a am: 64479d2daf -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16631185
Change-Id: Ib10e45ca26ccd2f5cd4f48a13cb92b0722af73ad
|
2022-01-19 22:32:42 +00:00 |
|
TreeHugger Robot
|
806633ad66
|
Merge "Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first"" into sc-dev am: 9edf1a7140
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16630307
Change-Id: I862f542cff03c5b645441aa893fe3543a25a0218
|
2022-01-19 22:16:04 +00:00 |
|
Wu Ahan
|
96c0c34fb9
|
Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first" am: 4c5f09cab3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16630307
Change-Id: If81af003f6b9c82e42076a38196787e7ba9dea6a
|
2022-01-19 22:15:57 +00:00 |
|
TreeHugger Robot
|
49a8f9ebd7
|
Merge "Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first"" into rvc-dev am: 57095ccbeb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16631185
Change-Id: Ica1f625c29a8ec073d8b9723c55978fdc0b49fcd
|
2022-01-19 22:15:06 +00:00 |
|
Wu Ahan
|
38cd0a81dd
|
Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first" am: cc4fe8984a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16631185
Change-Id: I607c675dbd7edd588713d7a07cec625954f5c623
|
2022-01-19 22:15:01 +00:00 |
|
TreeHugger Robot
|
c4ee9df900
|
Merge "Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first"" into qt-dev am: 13ad919ff5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16630308
Change-Id: I1cdf031b38d920645b5877f9fb8195830e8be9a3
|
2022-01-19 22:14:48 +00:00 |
|
Wu Ahan
|
14bfa0cbd0
|
Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first" am: b6509bdc18
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16630308
Change-Id: I27fbeb2579c5c9ff689b5e20593195bd66cb07de
|
2022-01-19 22:14:40 +00:00 |
|
TreeHugger Robot
|
83a82c4919
|
Merge "Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first"" into rvc-dev am: 57095ccbeb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16631185
Change-Id: Ic19409f0a1ac14ab6ab00a265d8fcafc1f0e76c9
|
2022-01-19 22:14:37 +00:00 |
|