Automerger Merge Worker
d41ee5451c
Merge "mainline:Replace serviceState.getDataRegState with getDataRegistrationState" am: c5e7864948
am: ed119d3b0e
...
Change-Id: I694cb96db9ebb8258bb2c423e6c04133b747f1c8
2020-01-10 07:40:16 +00:00
SongFerngWang
9cd3d0daeb
mainline:Replace serviceState.getDataRegState with getDataRegistrationState
...
Bug: 146637978
Test: - make RunSettingsRoboTests ROBOTEST_FILTER\
=PreferredNetworkModePreferenceControllerTest (PASS)
- make RunSettingsRoboTests ROBOTEST_FILTER\
=EnabledNetworkModePreferenceControllerTest (PASS)
Change-Id: I5a4a1a2b0dc5140257963651b69c0f427ef5ae93
Merged-In: I5a4a1a2b0dc5140257963651b69c0f427ef5ae93
2020-01-10 13:05:36 +08:00
Automerger Merge Worker
d0401b1883
Merge "MAP: Add developer option to control map version" am: a24f03d58e
am: d8e0b57e3a
...
Change-Id: I91537221abd287ca66fbc5b1d945b8a464b3e3de
2020-01-09 03:46:22 +00:00
Treehugger Robot
a24f03d58e
Merge "MAP: Add developer option to control map version"
2020-01-09 03:00:28 +00:00
Automerger Merge Worker
46f5e64f94
Merge "Removed reference to RadioAccessFamily" am: b13a4ef322
am: d934d5eda2
...
Change-Id: I1b13f79040ba776e8a0c763280d4fc3f89e3f373
2020-01-09 02:26:28 +00:00
Treehugger Robot
b13a4ef322
Merge "Removed reference to RadioAccessFamily"
2020-01-09 02:09:10 +00:00
Automerger Merge Worker
b85d1971bf
Merge "Fix policy for platform compat UI" am: 3208f994c1
am: e184ff6028
...
Change-Id: If560c3b115101910ab4e7e2976463ebd30d79d1b
2020-01-08 18:54:09 +00:00
Andrei-Valentin Onea
3208f994c1
Merge "Fix policy for platform compat UI"
2020-01-08 18:42:44 +00:00
Andrei Onea
96de9d4cac
Fix policy for platform compat UI
...
Only show debuggable apps on user builds. Also, only enable changes that
are overrideable.
Bug: 138280620
Bug: 144552011
Test: Settings->Developer Options->App Compatibility Changes on user
build
Test: atest PlatformCompatDashboardTest
Exempt-From-Owner-Approval: Previously approved
Change-Id: Ibf9611d1809492ebe979fc55f9331daf78ca9b27
2020-01-08 16:44:36 +00:00
Lee Chou
373b43c16e
Removed reference to RadioAccessFamily
...
1. Removed reference to RadioAccessFamily#getNetworkTypeFromRaf,
RadioAccessFamily#getRafFromNetworkType
2. Migrated hidden NETWORK_MODE_* constants in TelephonyManager
Bug: 147079703
Test: build and test manually
Change-Id: I94745edc37d80336197f874cb7b4afd42dfc97a8
2020-01-08 19:13:47 +08:00
Chienyuan
01f4f8432e
MAP: Add developer option to control map version
...
Bug: 146916756
Test: manual
Change-Id: I6015e5dae8e2c19549babe556b84a2c5b24dd669
Merged-In: If32db03072e02b7b2477c7da943b6b0e6a9be260
2020-01-08 17:04:25 +08:00
Automerger Merge Worker
74baf75975
Merge "[Settings] Remove access to getSimOperator() API" am: cd4113ba5c
am: 5113ada6ab
...
Change-Id: I54323620052496d6cb82d65623eed0a0404f9d45
2020-01-07 18:31:09 +00:00
Bonian Chen
cd4113ba5c
Merge "[Settings] Remove access to getSimOperator() API"
2020-01-07 18:06:40 +00:00
Automerger Merge Worker
30fa13d592
Merge "[Settings] Remove PhoneStateIntentReceiver" am: 1a3ed7a560
am: dbc6a6395e
...
Change-Id: Iece6ca294d5c52595b3ad249a2ea1a09ae0a6e8d
2020-01-07 16:40:17 +00:00
Bonian Chen
1a3ed7a560
Merge "[Settings] Remove PhoneStateIntentReceiver"
2020-01-07 16:21:01 +00:00
Bonian Chen
7d31f16e0f
[Settings] Remove access to getSimOperator() API
...
Replace getSimOperator() by having SubscriptionInfo
from ProxySubscriptionManager#getActiveSubscriptionInfo().
Bug: 144263441
Test: Manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=ApnEditorTest
Change-Id: I132b352dfb50a9cd3a2ddd21b347177ac0332740
Merged-In: I25cc9dc0912564b8d6f8b23b53f3eb20a51eea32
2020-01-07 12:44:30 +00:00
Bonian Chen
e520ec60aa
[Settings] Remove PhoneStateIntentReceiver
...
1. Replace PhoneStateIntentReceiver by adopting PhoneStateListener
2. Replace TelephonyProperties.in_ecm_mode() by
TelephonyManager.getEmergencyCallbackMode()
Bug: 144331663
Change-Id: Ib127cb165c65f50851c4390b05a16dfb8024fab1
Bug: 145830780
Test: Manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=AirplaneModeEnabler
Merged-In: Ib39ab1881484f65bc5a3834b2828c6ba98198cca
2020-01-02 18:26:21 +08:00
Automerger Merge Worker
cd46f2df4f
Merge "[Settings] Replace getSimCount() API" am: b0bddfec15
am: 92f25fadd2
...
Change-Id: I709109c86262dcc6886ccd2dbccf84fbc7188650
2019-12-27 02:58:25 +00:00
Bonian Chen
b0bddfec15
Merge "[Settings] Replace getSimCount() API"
2019-12-27 02:45:42 +00:00
Automerger Merge Worker
a58c7ba27a
Merge "[Settings] Replace #getServiceStateForSubscriber with #getServiceState" am: e8cf63ddd3
am: 8ead010c08
...
Change-Id: I558dad7bbc41bc1dc30a72665da0d96e263e67ed
2019-12-26 14:15:29 +00:00
Zoey Chen
e8cf63ddd3
Merge "[Settings] Replace #getServiceStateForSubscriber with #getServiceState"
2019-12-26 13:44:58 +00:00
Bonian Chen
b373aeedfe
[Settings] Replace getSimCount() API
...
Change design of monitor change in Settings.Global.MOBILE_DATA and
Settings.Global.DATA_ROAMING in order to avoid from accessing
getSimCount().
Bug: 144251589
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=RoamingPreferenceControllerTest
Change-Id: If50c57e7c1b27f9a0baf2bd46cc0930e0a0be2bd
2019-12-26 19:02:57 +08:00
zoey chen
fc3ddb2f16
[Settings] Replace #getServiceStateForSubscriber with #getServiceState
...
Bug: 146821501
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=RenameMobileNetworkDialogFragmentTest
Change-Id: I8a1819b70a8d4ec56ae40f2b8b613bcd65a12b11
Merged-In: I8a1819b70a8d4ec56ae40f2b8b613bcd65a12b11
2019-12-26 17:12:42 +08:00
Automerger Merge Worker
631a1d206c
Merge "[Settings] Replace #getSimCount with #getActiveModemCount" am: 171eabcb2d
am: 22c2c14605
...
Change-Id: Ic45f318e6784205e88a13f8a2fdf7fcdb04c9955
2019-12-26 04:17:42 +00:00
Automerger Merge Worker
c5d575f085
Merge "[Settings] Replace TelephonyManager#from()" am: 98e6ab358b
am: 4be4ae6a75
...
Change-Id: Ie2daa594c252d71e63125108036a4428563bed5b
2019-12-26 04:17:28 +00:00
Zoey Chen
171eabcb2d
Merge "[Settings] Replace #getSimCount with #getActiveModemCount"
2019-12-26 03:44:47 +00:00
Bonian Chen
98e6ab358b
Merge "[Settings] Replace TelephonyManager#from()"
2019-12-26 03:36:09 +00:00
zoey chen
5b336b1bd9
[Settings] Replace #getSimCount with #getActiveModemCount
...
Bug: 146815553
Test: make
Change-Id: I9911d2d565a60dbf4a6af47cc25c8345ac2c6355
Merged-In: I9911d2d565a60dbf4a6af47cc25c8345ac2c6355
2019-12-25 16:30:25 +08:00
Automerger Merge Worker
857267b1e8
Merge "Mainline:SimStatusDialogController decouple TelephonyManager hidden APIs" am: 6bba42fb40
am: 27c52d5e76
...
Change-Id: I12080d93b39b990083f3ac795b7e4ae42ffcbe8d
2019-12-24 09:14:23 +00:00
SongFerng Wang
6bba42fb40
Merge "Mainline:SimStatusDialogController decouple TelephonyManager hidden APIs"
2019-12-24 08:59:48 +00:00
Automerger Merge Worker
f5b6c700fc
Merge "[Settings] Replace Robolectric#setupActivity()" am: 6aee4f9548
am: 69f67d996b
...
Change-Id: I2b2622c16d23347b8d0a709ea7e1b681e6be7480
2019-12-23 08:16:16 +00:00
Bonian Chen
67f7ab3f2b
[Settings] Replace TelephonyManager#from()
...
Replacing TelephonyManager#from() by public API.
Bug: 146752167
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=EuiccPreferenceControllerTest
Change-Id: I8f6e8bc57c20782540f8b26bdeb163d881e70a2e
2019-12-23 15:44:52 +08:00
Bonian Chen
6aee4f9548
Merge "[Settings] Replace Robolectric#setupActivity()"
2019-12-23 07:38:44 +00:00
Automerger Merge Worker
0988f8cfec
Merge "Retrieve EID from each card" am: 2f5ad9cb4d
am: d34e17143f
...
Change-Id: Iee9c974eef13599eebc4dfd82f7fbc5f10e7ca58
2019-12-23 06:21:54 +00:00
SongFerngWang
d6bc6dee08
Mainline:SimStatusDialogController decouple TelephonyManager hidden APIs
...
- telephonymanager set subid by createForSubscriptionId
-getDataNetworkType(I)
-getVoiceNetworkType(I)
-getSimSerialNumber(I)
-getServiceStateForSubscriber(I)
- copy getNetworkTypeName() to SimStatusDialogController
Bug: 143998492
Test: Build pass.
make RunSettingsRoboTests ROBOTEST_FILTER\
=SimStatusDialogControllerTest
Change-Id: Ieb8547496a4b0da7332abd227056f9b786c7ef6a
2019-12-23 14:12:56 +08:00
Bonian Chen
2f5ad9cb4d
Merge "Retrieve EID from each card"
2019-12-23 05:53:14 +00:00
Bonian Chen
6435164abf
[Settings] Replace Robolectric#setupActivity()
...
Avoid from accessing Robolectric#setupActivity().
Bug: 140707056
Test: make RunSettingsRoboTests ROBOTEST_FILTER=EuiccPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataServiceSetupPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ApnPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsagePreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SubscriptionsPreferenceControllerTest
Change-Id: I8552b181d2dc1c9a5d8aeb0b7e79bbec7252f67e
2019-12-23 03:08:25 +00:00
Automerger Merge Worker
925e9771ea
Merge "Add Tapjacking Protection for SettingsHomepageActivity" into qt-qpr1-dev am: 12510978c3
...
Change-Id: I0808583341d6f2a867dfa47cf08e7f529e3b0571
2019-12-20 18:25:50 +00:00
TreeHugger Robot
12510978c3
Merge "Add Tapjacking Protection for SettingsHomepageActivity" into qt-qpr1-dev
2019-12-20 18:11:29 +00:00
Automerger Merge Worker
17bc83209f
Merge "Update the behavior of the Dark theme slice" into qt-qpr1-dev am: bc96cf54cd
...
Change-Id: I9f59dac9b64f2cb0acf31448c10cb0ef5c04da62
2019-12-20 15:35:13 +00:00
TreeHugger Robot
bc96cf54cd
Merge "Update the behavior of the Dark theme slice" into qt-qpr1-dev
2019-12-20 15:23:53 +00:00
Automerger Merge Worker
4b6beab35e
Remove permission bar chart in Privacy setting am: 8e58e2c7a5
...
Change-Id: Id55e0078ce0eccc85a0ef15706ba07b26da5c3ab
2019-12-20 10:31:03 +00:00
Sunny Shao
5f42f2f7a7
Update the behavior of the Dark theme slice
...
- Dark theme slice disappear when battery saver is ON.
Bug: 146149658
Fixes: 142476879
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=ROBOTEST_FILTER=com.android.settings.homepage.contextualcards.slices.DarkThemeSliceTest
Change-Id: I071014d7f0658db2098e353717afda905f162ecd
2019-12-20 13:25:49 +08:00
Tsung-Mao Fang
8e58e2c7a5
Remove permission bar chart in Privacy setting
...
- Because permission hub is already postponed,
we don't need to show this UI in privacy settings.
Test: Rebuild, visual, robotest
Change-Id: I51aca52bc605a3c6b0cafc084e8e491c280d770f
Fix: 143447873
Merged-In: I51aca52bc605a3c6b0cafc084e8e491c280d770f
(cherry picked from commit ab914adc00
)
2019-12-19 16:51:58 +08:00
Sunny Shao
a74060c1b7
Add Tapjacking Protection for SettingsHomepageActivity
...
Add/remove the SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS flag into/from
SettingsHomepageActivity and SettingsPanelActivity with lifecycle.
Bug: 138442483
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.homepage
make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.panel
manual test
Change-Id: I72f9a947f57f74a8c09127d6c39173594c248ddc
Merged-In: I72f9a947f57f74a8c09127d6c39173594c248ddc
2019-12-19 02:59:10 +00:00
Automerger Merge Worker
268595f26a
Merge "[Settings] Create a proxy for SubscriptionManager" am: b2380eaaee
am: 73e6ec3231
...
Change-Id: Iafb4bf54ea21d88867b675bb71bf7eb1fec5bf06
2019-12-18 09:21:56 +00:00
Bonian Chen
b2380eaaee
Merge "[Settings] Create a proxy for SubscriptionManager"
2019-12-18 09:04:53 +00:00
Yoshiaki Naka
81dbc00b6e
Retrieve EID from each card
...
Each eUICC has its own EID. The same EID retrieved from the default
eUICC shall not be displayed for all the SIM status dialogs when the
device supports multiple UICCs.
Bug: 141256483
Test: Manual and SimStatusDialogControllerTest
Change-Id: I367ae3a5f97ff92e03312bed6fe37727ae3798ab
2019-12-18 17:57:47 +09:00
Automerger Merge Worker
619d8b3418
Merge "Add feature provider for face unlock" into qt-qpr1-dev am: 8472279900
...
Change-Id: I3334a10c25af3b5a8ed125495c7012fe46516485
2019-12-17 05:38:36 +00:00
Automerger Merge Worker
1bacc5697b
Merge "[Settings] Suspend some test case(s)" am: a70e45b03c
am: 9bd271763e
...
Change-Id: Iecbace1215fa4c150a44cc462c7157bc044250f4
2019-12-17 03:37:08 +00:00