Commit Graph

760589 Commits

Author SHA1 Message Date
Sarah Chin
2ee623fbd5 [automerger skipped] SetDataEnabled indicate calling package am: 967c10b103 am: 04470f4d33 -s ours
am skip reason: Merged-In I769437e9332f27c0990c37f60ad6d9db284e86cf with SHA-1 ac94df2bab is already in history

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

Change-Id: Ib55de7dfc79d7603c9da422abe18b5d67bda056a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 05:11:45 +00:00
Hyundo Moon
7874f3f7d4 [automerger skipped] Merge "Rename CachedBluetoothDevice.setMemberDevice to addMemberDevice" into tm-dev am: 24f7beacfa -s ours
am skip reason: Merged-In I39242b40ebe154b8b89f00f48ea320b18f56ecd7 with SHA-1 5c811c4df5 is already in history

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

Change-Id: I05c4747337afc3be9e821a48f9d783b6f4c09783
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 04:51:15 +00:00
Hyundo Moon
1f6554d804 [automerger skipped] Rename CachedBluetoothDevice.setMemberDevice to addMemberDevice am: 004e2f12e2 -s ours
am skip reason: Merged-In I39242b40ebe154b8b89f00f48ea320b18f56ecd7 with SHA-1 5c811c4df5 is already in history

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

Change-Id: I73c220ab6a4a4f49bb433a18caf24a165f6f45ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 04:51:09 +00:00
Sarah Chin
04470f4d33 SetDataEnabled indicate calling package am: 967c10b103
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2091526

Change-Id: I7d973e7dbfbec2648c063b51eea7ff67dbbf6fae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 04:51:07 +00:00
Hyundo Moon
24f7beacfa Merge "Rename CachedBluetoothDevice.setMemberDevice to addMemberDevice" into tm-dev 2022-05-09 04:26:47 +00:00
Sarah Chin
967c10b103 SetDataEnabled indicate calling package
Test: atest TelephonyManagerTest
Bug: 226149142
Merged-In: I769437e9332f27c0990c37f60ad6d9db284e86cf
Change-Id: I769437e9332f27c0990c37f60ad6d9db284e86cf
2022-05-08 12:22:43 -07:00
Rob Carr
fb8a245885 Merge "BLASTSyncEngine: Logging and trace around commit timeout" into tm-dev am: c0573c9851
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18188882

Change-Id: I898cd7afcfdfa8d74e2bdfa3bfd384c61364aead
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 23:14:56 +00:00
Rob Carr
c0573c9851 Merge "BLASTSyncEngine: Logging and trace around commit timeout" into tm-dev 2022-05-07 22:55:35 +00:00
Shikha Malhotra
5c24f38b8d Merge "Making it possible to call setFirstBoot when mInstallD is available" into tm-dev am: bf7fddee01
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18029278

Change-Id: Ia19f48fcd5be4b4260038abd7a8e6802f795ee68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 17:45:12 +00:00
Shikha Malhotra
bf7fddee01 Merge "Making it possible to call setFirstBoot when mInstallD is available" into tm-dev 2022-05-07 17:03:20 +00:00
Yurii Zubrytskyi
5475ff5762 Merge "HACK: allow apps with pre-release SDK RESTRICT AUTOMERGE" into tm-dev am: 0e158d0440
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18161336

Change-Id: I5c9bf9cb04936e2089763ceb0a5d237eb29a3656
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 15:39:17 +00:00
Yurii Zubrytskyi
9f35f03159 HACK: allow apps with pre-release SDK RESTRICT AUTOMERGE am: 47a70c8253
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18161336

Change-Id: I33a3215d07b386bedbb6a89cc51722a869ef4efc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 15:38:54 +00:00
Yurii Zubrytskyi
0e158d0440 Merge "HACK: allow apps with pre-release SDK RESTRICT AUTOMERGE" into tm-dev 2022-05-07 15:11:19 +00:00
Josh Hou
9bca62d5c2 Merge "[Panlingual] Add the link for the LocaleConfig" into tm-dev am: 607108532a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18131147

