Commit Graph

26 Commits

Author SHA1 Message Date
Antony Sargent
5c46d93bd8 Prevent NullPointerException in SimStatusDialogController
In rare cases the SignalStrength we get for a SIM can be null, which
wasn't checked for in this code. This CL adds a null check and fixes the
tests so it's possible to verify the fix (one of the methods that would
have crashed was being spy'd over unnecessarily).

Fixes: 132570076
Test: make RunSettingsRobotests
Change-Id: Ifdec24f184ee2d93e5e242eb2c20695249992fc6
2019-05-21 10:02:10 -07:00
Pengquan Meng
0ab776f69d Fixed network name for about/sim_status
The network name in sim status dialog is not the same as the one in the
about page. This CL use the carrier text which is resolved in
ServiceStateTracker as the network name, this keep the network name sync
with the status bar and the summary of sim status in the about page.

Bug: 31784938
Test: build & manual test
Change-Id: Ia741baabaa98ae447dbedf9e28fd2fda222e6d2e
2019-05-09 15:16:20 -07:00
andychou
6185e381e0 Fix incorrect mapping to get subscriptioninfo
getActiveSubscriptionInfoList() returns a list of active subscription.
It doesn't 1:1 mapping with slotId. So it is not correct to use slotId
as index to get subscriptioninfo from list.
Use framework interface getActiveSubscriptionInfoForSimSlotIndex() to
get subscriptioninfo per slotid instead.

Bug: 131123246
Test: Test with dual SIM device and atest SimStatusDialogControllerTest
pass

Change-Id: If7140f602571a5cb8dcdfff939bd84ccff0b482f
2019-04-24 23:18:51 +08:00
chen xu
96d0c484f3 Create TM for each subId to register phonestatelistner
To register phonestatelistner for different subscription, do not
create phonestatelistener(subId) this contructor is going to be removed.
instead, create TelephonyManager instance for each subId and pass
separate phonestateListener object.

Bug: 117555407
Test: Maunal test
Change-Id: Ia2a1be6e559c3a5b98e178a02d0eee14cc14eb47
2019-03-20 17:28:26 -07:00
Qingxi Li
02f2547482 Check euiccManager available before update EID
Test: E2E & Included
Bug: 126264451
Change-Id: Ic3876567dd139819d67e8b6ddc6f2b6ba03c98fa
2019-02-28 19:53:15 -08:00
Fan Zhang
31b210017b Migrate all MetricsProto enums to SettingsEnums
Bug: 122855168
Test: rebuild
Change-Id: I962d9a71179f86b7cae9dc5e9a00e0aa1557dc76
2019-01-17 14:55:42 -08:00
Malcolm Chen
14dde50c3a Don't show hidden Cellular subscription in Settings.
Replace getActiveSubscriptionInfoList() with
getActiveSubscriptionInfoList(true) so that settings will not show
hidden subscriptions to the user in various pages.

Bug: 121396526
Test: manual
Change-Id: I717999fed7d3a5a037914239694bef52df7c6207
2019-01-16 00:21:30 -08:00
Hall Liu
78cc28d962 Merge "Start using CarrierConfig for 4G/LTE icon" am: 558535f3f2 am: e419904aa0
am: 322091c7eb

Change-Id: I356e58af3dfe50a59ffc70b096ece86ece7c5d66
2018-10-18 15:54:56 -07:00
Hall Liu
e419904aa0 Merge "Start using CarrierConfig for 4G/LTE icon"
am: 558535f3f2

Change-Id: I9bb6a91c0c3a79f4b3fae4d50c431e0286b8c06f
2018-10-18 14:56:56 -07:00
Niklas Lindgren
8fdf33d50a Start using CarrierConfig for 4G/LTE icon
Icon will be updated on sim swap or in case
the default data SIM changes.

Test: Add configs in vendor xml and swap between sim cards.
Tested on both single sim and dual sim.
Bug: 113309356
Change-Id: I1847bcb4e6c1b6dcef7b14bce14f91bd3e4734a5
2018-10-04 09:42:27 +02:00
Fan Zhang
de117046ad DO NOT MERGE Import clean up.
Reordered all imports according to Android codestyle.

Test: rebuild
Change-Id: I750f01f70f2114d51838bf652833aebdc4065c98
2018-09-04 13:54:46 -07:00
Fan Zhang
c21f4a512a Merge "Sort imports" 2018-08-29 00:19:53 +00:00
Aurimas Liutikas
03fcde338b Migrate Settings to androidx.
Test: make Settings
Bug: 76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
Merged-In: I941dea40562170649bf056e675cc32e5163c0e39
(cherry picked from commit a290b873d0)
(cherry picked from commit b1af85d155)
2018-08-28 16:35:52 -07:00
Fan Zhang
23f8d59d02 Sort imports
Having consistent import order will reduce chance of merge
conflict between internal and external master

