Commit Graph

56273 Commits

Author SHA1 Message Date
Andrei-Valentin Onea
e184ff6028 Merge "Fix policy for platform compat UI"
am: 3208f994c1

Change-Id: I88c0caf2c0904db1a1acfae7072699031d66fcdf
2020-01-08 10:47:45 -08:00
Andrei-Valentin Onea
3208f994c1 Merge "Fix policy for platform compat UI" 2020-01-08 18:42:44 +00:00
Automerger Merge Worker
db65d2b0b2 Merge "[Settings] Remove IMS factoryReset()" am: bf3aaf0f37 am: dc4e189dbc
Change-Id: I019d3a5df41512a142a4745b4d56a53b73a05c60
2020-01-08 18:25:01 +00:00
Bonian Chen
dc4e189dbc Merge "[Settings] Remove IMS factoryReset()"
am: bf3aaf0f37

Change-Id: I56c8a7b23e97bf13e44faedd9a3aac898f3c11e9
2020-01-08 10:09:32 -08:00
Bonian Chen
bf3aaf0f37 Merge "[Settings] Remove IMS factoryReset()" 2020-01-08 17:29:10 +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
Bonian Chen
31e07211d9 [Settings] Avoid from accessing createManageSubscriptionIntent(int)
Avoid from accessing
SubscriptionManager#createManageSubscriptionIntent(int).
Create a copy of source code into Settings.

Bug: 147334060
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsageSummaryPreferenceControllerTest
Change-Id: Id44a6b214a8f5d378d7a536fbf984a0512e6a92d
2020-01-08 23:32:30 +08:00
Bonian Chen
4fa40aed87 [Settings] Remove IMS factoryReset()
IMS factoryReset() has been done within
TelephonyManager.resetSettings().

Bug: 147342492
Test: manual
Change-Id: Ic17b8235e76a4bcf3e6bf5329a88477697a33c51
Merged-In: Id5c868726189397fc2a85717326e56e055b640af
2020-01-08 14:15:37 +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
android-build-team Robot
08371f4f37 Snap for 6117658 from ea38ee575c to qt-qpr2-release
Change-Id: I44501989e5ef74f247d4871acee591f550dac6a6
2020-01-08 02:25:45 +00:00
Philip P. Moltmann
00d42d0737 (Cherry-pick from internal) Adapt test to change internal API SubscriptionController#getActiveSubscriptionInfoList
Test: atest SettingsUnitTests
Bug: 136595429
Change-Id: I2320cd8405ab42fe725f698ca844341785dcd9f9
2020-01-07 16:09:16 -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
5113ada6ab Merge "[Settings] Remove access to getSimOperator() API"
am: cd4113ba5c

Change-Id: I419340fe39e2e708b376970f1f5b99de6e99e5dc
2020-01-07 10:10:46 -08: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
dbc6a6395e Merge "[Settings] Remove PhoneStateIntentReceiver"
am: 1a3ed7a560

Change-Id: I3e5645099ab4449514cbf385beb099b411893bbd
2020-01-07 08:26:38 -08: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
Automerger Merge Worker
cb39dc74d3 [automerger skipped] Import translations. DO NOT MERGE am: ea38ee575c -s ours
am skip reason: subject contains skip directive

Change-Id: Ic66bd4cda32ee09da1e8759bb47cb9a0c842ec23
2020-01-07 09:51:58 +00:00
Bill Yi
ea38ee575c Import translations. DO NOT MERGE
Change-Id: I534651e241a731ea3b099e5741be1fd8778bd6f8
Auto-generated-cl: translation import
2020-01-06 18:59:23 -08:00
Automerger Merge Worker
eed5099341 Merge "Track system server permission change" am: 2cf89ae027 am: 52b3ad3249
Change-Id: I6a8e7376d0374f7dc11efb164f18ffc16e0b107c
2020-01-06 21:20:54 +00:00
Neil Fuller
52b3ad3249 Merge "Track system server permission change"
am: 2cf89ae027

Change-Id: I0418dde737c07142a6016823f1604e94dcbf11eb
2020-01-06 13:02:36 -08:00
Neil Fuller
2cf89ae027 Merge "Track system server permission change" 2020-01-06 19:38:25 +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
android-build-team Robot
fdad130808 Snap for 6103831 from 7369a964a2 to qt-qpr2-release
Change-Id: I797a019ac71ae0dcac7a44f3a25bc67f7990977a
2019-12-31 02:12:56 +00:00
Automerger Merge Worker
08b42adf46 Merge "[Settings] Correct spelling in source code" am: 22c5c7d4a4 am: 42a1f866e4
Change-Id: Iac65c4fb8ded870857207c316946535f4ec87a5f
2019-12-30 07:35:49 +00:00
Bonian Chen
42a1f866e4 Merge "[Settings] Correct spelling in source code"
am: 22c5c7d4a4