Change-Id: I3737f3faa9bbf628e78bc66e158be7f89f820ec4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 07:51:10 +00:00
Josh Hou
607108532a Merge "[Panlingual] Add the link for the LocaleConfig" into tm-dev 2022-05-07 07:16:15 +00:00
Tracy Zhou
3774973835 Merge "Rename navigationBarHeight to navigationBarFrameHeight" into tm-dev am: cf134e04c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18203341

Change-Id: I747735c0315df06973a5762bcd463b4038f9adfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 06:29:06 +00:00
Tracy Zhou
cf134e04c8 Merge "Rename navigationBarHeight to navigationBarFrameHeight" into tm-dev 2022-05-07 05:49:50 +00:00
TreeHugger Robot
3c4093bebe Merge "Un-obscure the Telephony phone account ID." into tm-dev am: 3ff037cb6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18203217

Change-Id: I2f6a11fe9a3c9143e276bd5518c72c5cbeab57c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 04:54:14 +00:00
TreeHugger Robot
3ff037cb6c Merge "Un-obscure the Telephony phone account ID." into tm-dev 2022-05-07 04:31:04 +00:00
TreeHugger Robot
c1f1ca4931 Merge "Revert "Remove workarounds by data_device_bins"" into tm-dev am: 778f431a83
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18206547

Change-Id: I998a4e635a88e61b3b5fcf4d0dbc7ae77ee87d06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 03:51:02 +00:00
Daniel Hsieh
74d7f88cd7 Merge "Gets node bound when the FLAG_RETRIEVE_INTERACTIVE_WINDOWS is unset" into tm-dev am: 6c00049c6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17944971

Change-Id: I2236aeaa0a96c4a12a2d3d5e6d59fefd44514fa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 03:50:43 +00:00
TreeHugger Robot
778f431a83 Merge "Revert "Remove workarounds by data_device_bins"" into tm-dev 2022-05-07 03:50:24 +00:00
Daniel Hsieh
6c00049c6c Merge "Gets node bound when the FLAG_RETRIEVE_INTERACTIVE_WINDOWS is unset" into tm-dev 2022-05-07 03:45:41 +00:00
TreeHugger Robot
0d7a4e5cdb Merge "Uses static top padding for lockscreen notification space" into tm-dev am: fe7260937b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18197410

Change-Id: I36466e4bc7687bdff550f8c30972c6a01b2d3926
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 03:42:24 +00:00
TreeHugger Robot
22bac033cf Merge "Revert "Don't trigger lift-to-wake on wireless charger"" into tm-dev am: 0fd363dfad
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18188318

Change-Id: Id155801a237a7bdf58511b4a65c81c439415e171
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 03:41:41 +00:00
TreeHugger Robot
fe7260937b Merge "Uses static top padding for lockscreen notification space" into tm-dev 2022-05-07 03:22:27 +00:00
TreeHugger Robot
0fd363dfad Merge "Revert "Don't trigger lift-to-wake on wireless charger"" into tm-dev 2022-05-07 03:17:44 +00:00
Treehugger Robot
bc59ed7b9a [automerger skipped] Merge "Don't send null data call list response" am: 22a9bec54c am: 17c8654c58 -s ours
am skip reason: Merged-In I2919fff4abe1ccc234ae2b5d45582eadce440986 with SHA-1 afc39ef1ae is already in history

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

Change-Id: I3920161fffe5d75007b6d6f86807190bb1fdbc63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 01:58:38 +00:00
TreeHugger Robot
5242f1acc2 Merge "Fixed cutout flicker in C10, P10" into tm-dev am: 5a9d90c165
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18179570

Change-Id: I27aab5a0a4a5fa80bbab60e37e93d86a192efbb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 01:58:08 +00:00
Beverly Tai
d48af70290 Merge "Add additional toggleable active unlock settings" into tm-dev am: 0dd4d73142
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18173162

Change-Id: Ic23e2a310336dcc5da8bbada8a94c1978350644e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 01:57:49 +00:00
Beverly Tai
85a7649f0e Merge "Add onUdfpsLocationChanged callback" into tm-dev am: f637bd5429
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18164254

Change-Id: Ia6de25bc67e0abf6ddc9e943781f317cb1bdb81a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 01:57:31 +00:00
TreeHugger Robot
5a9d90c165 Merge "Fixed cutout flicker in C10, P10" into tm-dev 2022-05-07 01:51:12 +00:00
Treehugger Robot
17c8654c58 Merge "Don't send null data call list response" am: 22a9bec54c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2090384

