Commit Graph

1771 Commits

Author SHA1 Message Date
Mark Chien
5cc68af9ca Merge "Fix entitlement failed when device is on CBRS" into qt-r1-dev am: 8a44e4f274
am: 649f98541a

Change-Id: I226fff13988a87780cbf7c042619c36efcbae63f
2019-07-03 19:21:40 -07:00
Mark Chien
649f98541a Merge "Fix entitlement failed when device is on CBRS" into qt-r1-dev
am: 8a44e4f274

Change-Id: Ifabc853b754fd6323e01246613656fe72961c253
2019-07-03 17:19:49 -07:00
Mark Chien
8a44e4f274 Merge "Fix entitlement failed when device is on CBRS" into qt-r1-dev 2019-07-03 13:16:03 +00:00
markchien
0331222483 Fix entitlement failed when device is on CBRS
When active cellular internet is switched to CBRS in DSDS case,
default data sub id may not be changed. Fix by using active
subscription id and pass this sub id to entitlement app.

Bug: 134994718
Test: atest TetherServiceTest
Test: manual test with carrer SIMs.

Change-Id: I30a1d70c0690f0dba8f4171a2bde884f9b7ccfc4
2019-06-26 17:05:48 +00:00
Malcolm Chen
af7b0ebb9c Merge "Replace isSubscriptionEnabled with isActiveSubId." into qt-dev am: 0304f4d1ce am: b3b52ce088
am: 47ea5ad9dc

Change-Id: Ida614addc7b6cc58178f91e7e6b2645100762723
2019-06-18 22:14:39 -07:00
Matthew Fritze
a891dd8743 Merge "MobileData slice should be null if not-actionable" into qt-dev am: e2ab7540a3 am: 1601d41f8a
am: ae7ca4133a

Change-Id: I1e3012e83243b9dd6be04f1ecc5d885836b8e022
2019-06-18 22:11:48 -07:00
Malcolm Chen
b3b52ce088 Merge "Replace isSubscriptionEnabled with isActiveSubId." into qt-dev
am: 0304f4d1ce

Change-Id: I3a78fe154d3861c779365d1e611ac8c559861a10
2019-06-18 20:29:39 -07:00
Matthew Fritze
1601d41f8a Merge "MobileData slice should be null if not-actionable" into qt-dev
am: e2ab7540a3

Change-Id: If562aec8635ab4d56ff5016eea5d19d2a96e2383
2019-06-18 20:23:30 -07:00
TreeHugger Robot
0304f4d1ce Merge "Replace isSubscriptionEnabled with isActiveSubId." into qt-dev 2019-06-19 03:11:25 +00:00
TreeHugger Robot
e2ab7540a3 Merge "MobileData slice should be null if not-actionable" into qt-dev 2019-06-19 02:26:20 +00:00
Malcolm Chen
dd0b2fc380 Replace isSubscriptionEnabled with isActiveSubId.
As we don't allow pSIM modem disablment, we should simply use isActiveSubId
to decide whether a subscription's preferences is changable. This will
avoid potential modem bugs that reports wrong modem status that result
in Setting's UX error.

Bug: 135222940
Test: manual and robo
Change-Id: I7cccf2fdab7c89d26dac4daad51cd5d6f3a90eba
2019-06-18 23:55:35 +00:00
Matthew Fritze
63bc6a1090 MobileData slice should be null if not-actionable
In cases where MobileData should not be changed:
- Airplane mode
- No data subscriptions

we will return a null slice, rather than a slice with a no-op intent
attached as a primary action. The problem with the no-op intent is that
Slices assumes all actions are by definition, actionable, and the the
TalkBack description announces that the item is clickable, which it
really isn't.

We will in the future investigate disabled actions on Slices, but this
is the short-term fix.

Fixes: 132924748
Test: Robolectric
Test: Panel tester app
Change-Id: I1d62af32fe2dd985f0b52ea4188651e76f9c90ec
2019-06-18 14:53:21 -07:00
Youming Ye
31608ace73 Check the missing useHomeWfMode case
Bug: 133812904
Test: Build
Change-Id: If89c67c0595808a1339517c6084f1d1e23f5974b
2019-06-18 13:24:38 -07:00
Lei Yu
3d1f180b1c Merge "Handle null intent in WifiCallingPreferenceController" into qt-dev am: b4d94a8ccc am: ab2a2b3d3f
am: daed3366ef