Change-Id: Ia9322a82c58385c4aed2f4b3ffa0d85aed7b123f
2019-12-29 23:21:24 -08:00
Bonian Chen
22c5c7d4a4 Merge "[Settings] Correct spelling in source code" 2019-12-30 07:18:59 +00:00
Automerger Merge Worker
c30575610c Merge "Changed reference of telecom.Log to util.Log" am: f9d06dc434 am: 2bffc2754a
Change-Id: Ic36bfe8db4edba2a80353a9d4fa66027e5d92364
2019-12-30 04:59:08 +00:00
Lee Chou
2bffc2754a Merge "Changed reference of telecom.Log to util.Log"
am: f9d06dc434

Change-Id: I5fcbf96ab581c71e714de6659b97a1bf9a3a02d9
2019-12-29 20:39:02 -08:00
Lee Chou
f9d06dc434 Merge "Changed reference of telecom.Log to util.Log" 2019-12-30 04:36:18 +00:00
Bonian Chen
b14af41430 [Settings] Correct spelling in source code
Rename mSubsciptionsMonitor into mSubscriptionMonitor.

Test: build pass
Change-Id: Ib0444c61fbe4238f743bf83f6ff96656be433c9d
2019-12-30 10:27:57 +08:00
Automerger Merge Worker
60bcb71b58 [automerger skipped] Import translations. DO NOT MERGE am: 7369a964a2 -s ours
am skip reason: subject contains skip directive

Change-Id: Idc4419449dcd445230b9905565ba699013ac632f
2019-12-29 23:56:52 +00:00
Bill Yi
7369a964a2 Import translations. DO NOT MERGE
Change-Id: I450573e52646e40a777bc10ddd4afa56458f5f18
Auto-generated-cl: translation import
2019-12-28 20:54:14 -08:00
android-build-team Robot
654cc0cc33 Snap for 6101103 from f9f41df89a to qt-qpr2-release
Change-Id: I708843cc9728c299499a64325db4a44c9967699f
2019-12-28 02:11:34 +00:00
Automerger Merge Worker
5b01a22369 [automerger skipped] Merge "Phone Info UI shows network type list which depends on RAT supported" into qt-qpr1-dev am: f9f41df89a -s ours
am skip reason: Change-Id Id32982fe3e6fbf686fafe94ecc6c8549c7a5243c with SHA-1 be5216cacb is in history

Change-Id: Icb018b000b85680699bf2f56568cf4e97ffd90b2
2019-12-27 18:44:34 +00:00
SongFerng Wang
f9f41df89a Merge "Phone Info UI shows network type list which depends on RAT supported" into qt-qpr1-dev 2019-12-27 18:26:49 +00:00
Lee Chou
1c5f319f3c Changed reference of telecom.Log to util.Log
Bug: 146912511
Test: make and test manually
Change-Id: Ibc077c71c6181cf7724279fd73e4370aaf8fefa1
2019-12-27 17:12:18 +08:00
SongFerngWang
75c5940b7c Phone Info UI shows network type list which depends on RAT supported
Phone Info UI shows preferred network type list which depends on
device RAT supported. If device is 5G supported, UI shows 5G list.
If device is not 5G supported, UI shows LTE list.

Bug: 146504601
Test: 1.Build pass.
2. go to Phone Info UI, and set preferred network type (PASS)

Change-Id: I079d40b4ed593dd6629caf96ca8a94aaf69e9f04
Merged-In: Id32982fe3e6fbf686fafe94ecc6c8549c7a5243c
Merged-In: Id62a2bf4b2c44efcd48319734d1cab6ed969ee06
2019-12-27 07:02:39 +00: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
92f25fadd2 Merge "[Settings] Replace getSimCount() API"
am: b0bddfec15

Change-Id: Ic3ddc7317f92b3d61b841aaa476e2bd734044796
2019-12-26 18:48:55 -08: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
8ead010c08 Merge "[Settings] Replace #getServiceStateForSubscriber with #getServiceState"
am: e8cf63ddd3

Change-Id: I1bd0fc19e4150e26ebd2418b0c2b3b7dca41e605
2019-12-26 06:01:41 -08:00
Zoey Chen
e8cf63ddd3 Merge "[Settings] Replace #getServiceStateForSubscriber with #getServiceState" 2019-12-26 13:44:58 +00:00
Automerger Merge Worker
b206208982 Merge "[Settings] Replace #getSubscriberId(I) with #getSubscriberId()" am: 47634431c6 am: 4359db040c
Change-Id: I2489531d3b940c6de8ad0805fc138a66b1607ba2
2019-12-26 13:11:36 +00:00
Zoey Chen
4359db040c Merge "[Settings] Replace #getSubscriberId(I) with #getSubscriberId()"
am: 47634431c6

Change-Id: I6ff3a75a9455059835ca5f9d9776ee724ccf3122
2019-12-26 05:02:24 -08:00
Zoey Chen
47634431c6 Merge "[Settings] Replace #getSubscriberId(I) with #getSubscriberId()" 2019-12-26 12:01:22 +00:00
Automerger Merge Worker
9494af9634 Merge "Modify 5G RAT into Bearer field." am: 79977fadca am: 7664d08e28
Change-Id: I5410a38cf933c4f661731d2a810b5e7a00637763
2019-12-26 11:46:46 +00:00