Change-Id: Ic5cfb7ff25e9c330b2deceabb241802c2bcb3e62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 01:29:29 +00:00
Beverly Tai
0dd4d73142 Merge "Add additional toggleable active unlock settings" into tm-dev 2022-05-07 01:28:17 +00:00
Beverly Tai
f637bd5429 Merge "Add onUdfpsLocationChanged callback" into tm-dev 2022-05-07 01:27:38 +00:00
Evan Chen
a0b5087018 Merge "No need to show user consent for SingleDevice && isSkipPrompt" into tm-dev am: 98054aa2e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17948532

Change-Id: If9e4d2382d2f561b6ea6ac87f8e57ea3a13108c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 01:06:02 +00:00
Treehugger Robot
22a9bec54c Merge "Don't send null data call list response" 2022-05-07 00:54:03 +00:00
Evan Chen
98054aa2e3 Merge "No need to show user consent for SingleDevice && isSkipPrompt" into tm-dev 2022-05-07 00:42:59 +00:00
Hans Boehm
0c1d2d8fbf Merge "Document VirtualRefBasePtr hazards" am: 5ee3cfe147 am: 29eb7ad17e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2081782

Change-Id: I7df909549bb80d31774ba0fa472ffaeee8ce132b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 00:35:58 +00:00
Ahaan Ugale
f033d85225 Merge "Fix AutofillManager and Session status not sync with fill dialog" into tm-dev am: 13809febba
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18130748

Change-Id: I0e5837769a42437f0558c0f35ad4c6c88b27e7ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 00:22:48 +00:00
Hawkwood Glazier
abfa63edb2 Merge "Scrim now only scales horizontally" into tm-dev am: d2d85c578d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18188317

Change-Id: I234ff59fedcd23bbd9a0be137bba694175fde024
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 00:22:08 +00:00
Ahaan Ugale
13809febba Merge "Fix AutofillManager and Session status not sync with fill dialog" into tm-dev 2022-05-07 00:21:59 +00:00
TreeHugger Robot
78933227e4 Merge "Set collapsing toolbar background color" into tm-dev am: bed53f0719
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18179823

Change-Id: Id8e90ef95e3ccdf429ffd36bf63000a065deb503
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 00:21:49 +00:00
Songchun Fan
852703f1fa [snapshot] optimizing WatchedArrayList snapshot am: d5c4c550e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18185712

Change-Id: I93a442382602c697d87c3f9c5a34cde1c5eca486
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 00:20:35 +00:00
Hawkwood Glazier
d2d85c578d Merge "Scrim now only scales horizontally" into tm-dev 2022-05-07 00:20:27 +00:00
Brad Ebinger
d5b4bbc632 Merge changes from topics "ATT-UCE 430", "fix-uce-430" into tm-dev am: 455e490d94
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18202097

Change-Id: I8dda001c8129691bbb008e29dbebdc6899d6072b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 00:19:58 +00:00
Hyunho
0470a657fd add use_tel_uri_for_pidf_xml field for ATT-UCE 430 am: d91518e463
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18176142

Change-Id: I514db663b319d61769f2458b001b10d988bc5f54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 00:19:53 +00:00
Hans Boehm
29eb7ad17e Merge "Document VirtualRefBasePtr hazards" am: 5ee3cfe147
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2081782

Change-Id: I5e80ebf68b5faf3215b37bef66631452e7322d16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 00:10:26 +00:00
TreeHugger Robot
bed53f0719 Merge "Set collapsing toolbar background color" into tm-dev 2022-05-07 00:06:29 +00:00
Yurii Zubrytskyi
47a70c8253 HACK: allow apps with pre-release SDK RESTRICT AUTOMERGE
Revert before releasing
Let the apps built with pre-release Tiramisu SDK parse
+ fix a test that didn't expect REL builds to throw
  when checking for lettered versions

Test: build
Bug: 225745567
Bug: 231407096
Change-Id: I965c01b4453289c3e9a930180804728be0b5b045
2022-05-06 17:03:31 -07:00