Change-Id: I60829ec1fd45ea1e265d4fdad346ca296d7a9b5d
2019-06-14 16:17:37 -07:00
Lei Yu
daed3366ef Merge "Handle null intent in WifiCallingPreferenceController" into qt-dev am: b4d94a8ccc
am: ab2a2b3d3f

Change-Id: Ic27910a58098eb4234e976cd2619a106bf4c347f
2019-06-14 16:06:03 -07:00
Lei Yu
192367bef2 Merge "Handle null intent in WifiCallingPreferenceController" into qt-dev
am: b4d94a8ccc

Change-Id: I82623904692cd6f9cdf1daf50b366c8a41f15804
2019-06-14 15:56:10 -07:00
Lei Yu
b4d94a8ccc Merge "Handle null intent in WifiCallingPreferenceController" into qt-dev 2019-06-14 22:38:59 +00:00
Antony Sargent
16f93e0d19 Merge "Fix Calls/SMS default SIM selector" into qt-dev am: 7af299c604 am: 24ebff2ff3
am: 40a63920f5

Change-Id: Icd3286369b6ff0abd9eccfc75cedc2b8acc8f544
2019-06-13 18:59:38 -07:00
Antony Sargent
40a63920f5 Merge "Fix Calls/SMS default SIM selector" into qt-dev am: 7af299c604
am: 24ebff2ff3

Change-Id: I2968c6b031bc4c91753344a2b853e5e374e47d39
2019-06-13 17:31:52 -07:00
Antony Sargent
edcd8e9ca5 Merge "Fix Calls/SMS default SIM selector" into qt-dev
am: 7af299c604

Change-Id: I588c6858b67101e03efff9235e96d799237135fe
2019-06-13 16:49:16 -07:00
TreeHugger Robot
7af299c604 Merge "Fix Calls/SMS default SIM selector" into qt-dev 2019-06-13 23:25:04 +00:00
Antony Sargent
22b827db55 Fix Calls/SMS default SIM selector
In cases where a SIM is initially disabled, even after you turn it on
the ListPreference's for selecting the default SIM for Calls and SMS
weren't working because the preference change listener wasn't getting
registered. This CL fixes that for these controllers by always
registering a change listener whenever we make the preference visible.

Fixes: 134472294
Bug: 135142209
Test: make RunSettingsRoboTests
Change-Id: Ia9362b7f26309bdbd6c5e8140fb606b28e2b34d8
2019-06-13 23:24:34 +00:00
Lei Yu
41bb2cb6a8 Handle null intent in WifiCallingPreferenceController
When intent is null, we will hide wifi calling preference however
its listener might still triggered with null intent.

This CL update controller so it can handle this event inside listener
callback.

Fixes: 135095929
Test: RunSettingsRoboTests
Change-Id: I4c5aba03871f11a2d9f9b4da329c2c2655ff9adb
2019-06-13 14:47:56 -07:00
Antony Sargent
4d76ef7b2e Merge "Remove on/off toggle for physical SIMs" into qt-dev am: 5836158f2e am: 5d186f5346
am: f0e3ac6f27

Change-Id: I4dd3e2855de57f1a3e3001fa8cda3206e8e045f4
2019-06-11 13:27:54 -07:00
Antony Sargent
f0e3ac6f27 Merge "Remove on/off toggle for physical SIMs" into qt-dev am: 5836158f2e
am: 5d186f5346

Change-Id: Ib92cedd28e291ba8e606f21883a7d69e73251a5c
2019-06-11 13:19:53 -07:00
Antony Sargent
af8fa25cfd Merge "Remove on/off toggle for physical SIMs" into qt-dev
am: 5836158f2e

Change-Id: Idfe1855b09448feea3036185f092b3f56b10f18e
2019-06-11 13:13:52 -07:00
Antony Sargent
e548fc6334 Remove on/off toggle for physical SIMs
Our original design for mobile network subscription management included
having an on/off toggle for both eSIMs and physical SIMs. However, it
turns out that our current telephony stack has some problems with
disabling physical SIMs, so for now we're removing the on/off
toggle. Because of this, we've added a footer to the SIM details page
for physical SIMS letting users know that to disable them you need to
remove them from the device.