Test: rebuild
Change-Id: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
2018-08-28 22:13:15 +00:00
Aurimas Liutikas
b1af85d155 Migrate Settings to androidx.
Test: make Settings
Bug: 76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
Merged-In: I941dea40562170649bf056e675cc32e5163c0e39
(cherry picked from commit a290b873d0)
2018-08-28 11:48:56 -07:00
SongFerngWang
c6d5a0cb6a SIM status page sync signal strength and service state behavior from systemUI
To make behavior consistent in the long run and refactor the code
into settingslib and call it from both Settings and SystemUI.

Bug: 110973964
Test: run testcase and do manual test - test case as below:
1. Testcase: packages/apps/Settings: -> ALL PASS
make RunSettingsRoboTests ROBOTEST_FILTER=SimStatusDialogControllerTest
2. Fake the service state's voice and data value,voice is out of service
and data is in-service,and then check service state and signal strength
at sim status page -> PASS

Change-Id: I4cc454b6b3d4242af4805e2878f9d46ce28649ad
2018-08-23 19:14:26 +08:00
Fan Zhang
c7162cd24d Reorder and clean up imports.
Test: rebuild
Change-Id: I178485c84ae7146f991fd77b6d7504b029942a68
2018-06-18 15:45:09 -07:00
Aurimas Liutikas
e0069d332d Migrate Settings to androidx.
Test: make Settings
Bug: 76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
2018-04-20 12:52:29 -07:00
Fan Zhang
1a3ce22645 Remove wrapper for EUICCManager
Bug: 76167422
Test: robotests
Change-Id: I2a6687ffab780493fca7b2146cf73cbc7f634081
2018-03-29 17:52:04 -07:00
Doris Ling
649751a4a8 Move IMS registration state to SIM status screen
Manually merge change I3aff03ebdc9dc165db66c5007a2fa987ab8cd822 due
to merge conflicts.

To show IMS registration state for each SIM, move the preference of
IMS registration state from Status screen to SIM Status screen.

Fixes: 66063299
Test: manual - Checked that the IMS registration state is displayed on
the SIM Status screen.
Test: make RunSettingsRoboTests

Change-Id: Ic0713c357085d94b59605c1b924e7b56a362e256
2018-03-28 13:01:33 -07:00
Hall Liu
6f4b185331 Split "Mobile Network Type" indication in Settings
Display data and voice network type for clarity

Change-Id: I26e52dcc564dfd96e36e45d94d6e69225ea4a80f
Fixes: 70938010
Test: manual, unit
2018-03-16 22:53:12 +00:00
Qingxi Li
37f14c0ef6 Add EID into SIM status dialog
Bug: 68761649
Test: make RunSettingsRoboTests
Change-Id: Ifdcf2abe6fa56a002841610d2652cc7364b23417
2018-01-23 10:13:31 -08:00
Wu Qiang
4d8f51531f Fix plus position in about phone
Settings has phone number in about phone, "+"
is shown with incorrect position in Bidi layout.
Then it needs to use BidiFormatter

Fixes: 70700094
Test: manual
Change-Id: I1d63f773926136c38ce1ac811869476dc6a89eac
2018-01-16 09:58:36 -08:00
Jordan Liu
3040fde446 Add signal strength customization
Also add default behavior in case carrier config bundle is null.

Bug: 69730732
Test: manual and new unit test
Change-Id: Ia38462a7e1b6f2e27ff45d93beef09465a68ae5c
2017-12-12 11:51:32 -08:00
jeffreyhuang
5b8202a296 Move iccid number to sim status dialog
- Remove iccid number logic from imei dialog
 - Add iccid number log to sim status dialog

Bug: 36458278
Test: make RunSettingsRoboTests -j40
Change-Id: I087688645169b387b9d65264e2c8b70ca565a44e
2017-11-06 12:38:45 -08:00
jeffreyhuang
7d7e98a214 Popup a dialog to display sim status information
- Create layout files for the dialog
 - Create a new controller to launch the dialog activity
 - Create a new controller to update the contents of the dialog
 - Deprecate old files that are no longer used in about phone v2

Bug: 36458278
Test: make RunSettingsRoboTests -j40
Change-Id: Iaf4f5e53c83b27f148acb076f38bfeabff41087e
2017-11-02 10:55:18 -07:00