Treehugger Robot
74c0a8c209
[automerger skipped] Merge "Fix NPE if CarrierConfigManager is not available" am: d01838d8ce am: 6ea2228e31 -s ours am: 5d03f7d60f -s ours am: 6cefd1c525 -s ours
...
am skip reason: Change-Id Iecf3e385a88d18c7578eb520449f4042324e21f5 with SHA-1 e6fae38169
2020-05-27 02:20:48 +00:00
Treehugger Robot
6cefd1c525
[automerger skipped] Merge "Fix NPE if CarrierConfigManager is not available" am: d01838d8ce am: 6ea2228e31 -s ours am: 5d03f7d60f -s ours
...
am skip reason: Change-Id Iecf3e385a88d18c7578eb520449f4042324e21f5 with SHA-1 e6fae38169
2020-05-27 02:12:18 +00:00
Treehugger Robot
5d03f7d60f
[automerger skipped] Merge "Fix NPE if CarrierConfigManager is not available" am: d01838d8ce am: 6ea2228e31 -s ours
...
am skip reason: Change-Id Iecf3e385a88d18c7578eb520449f4042324e21f5 with SHA-1 e6fae38169
2020-05-27 02:03:37 +00:00
Treehugger Robot
6ea2228e31
Merge "Fix NPE if CarrierConfigManager is not available" am: d01838d8ce
...
Change-Id: I5ff6cfcf79cfeec14571ae4f34ea74fd658025d3
2020-05-27 01:52:00 +00:00
Treehugger Robot
d01838d8ce
Merge "Fix NPE if CarrierConfigManager is not available"
2020-05-27 01:36:46 +00:00
Adam Bookatz
e7465b0f5f
Opening Multiuser doesn't toggle it on
...
This does the following:
Simply opening Settings > Multiuser no longer
globally enables multiuser. The user would have
to actively toggle that switch to globally
enabled it.
(This reverts ag/7002640; a different solution for
that cl's bug is in the same topic as this cl.)
Bug: 137943217
Bug: 141372193
Bug: 149973281
Bug: 130270878
Test: manual: Settings > Multiuser doesn't turn on the systemui avatar
Test: manual: adb shell pm create-user A, does turn on sysui avatar
Change-Id: Ibfdd1dee408c7214d0a097c8d814dae87ffa82ac
2020-05-26 23:01:56 +00:00
Brad Ebinger
525a07ec7f
Fix NPE if CarrierConfigManager is not available
...
Fixes: 155147094
Fixes: 155819375
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony
Change-Id: Iecf3e385a88d18c7578eb520449f4042324e21f5
Merged-In: Iecf3e385a88d18c7578eb520449f4042324e21f5
2020-05-26 15:50:41 -07:00
TreeHugger Robot
15a5d85ba0
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 209c1ebbaf -s ours am: daf783ef1b -s ours
...
am skip reason: subject contains skip directive
Change-Id: Idbcb3559dd133d765e13b888b3614c7be93873bb
2020-05-26 18:43:48 +00:00
TreeHugger Robot
416025d9cb
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 209c1ebbaf -s ours am: 1aeb24b04c -s ours
...
am skip reason: subject contains skip directive
Change-Id: I1bf6b3afaadc3a7f44b069020ac14c9fe3945838
2020-05-26 18:38:51 +00:00
TreeHugger Robot
bbacebb475
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: c6efa831c1 -s ours am: 4791614cc8 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I03e0f9a4f6072d69177f74014e8be46f1e08f527
2020-05-26 18:38:35 +00:00
TreeHugger Robot
1aeb24b04c
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 209c1ebbaf -s ours
...
am skip reason: subject contains skip directive
Change-Id: I05e4192ecbce3aa066f82a3220cbc1aab8c4c4fc
2020-05-26 18:37:21 +00:00
TreeHugger Robot
daf783ef1b
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 209c1ebbaf -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ib8f8c750cba19e395efd692f750734fb0bed8857
2020-05-26 18:37:19 +00:00
TreeHugger Robot
dc90982241
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: c6efa831c1 -s ours am: d852aa4cc1 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ia3246481999502078128fcf31fbbc42f3d01b9a9
2020-05-26 18:37:12 +00:00
TreeHugger Robot
209c1ebbaf
Merge "Import translations. DO NOT MERGE" into rvc-d1-dev
2020-05-26 18:25:43 +00:00
TreeHugger Robot
4791614cc8
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: c6efa831c1 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I50bf5aae6d67a6e48450993102d032cfb07174e5
2020-05-26 18:18:32 +00:00
TreeHugger Robot
d852aa4cc1
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: c6efa831c1 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I4237cf2fb6634fd9b1981d6d673d2edc405cd673
2020-05-26 18:18:26 +00:00
TreeHugger Robot
c6efa831c1
Merge "Import translations. DO NOT MERGE" into rvc-d1-dev
2020-05-26 18:05:31 +00:00
Automerger Merge Worker
0014daef07
Merge "Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98 am: 8e8386c677" into rvc-d1-dev-plus-aosp am: 8eabaefd5d
...
Change-Id: I9a97c3d11905995102bf06f3debb914e7b5c88cc
2020-05-26 17:41:25 +00:00
Grace Jia
127357e532
Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98 am: f29da1c2e7 am: 3f0d810913
...
Change-Id: I1b80c78856082c14476cf0d51e08ba5e05f3c538
2020-05-26 17:41:00 +00:00
Grace Jia
fb719ecfc8
Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98 am: 8e8386c677 am: 224812552e
...
Change-Id: I7c786a4480d58caecf407129997c593dc1741509
2020-05-26 17:28:17 +00:00
Automerger Merge Worker
8eabaefd5d
Merge "Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98 am: 8e8386c677" into rvc-d1-dev-plus-aosp
2020-05-26 17:21:31 +00:00
Grace Jia
3f0d810913
Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98 am: f29da1c2e7
...
Change-Id: I422bea8785a02bcb68fb2d944099711393da0180
2020-05-26 17:21:21 +00:00
Grace Jia
6c794a43bc
Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98 am: 8e8386c677
...
Change-Id: I91a833771ed23ba08cd04aa309de3a2c23bee5de
2020-05-26 17:21:11 +00:00
Grace Jia
224812552e
Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98 am: 8e8386c677
...
Change-Id: I93ec678c89b048896e23a98a18cb33615b68b364
2020-05-26 17:21:08 +00:00
Grace Jia
8e8386c677
Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98
...
Change-Id: I91349e1d1051aadd264d60f48d32076629ad8a88
2020-05-26 17:08:09 +00:00
Grace Jia
f29da1c2e7
Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98
...
Change-Id: Iecbd2c0627c28b68e76440cc2430e753a95fc94b
2020-05-26 17:08:06 +00:00
Grace Jia
5c7f6d1b98
Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev
2020-05-26 16:52:42 +00:00
Edgar Wang
bc52524fff
Merge "Change AppPicker theme from dialog to full screen" into rvc-dev am: f3ad1ec7b7 am: 857867b809 am: 8b10ab93d8
...
Change-Id: I481139120b5c13fd461b31725fa09a9aa46becd9
2020-05-26 15:32:28 +00:00
Automerger Merge Worker
97b605a58d
Merge "Merge "Change AppPicker theme from dialog to full screen" into rvc-dev am: f3ad1ec7b7 am: e72f014903 am: 331e53aae7" into rvc-qpr-dev-plus-aosp
2020-05-26 15:32:13 +00:00
Edgar Wang
d97852db97
Merge "Change AppPicker theme from dialog to full screen" into rvc-dev am: f3ad1ec7b7 am: e72f014903 am: 331e53aae7
...
Change-Id: I0aac80e6d9108dc7624551f6079c614a380bf004
2020-05-26 15:32:05 +00:00
Edgar Wang
f446e34b15
Merge "Change AppPicker theme from dialog to full screen" into rvc-dev am: f3ad1ec7b7 am: e72f014903 am: 335ee91cae
...
Change-Id: Ie6db2d1987c3d6964cdd09ed18a75a48367449e3
2020-05-26 15:32:04 +00:00
Edgar Wang
8b10ab93d8
Merge "Change AppPicker theme from dialog to full screen" into rvc-dev am: f3ad1ec7b7 am: 857867b809
...
Change-Id: I5273e41730d30b028389e2191d5fdca85fc29164
2020-05-26 15:17:16 +00:00
Edgar Wang
335ee91cae
Merge "Change AppPicker theme from dialog to full screen" into rvc-dev am: f3ad1ec7b7 am: e72f014903
...
Change-Id: I6a453a9a4c17e7fb99250e37ebb81f9a1c5f415a
2020-05-26 15:17:02 +00:00
Edgar Wang
331e53aae7
Merge "Change AppPicker theme from dialog to full screen" into rvc-dev am: f3ad1ec7b7 am: e72f014903
...
Change-Id: I332b929c79d275251bcc5ee5a516cda4c094171d
2020-05-26 15:17:01 +00:00
Edgar Wang
e72f014903
Merge "Change AppPicker theme from dialog to full screen" into rvc-dev am: f3ad1ec7b7
...
Change-Id: Ie45e6eb70dd491face353ea1d92dcc38ca7a73be
2020-05-26 15:05:05 +00:00
Edgar Wang
857867b809
Merge "Change AppPicker theme from dialog to full screen" into rvc-dev am: f3ad1ec7b7
...
Change-Id: I523f992fd67b31b6d0803454d3567a5c6e03894a
2020-05-26 15:04:55 +00:00
Edgar Wang
f3ad1ec7b7
Merge "Change AppPicker theme from dialog to full screen" into rvc-dev
2020-05-26 14:49:04 +00:00
Bonian Chen
b381ac0bad
[Settings] Avoid SIM toggle switch loopback
...
API provided by SwitchBar widget would lead to callback when
SIM toggle switch operation failure and set UI back.
However, set UI back (rollback the UI) would lead to another
trigger to SIM toggle switch. This would generate endless
events and keep system budy.
To avoid from this callback, a check need to be done prior to UI
take action. Therefore, changing APIs to fit into this concept.
Bug: 155770954
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=MobileNetworkSwitchControllerTest
Change-Id: Iaea1012acdbe449a882ced08b596c64b9f99256f
2020-05-26 21:34:39 +08:00
Bill Yi
90ea6e35ae
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I580c56b8be5e2078ff49a029def34e380129f585
2020-05-26 12:05:36 +00:00
Bill Yi
e82e96b92c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I036c6b974a8a201be02f565d8ddead68f33bcaec
2020-05-26 11:28:08 +00:00
Bill Yi
da6071aff1
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I236afe1f3ad96b32388811121c789cd278df0c7b
2020-05-26 10:49:57 +00:00
Edgar Wang
b155d79827
Merge "Remove duplicate search result when search "autofill service"" into rvc-dev am: ec156b7035 am: 08f0c0f401 am: a5789cb79b
...
Change-Id: I9d244c4560dd1502e818c1f339e476932aa301d3
2020-05-26 10:04:22 +00:00
Edgar Wang
07b14ace5e
Merge "Remove duplicate search result when search "autofill service"" into rvc-dev am: ec156b7035 am: 08f0c0f401 am: 0dd108746f
...
Change-Id: I14a7991bcf017406fbbdf0104696bba40a00705e
2020-05-26 10:04:08 +00:00
Edgar Wang
5cf1dfdc85
Merge "Remove duplicate search result when search "autofill service"" into rvc-dev am: ec156b7035 am: abb40380b9 am: ec41b86270
...
Change-Id: I80d0cee62d8b06c92502eaa89ca2e62f50d24b02
2020-05-26 10:03:59 +00:00
Automerger Merge Worker
eee9882979
Merge "Merge "Fix Talkback annoucement for Media Output panel." into rvc-dev am: ba85ecdf06 am: 8e83b6a3e1 am: 43ea5df5a9" into rvc-qpr-dev-plus-aosp
2020-05-26 10:03:57 +00:00
Yi-Ling Chuang
dac7476529
Merge "Fix Talkback annoucement for Media Output panel." into rvc-dev am: ba85ecdf06 am: 8e83b6a3e1 am: 43ea5df5a9
...
Change-Id: Ie3d232a5c6a1b123b3e5b39118aa93b9e423404e
2020-05-26 10:03:52 +00:00
Yi-Ling Chuang
adcf256a3d
Merge "Fix Talkback annoucement for Media Output panel." into rvc-dev am: ba85ecdf06 am: 4aa4c7119a am: 8326951968
...
Change-Id: Icf693bf8c6824fc72f440f4c783de7d70a15ae6e
2020-05-26 10:03:50 +00:00
Yi-Ling Chuang
67cc4e28da
Merge "Fix Talkback annoucement for Media Output panel." into rvc-dev am: ba85ecdf06 am: 4aa4c7119a am: 7837f1824d
...
Change-Id: I4b91a22f2b829376a36c1b0a540124bba0490516
2020-05-26 10:03:31 +00:00
Edgar Wang
0dd108746f
Merge "Remove duplicate search result when search "autofill service"" into rvc-dev am: ec156b7035 am: 08f0c0f401
...
Change-Id: I1615dba9070dc06da17777518c3944954fec3daf
2020-05-26 09:47:51 +00:00
Edgar Wang
a5789cb79b
Merge "Remove duplicate search result when search "autofill service"" into rvc-dev am: ec156b7035 am: 08f0c0f401
...
Change-Id: I19e1a775321251b4c27c1bbc2226edb38fa9e6fd
2020-05-26 09:47:33 +00:00