Even though we're removing the on/off toggle for pSIMs, there are still
a few edge cases where you could end up with a disabled one (eg having
two SIMs in single-SIM mode where the eSIM is active and then you erased
the eSIM). In order to have a way to re-enable the pSIM in these cases,
this CL changes the relevant pref's summary to "Tap to activate <name>"
and makes the tap action begin the re-enabling. This can affect either
the Mobile network pref on the Network & internet main page (if this
disabled pSIM is the only SIM), or an entry in the Mobile networks list
page (if there are still multiple SIMs present).

Finally, this also fixes a problem where we weren't showing the on/off
toggle for eSIMs if you only had one SIM total; we actually always want
to show it for eSIMs.

Bug: 132921553
Test: make RunSettingsRoboTests
Change-Id: Id0750ebd5bed46dc2450b65b53cc81847ef09b82
2019-06-10 14:41:08 -07:00
Andy Chou
d8ff88aa81 Merge "UE showed wrong title and message when enabling data roaming." into qt-dev am: a9e8c50764 am: 8c0d669d6e
am: 3d43db4e50

Change-Id: Icd7d4f913c47a25278d85098a84a9e789191d3b2
2019-06-05 20:46:46 -07:00
Andy Chou
8c0d669d6e Merge "UE showed wrong title and message when enabling data roaming." into qt-dev
am: a9e8c50764

Change-Id: I8d6b2b025fd039202eca5f6c8eefea1acb8f0e91
2019-06-05 19:49:12 -07:00
Andy Chou
a9e8c50764 Merge "UE showed wrong title and message when enabling data roaming." into qt-dev 2019-06-06 00:35:16 +00:00
Antony Sargent
5217f29671 Add a "data during calls" preference am: aeb1da0db9 am: 7f7f7cda18
am: 7a48cb470b

Change-Id: I8f9e97915fa3063d0a2f865ed749201fb404f5bc
2019-06-03 19:00:57 -07:00
Antony Sargent
7f7f7cda18 Add a "data during calls" preference
am: aeb1da0db9

Change-Id: Ib33d13995f1c1c51bc0b17f109854a5e484f5741
2019-06-03 18:39:19 -07:00
Antony Sargent
aeb1da0db9 Add a "data during calls" preference
This adds a switch which appears on the SIM details page for any SIMs
that aren't the default on for data. It lets the user opt-in to turning
on data on this SIM only in the case where there is an active call -
this is needed because in some cases the default data SIM may not be
able to be used when a call is active on another SIM.

Bug: 132114205
Test: make RunSettingsRoboTests
Change-Id: Ie44c56e0f486fd93aff411a0ba0e47d3695a4941
2019-06-03 15:20:33 -07:00
zoey chen
3aa9c79341 UE showed wrong title and message when enabling data roaming.
It set wrong string when building the roaming dialog.

BUG: 133731388
Test: Manual test
Change-Id: Ib46b2b2ba1d62f84da7cd82bbbc03fe4f3069afc
2019-05-31 17:37:26 +08:00
Fan Zhang
ec81d6121e Override 2 getSliceUri() instance to return platform slice
Bug: 126222433
Test: robotest
Change-Id: I3f9c8202d9b75b24b80ebcf385abc95f8df851e2
2019-05-30 16:50:43 -07:00
Christine Franks
3ccc01ca18 Merge "Add SIM color picker" into qt-dev am: b747c5c270
am: c1c4a0858d

Change-Id: I0c4ac5abe7be3eeb2df324b41f13284ed25dea95
2019-05-30 13:35:49 -07:00
Christine Franks
02c4e123b7 Merge "Add SIM color picker" into qt-dev
am: b747c5c270

Change-Id: Ib5f272280d1d23c70412c3112bfcfc432af181ed
2019-05-30 13:26:55 -07:00
Christine Franks
b747c5c270 Merge "Add SIM color picker" into qt-dev 2019-05-30 20:01:48 +00:00
Sunny Shao
27f5a01cef Merge "Fix the crash while tapping "app data usage" as second user" into qt-dev am: 3d16fc9519
am: 9c4fb7ea1d

