Treehugger Robot
5cc85a9759
[automerger skipped] Merge "[Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest" am: 1cd8904fc5
am: 8c58bd4520
am: e570e80eb8
am: 24dc71f7e8
am: 4d513437aa
-s ours am: 41f8651ff9
-s ours
...
am skip reason: Change-Id I028ca81d38252beb3abccef9e938988510f3f55e with SHA-1 4126ec2d32
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426562
Change-Id: I47d602714e3c08262916123e8f256374d57f608f
2020-09-29 06:18:52 +00:00
Treehugger Robot
c203328d29
[automerger skipped] Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest" am: 3eeb8b44c2
am: 27978c5d47
am: 5f81bb9a07
am: bb98b793e5
am: 6ace0ecdde
-s ours am: 32a6bba2df
-s ours
...
am skip reason: Change-Id Ic66425aca4047d2eacd04509f3bfb315f6dd57fc with SHA-1 a1aaccf670
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426552
Change-Id: I3e5c34c4dab467d104d753260700b6a24903e94f
2020-09-29 06:18:45 +00:00
Treehugger Robot
26febb5ef8
[automerger skipped] Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest" am: 71c667322c
am: 48c399c18a
am: 7c9cc5621b
am: 7f3bbcddf0
am: 7b7382fdf2
-s ours am: 87daeb4f31
-s ours
...
am skip reason: Change-Id I3d6c39f45cb1efb1742148f20f03372214eb0cbe with SHA-1 d2e9e42f32
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427808
Change-Id: Ifb8572119d82ec87c8f75f460bc75de4100d593f
2020-09-29 06:18:16 +00:00
Treehugger Robot
41f8651ff9
[automerger skipped] Merge "[Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest" am: 1cd8904fc5
am: 8c58bd4520
am: e570e80eb8
am: 24dc71f7e8
am: 4d513437aa
-s ours
...
am skip reason: Change-Id I028ca81d38252beb3abccef9e938988510f3f55e with SHA-1 4126ec2d32
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426562
Change-Id: Iba258a6fb4ac6baf8f784c9f9a433bf1388bd1ee
2020-09-29 06:04:16 +00:00
Treehugger Robot
32a6bba2df
[automerger skipped] Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest" am: 3eeb8b44c2
am: 27978c5d47
am: 5f81bb9a07
am: bb98b793e5
am: 6ace0ecdde
-s ours
...
am skip reason: Change-Id Ic66425aca4047d2eacd04509f3bfb315f6dd57fc with SHA-1 a1aaccf670
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426552
Change-Id: Iab38a1060b1fb43dc105da9a095d587b2a241fe5
2020-09-29 06:04:04 +00:00
Treehugger Robot
87daeb4f31
[automerger skipped] Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest" am: 71c667322c
am: 48c399c18a
am: 7c9cc5621b
am: 7f3bbcddf0
am: 7b7382fdf2
-s ours
...
am skip reason: Change-Id I3d6c39f45cb1efb1742148f20f03372214eb0cbe with SHA-1 d2e9e42f32
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427808
Change-Id: I23e5dbb3a2cceeeab6b1d1dd1a89bee6f8fce21f
2020-09-29 06:03:55 +00:00
Treehugger Robot
4d513437aa
Merge "[Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest" am: 1cd8904fc5
am: 8c58bd4520
am: e570e80eb8
am: 24dc71f7e8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426562
Change-Id: I7ded23298875715dec1a48d9364a174639b7f92b
2020-09-29 05:29:33 +00:00
Treehugger Robot
6ace0ecdde
Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest" am: 3eeb8b44c2
am: 27978c5d47
am: 5f81bb9a07
am: bb98b793e5
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426552
Change-Id: Ieb22f4b036c3a569acdf9ea4451fba7b5d7a9851
2020-09-29 05:29:21 +00:00
Treehugger Robot
7b7382fdf2
Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest" am: 71c667322c
am: 48c399c18a
am: 7c9cc5621b
am: 7f3bbcddf0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427808
Change-Id: Ia130edabc0cb44a787ef107641e39ead544d81af
2020-09-29 05:29:07 +00:00
Treehugger Robot
24dc71f7e8
Merge "[Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest" am: 1cd8904fc5
am: 8c58bd4520
am: e570e80eb8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426562
Change-Id: I3bf65953a9751b8cfd9dab666f5b1ad400bbdd36
2020-09-29 05:14:11 +00:00
Treehugger Robot
bb98b793e5
Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest" am: 3eeb8b44c2
am: 27978c5d47
am: 5f81bb9a07
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426552
Change-Id: Ic774e63dd14139999e96210bc89476edc095e02b
2020-09-29 05:14:03 +00:00
Treehugger Robot
7f3bbcddf0
Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest" am: 71c667322c
am: 48c399c18a
am: 7c9cc5621b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427808
Change-Id: I4397688b601c1a8bd53ce49b5ec6db16eff9db5a
2020-09-29 05:13:51 +00:00
Treehugger Robot
e570e80eb8
Merge "[Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest" am: 1cd8904fc5
am: 8c58bd4520
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426562
Change-Id: Ieb5efa13b99875a9177016ec90faadd5e2d17f67
2020-09-29 05:00:35 +00:00
Treehugger Robot
5f81bb9a07
Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest" am: 3eeb8b44c2
am: 27978c5d47
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426552
Change-Id: If991989404484407853bd8ac42430761d1e37018
2020-09-29 05:00:26 +00:00
Treehugger Robot
7c9cc5621b
Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest" am: 71c667322c
am: 48c399c18a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427808
Change-Id: I716f8a88d3d6a6022d679736bb278d3f9eb638bb
2020-09-29 05:00:12 +00:00
Treehugger Robot
8c58bd4520
Merge "[Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest" am: 1cd8904fc5
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426562
Change-Id: I8de47f938f94b000ba4274b3b4ef2ec77181b0e5
2020-09-29 04:46:15 +00:00
Treehugger Robot
27978c5d47
Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest" am: 3eeb8b44c2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426552
Change-Id: Ia304c487a41b82f67d51542b09585b52c64ab94c
2020-09-29 04:45:57 +00:00
Treehugger Robot
48c399c18a
Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest" am: 71c667322c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427808
Change-Id: If68a407eac5837b85781ae4eb20c4bfad1436700
2020-09-29 04:45:22 +00:00
Treehugger Robot
1cd8904fc5
Merge "[Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest"
2020-09-29 04:29:55 +00:00
Treehugger Robot
3eeb8b44c2
Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest"
2020-09-29 04:28:34 +00:00
Treehugger Robot
71c667322c
Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest"
2020-09-29 04:27:45 +00:00
Jiashen Wang
807f3b9040
Merge "Migrate SIM operation dialog from LPA to Settings" am: 5930feab2b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12540153
Change-Id: I6b8c3f96348030fb568074ac811b5485558d5067
2020-09-29 03:38:03 +00:00
Jiashen Wang
5930feab2b
Merge "Migrate SIM operation dialog from LPA to Settings"
2020-09-29 03:17:48 +00:00
Betty Chang
a464332737
Merge "[Testing] Use AndroidJUnit4 instead in telephony/cdma/ test files" am: 40bc88e8ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12421249
Change-Id: I1830da73651a28f23c85e0af4812795e740c82d9
2020-09-29 02:59:11 +00:00
Betty Chang
40bc88e8ab
Merge "[Testing] Use AndroidJUnit4 instead in telephony/cdma/ test files"
2020-09-29 01:56:14 +00:00
Jiashen Wang
d8bd3bb669
Migrate SIM operation dialog from LPA to Settings
...
In Android R, when users enable, disable, delete, or rename a profile,
Settings calls SubscriptionManager APIs which telephony ends up to send
actions “TOGGLE_SUBSCRIPTION_PRIVILEGED”,
“DELETE_SUBSCRIPTION_PRIVILEGED”, and “RENAME_SUBSCRIPTION_PRIVILEGED”
to EuiccManager. After EuiccUiDispatcher dispatches the action, Google
LPA receives it and starts the corresponding operations and DSDS
dialogs. We can see there some back-and-forth that goes on between LPA
and telephony. In order to improve the current structure, we devided
to move the dialogs to Settings and make it call EuiccManager APIs
directly.
Bug: 160819390
Test: Manually tested eSIM profile disabling.
Design: https://docs.google.com/document/d/1wb5_hoBkZVbkXGNWHbx4Jf61swjfxsJzkytiTzJosYo/edit?usp=sharing
Change-Id: Ib933df42ca3606de2310edc4d64c3e11800a1096
2020-09-28 13:38:10 -07:00
TreeHugger Robot
f03cfeee52
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: ce61ea1506
-s ours am: 04b4da5220
-s ours am: b2e2cf3f2a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12715230
Change-Id: Ied8585b54d86e1e88e6c7ff6f895b7c7d86c7961
2020-09-28 16:30:36 +00:00
Bill Yi
cdc768bd8a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2aaa31892e
-s ours am: 0bac679d7e
-s ours am: a7ed6da45c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12715231
Change-Id: I7463ab884542237f70ff26c1929cadd347e98e00
2020-09-28 16:28:28 +00:00
TreeHugger Robot
b2e2cf3f2a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: ce61ea1506
-s ours am: 04b4da5220
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12715230
Change-Id: I7108c3879b20a3806c62acb0bcd3321cefc739cd
2020-09-28 15:47:12 +00:00
Bill Yi
a7ed6da45c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2aaa31892e
-s ours am: 0bac679d7e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12715231
Change-Id: If2bb1ecc64f0ef3f672f09d7dde5fa8b254adcef
2020-09-28 15:46:57 +00:00
TreeHugger Robot
04b4da5220
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: ce61ea1506
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12715230
Change-Id: I2e8686ba34a3d3180aed6f6830c414846911f9b8
2020-09-28 15:30:31 +00:00
Bill Yi
0bac679d7e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2aaa31892e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12715231
Change-Id: Ib5b87107c39e7b10d3a13374906396e9e7bfa129
2020-09-28 15:30:24 +00:00
TreeHugger Robot
ce61ea1506
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2020-09-28 15:21:51 +00:00
TreeHugger Robot
cfa48352ec
Merge "Update owner list" am: 360d8c17c7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12683803
Change-Id: I7a4ab5ffdf1e268e28d1e067825189ffc3201270
2020-09-28 11:27:20 +00:00
TreeHugger Robot
360d8c17c7
Merge "Update owner list"
2020-09-28 11:12:30 +00:00
TreeHugger Robot
747ea0c57b
Merge "Hide tethering option when in a guest account" am: f0cdd9cdb4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12715929
Change-Id: I4acf664c0e2b647af3dda8351b693914905f54a1
2020-09-28 09:35:37 +00:00
TreeHugger Robot
f0cdd9cdb4
Merge "Hide tethering option when in a guest account"
2020-09-28 09:11:39 +00:00
Bill Yi
2aaa31892e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8b5b9411c949934d99bea34b0292d8e5de512413
2020-09-28 00:45:38 -07:00
Bill Yi
1bc5c2a1ed
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic754186b5e7ee18485a2d441b10965d768072e24
2020-09-27 23:59:31 -07:00
TreeHugger Robot
3b7b5b3e6f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 25afb1a010
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12715260
Change-Id: I6a79cdbaed3572871e8c606cd185c2475320cca3
2020-09-28 05:36:08 +00:00
TreeHugger Robot
25afb1a010
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-09-28 05:00:38 +00:00
Treehugger Robot
ceee2836ba
Merge "Avoid unexpected state changes for enhanced preferences" am: 7f6271364b
am: 6891dd4590
am: 423f9801e9
am: 2532a70ba1
am: da6ffe3636
am: f3b27e173d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425491
Change-Id: I33668b5d6f3d0bbe68d979c2af500a00a734478d
2020-09-28 04:06:47 +00:00
Treehugger Robot
f3b27e173d
Merge "Avoid unexpected state changes for enhanced preferences" am: 7f6271364b
am: 6891dd4590
am: 423f9801e9
am: 2532a70ba1
am: da6ffe3636
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425491
Change-Id: I0c837cf93babf433b918d41087c9a2ca639079c8
2020-09-28 03:39:59 +00:00
Hugh Chen
bde627b263
Hide tethering option when in a guest account
...
- Before this CL, users can share their mobile data through enabling
tethering in the USB menu when in a guest account.
It will cause main users to spend their money unexpectedly.
This CL will hide the tethering option on the USB menu when in the
guest account.
- Add test cases.
Bug: 166125765
Test: 1. make -j42 RunSettingsRoboTests. 2. Switch to a guest account
to verify whether the tethering option is hiding.
Change-Id: I7523b3f3c3a1372bb128a58a6a7fac973d27cfbe
2020-09-28 11:20:31 +08:00
Treehugger Robot
da6ffe3636
Merge "Avoid unexpected state changes for enhanced preferences" am: 7f6271364b
am: 6891dd4590
am: 423f9801e9
am: 2532a70ba1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425491
Change-Id: I89308bbe2a0305f1d2a1a06da9f936e21c8bf6cd
2020-09-28 03:07:24 +00:00
Treehugger Robot
2532a70ba1
Merge "Avoid unexpected state changes for enhanced preferences" am: 7f6271364b
am: 6891dd4590
am: 423f9801e9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425491
Change-Id: Ibc85aecd1c5a83e67970fd9daf381e1da3f35bf2
2020-09-28 02:53:19 +00:00
Treehugger Robot
423f9801e9
Merge "Avoid unexpected state changes for enhanced preferences" am: 7f6271364b
am: 6891dd4590
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425491
Change-Id: Ibaaf851ae4b9b486b83b795aa9818413cd0f14bf
2020-09-28 02:25:26 +00:00
Treehugger Robot
6891dd4590
Merge "Avoid unexpected state changes for enhanced preferences" am: 7f6271364b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425491
Change-Id: I82d1bcd87109666b5b74e8d74811f423ae33105e
2020-09-28 02:12:11 +00:00
Treehugger Robot
7f6271364b
Merge "Avoid unexpected state changes for enhanced preferences"
2020-09-28 02:01:05 +00:00
Bill Yi
e3627eba5f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ied07cc536b2dc2e772dadf16262ee5e0f0cf6968
2020-09-28 01:50:55 +00:00