Change-Id: I2e74ff23833524c00f7fa5730199ce15bd662959
2019-05-30 00:05:20 -07:00
Sunny Shao
0135cde020 Merge "Fix the crash while tapping "app data usage" as second user" into qt-dev
am: 3d16fc9519

Change-Id: Id2aa3c501378686d1b3a1b352b8fa15132bc396f
2019-05-30 00:00:24 -07:00
Christine Franks
8869db9555 Add SIM color picker
Bug: 133193155
Test: make ROBOTEST_FILTER="(RenameMobileNetwork*)" RunSettingsRoboTests -j48

Change-Id: Ifae8b77bc5b4ba1039ede70889468a018f57d78f
2019-05-29 17:03:31 -07:00
Sunny Shao
bddf5149e5 Fix the crash while tapping "app data usage" as second user
Second user or guest is limited some mobile network access. We need to check current user
is admin or not to decide the preferece page will be found in search or not.

Bug: 133466016
Fixes: 133466016
Test: Manual test & make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.network

Change-Id: I48d3064a8aa28ac1f2ac699b42a999b9682b1b52
2019-05-30 06:15:11 +08:00
Antony Sargent
55ac2d75fc Merge "Switch to using an intent for eSIM erasing" into qt-dev
am: f010cb4034

Change-Id: Ia08496db92bd4a432db729d7734bc3bb3b9d6f0a
2019-05-29 13:14:42 -07:00
TreeHugger Robot
f010cb4034 Merge "Switch to using an intent for eSIM erasing" into qt-dev 2019-05-29 20:02:48 +00:00
Amit Mahajan
38b3a56364 Merge "Allow renaming inactive subscriptions." into qt-dev
am: d133a026cd

Change-Id: Ifb4aafad705860d12c02ad3d26a3a36019ad9847
2019-05-29 11:28:13 -07:00
TreeHugger Robot
d133a026cd Merge "Allow renaming inactive subscriptions." into qt-dev 2019-05-29 18:16:40 +00:00
Amit Mahajan
e0285703b2 Allow renaming inactive subscriptions.
Test: manual
Bug: 132922483
Change-Id: I30b4b88ddf53b917081a57bd9a917a51b4b44ec6
2019-05-28 16:03:55 -07:00
Antony Sargent
c6e07c61d0 Switch to using an intent for eSIM erasing
We initially landed support for erasing an eSIM subscription in
ag/7208624 for b/124254555 using our own confirmation/progress UI, and
calling the EuiccManager.deleteSubscription method to do the
deletion. It turns out this is a low-level API which doesn't handle some
important cases such as subscription grouping or the eSIM slot not being
active.

This CL changes Settings to just launch an intent to begin an eSIM
Manager flow to delete a subscription that provides its own
confirmation/progress UI, and should properly handle subscription
grouping and making the eSIM slot active as needed.

Bug: 132114333
Test: make RunSettingsRoboTests
Change-Id: Ie59fea37fa73c5e6573e1181e271ffb5d453bd08
2019-05-28 15:31:51 -07:00
Antony Sargent
3f48938e03 Merge "Add signal strength icons to multi-SIM header" into qt-dev
am: 42c451610e

Change-Id: I99abda9f54a97f0103c926ded07f027fac1d5482
2019-05-28 14:58:13 -07:00
Antony Sargent
223c179cd3 Add signal strength icons to multi-SIM header
When a device is in DSDS mode with multiple SIMs, we show a header on
the Network & internet page with a "connectivity overview", with an
entry for Wi-Fi (if connected) and each active SIM. The icon for Wi-Fi
shows signal strength, but the icons for the active SIMs were just
static; this CL fixes that. It introduces a class for listening to
signal strength changes on a set of subscriptions, and moves some
existing code we had for displaying signal strength (when manually
picking networks for GSM) in NetworkOperatorPreference into a utility
method that can be shared.

Bug: 128855095
Test: make RunSettingsRoboTests
Change-Id: I668cafe1e9f9c3651b1f33783c8538ad9c2732b5
2019-05-28 12:49:08 -07:00