Commit Graph

9096 Commits

Author SHA1 Message Date
Automerger Merge Worker
9a49dd2bc4 Merge "Rename references to getLteOnCdmaMode" am: 7c849787ee am: 63da73532d
Change-Id: I7b32dea30b97fc1389054eb93b9dc160a1c88d3c
2020-02-21 22:41:37 +00:00
Automerger Merge Worker
63da73532d Merge "Rename references to getLteOnCdmaMode" am: 7c849787ee
Change-Id: I16b31595e00e501c6c097ef3e4ad78f3fb0f9b75
2020-02-21 22:23:21 +00:00
Sarah Chin
7c849787ee Merge "Rename references to getLteOnCdmaMode" 2020-02-21 22:09:16 +00:00
Automerger Merge Worker
44f654fe43 Merge "[adb-wireless] Add Wireless Debugging Switch in Developer options." am: 317c9dc2ca am: fd2e26d4aa
Change-Id: I741968b993698cf459c670678957276fef68ebbc
2020-02-21 17:02:44 +00:00
Automerger Merge Worker
fd2e26d4aa Merge "[adb-wireless] Add Wireless Debugging Switch in Developer options." am: 317c9dc2ca
Change-Id: I8a1f4c22237436e5e2e262a3723c39ae346a87fa
2020-02-21 16:44:30 +00:00
Sarah Chin
51617e3ceb Rename references to getLteOnCdmaMode
Use @SystemApi TelephonyManager#isGlobalModeEnabled()

Test: build
Bug: 147335742
Change-Id: Ie1b01a97cf163d68e4a5529f1718a9a782d44bb0
Merged-In: Ie1b01a97cf163d68e4a5529f1718a9a782d44bb0
2020-02-20 16:43:13 -08:00
Joshua Duong
0110afcc46 [adb-wireless] Add Wireless Debugging Switch in Developer options.
Bug: 111434128
Bug: 119492574

Test: make RunSettingsRoboTests ROBOTEST_FILTER=WirelessDebugging
Change-Id: I188badb43035172642cf235bb27e56d3a1dea169
Merged-In: I188badb43035172642cf235bb27e56d3a1dea169
2020-02-20 06:13:15 +00:00
Betty Chang
56235e44c5 Merge "[Mainline] To use getActiveSubscriptionInfo() instead of get default subscription Info with data/sms/voice" am: 251329c85c am: 74d5ae043c
Change-Id: Ief23331634bdccae49104db98193d0d842a7c99c
2020-02-17 07:01:23 +00:00
Betty Chang
74d5ae043c Merge "[Mainline] To use getActiveSubscriptionInfo() instead of get default subscription Info with data/sms/voice" am: 251329c85c
Change-Id: Iaec059c5f4bc8cef5dd4a6b77205bdd633782ed3
2020-02-17 06:46:24 +00:00
changbetty
1a5351c433 [Mainline] To use getActiveSubscriptionInfo() instead of get default subscription Info with data/sms/voice
- getDefaultDataSubscriptionInfo()
   	- getActiveSubscriptionInfo(getDefaultDataSubscriptionId());
   - getDefaultSmsSubscriptionInfo()
   	- getActiveSubscriptionInfo(getDefaultSmsSubscriptionId());
   - getDefaultVoiceSubscriptionInfo()
   	- getActiveSubscriptionInfo(getDefaultVoiceSubscriptionId());

Bug: 147206736
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageUtilsTest
      make RunSettingsRoboTests ROBOTEST_FILTER=MobileDataSliceTest
      make RunSettingsRoboTests ROBOTEST_FILTER=MobileDataPreferenceControllerTest
      make RunSettingsRoboTests ROBOTEST_FILTER=DefaultSubscriptionControllerTest

Change-Id: I7b5988b3c3068c12e242e123ebb54477093d37ad
Merged-Id: I7b5988b3c3068c12e242e123ebb54477093d37ad
2020-02-15 14:56:58 +08:00
Zoey Chen
3f23659639 Merge "[Settings] Add permission for #getCdmaRoamingMode and use value from TelephonyManager Bug: 145788881 Test: make Change-Id: Idf237f008af2ab6cab07689f1f2a602f6a98c4f1 Merged-In: Idf237f008af2ab6cab07689f1f2a602f6a98c4f1" am: 864bd01efe am: 7b8e8255cd
Change-Id: I29a8aee4d2c6ac45e3827555455f74c47589ca17
2020-02-14 07:11:47 +00:00
Zoey Chen
7b8e8255cd Merge "[Settings] Add permission for #getCdmaRoamingMode and use value from TelephonyManager Bug: 145788881 Test: make Change-Id: Idf237f008af2ab6cab07689f1f2a602f6a98c4f1 Merged-In: Idf237f008af2ab6cab07689f1f2a602f6a98c4f1" am: 864bd01efe
Change-Id: I951346d955f2223fce1b4c88e72cd44a5e33e1a5
2020-02-14 07:01:49 +00:00
Zoey Chen
864bd01efe Merge "[Settings] Add permission for #getCdmaRoamingMode and use value from TelephonyManager Bug: 145788881 Test: make Change-Id: Idf237f008af2ab6cab07689f1f2a602f6a98c4f1 Merged-In: Idf237f008af2ab6cab07689f1f2a602f6a98c4f1" 2020-02-14 06:49:45 +00:00
TreeHugger Robot
74ad28ff90 Merge "Set the max length of user name field in Profile info" into qt-qpr1-dev am: 936ebd0367
Change-Id: I5cb48821cb1bd7cc4d88b33844af567dd9cfcf7a
2020-02-14 06:29:56 +00:00
Treehugger Robot
226ef3d100 Merge "Import translations. DO NOT MERGE" 2020-02-12 01:12:50 +00:00
zoey chen
9d49a395c3 [Settings] Add permission for #getCdmaRoamingMode and use value from TelephonyManager
Bug: 145788881
Test: make
Change-Id: Idf237f008af2ab6cab07689f1f2a602f6a98c4f1
Merged-In: Idf237f008af2ab6cab07689f1f2a602f6a98c4f1
2020-02-07 14:31:08 +08:00
Automerger Merge Worker
9e876f6919 Merge "Update profile api" am: 4f4c05addb am: 7425059fc9
Change-Id: I40d4b126bda90a0bc5725325f84b15c99823dcdc
2020-02-07 03:11:42 +00:00
Automerger Merge Worker
42d5890a96 Merge "[Settings] fix failure test case - ConditionContextualCardController" am: c2823ab2ce am: f227708d08
Change-Id: I3dc450cb4a91c496e6a7c8306e4cd4a6b4a19a5b
2020-02-07 03:11:15 +00:00
Automerger Merge Worker
7425059fc9 Merge "Update profile api" am: 4f4c05addb
Change-Id: I8d3010852f55959ea7247b6487e197cd7c67a997
2020-02-07 02:57:38 +00:00
Automerger Merge Worker
f227708d08 Merge "[Settings] fix failure test case - ConditionContextualCardController" am: c2823ab2ce
Change-Id: I3fdabb38a0056f1b596ba4e1924e2116ba600f74
2020-02-07 02:55:05 +00:00
Treehugger Robot
4f4c05addb Merge "Update profile api" 2020-02-07 02:46:12 +00:00
Bonian Chen
c2823ab2ce Merge "[Settings] fix failure test case - ConditionContextualCardController" 2020-02-07 02:40:17 +00:00
Automerger Merge Worker
139c108a03 Merge "[Settings] Cannot use UnsupportedAppUsage API, use #hasIccCard() to replace" am: 814b7c40cb am: 23fab9be21
Change-Id: I7fa1fa40e29f0eccdc05fff69ef4b0c17da3b3e1
2020-02-06 06:33:53 +00:00
Automerger Merge Worker
23fab9be21 Merge "[Settings] Cannot use UnsupportedAppUsage API, use #hasIccCard() to replace" am: 814b7c40cb
Change-Id: I42233960cd715d506fc899f845ba7818a56e6886
2020-02-06 06:19:24 +00:00
Zoey Chen
814b7c40cb Merge "[Settings] Cannot use UnsupportedAppUsage API, use #hasIccCard() to replace" 2020-02-06 06:11:50 +00:00
hughchen
4d94a32482 Update profile api
The profile will auto connect / disconnect when set enable / disable
profile. This CL remove connect / disconnect method.

Bug: 141582844
Test: make -j42 RunSettingsRoboTests
Change-Id: Ib875d126be0d8483fb539e7ba950242a4f38cf81
Merged-In: Ib875d126be0d8483fb539e7ba950242a4f38cf81
2020-02-06 11:20:09 +08:00
Automerger Merge Worker
d4a5fc58c6 Merge "Add TEST_MAPPING to schedule auto test" am: 5c262a92de am: 374153a5cc
Change-Id: Ibc8da453623946b48b0b0cb8b9ad05295a1ad80c
2020-02-05 12:47:00 +00:00
Automerger Merge Worker
374153a5cc Merge "Add TEST_MAPPING to schedule auto test" am: 5c262a92de
Change-Id: I39ce2533de78c0529c8a705f173303e713b51cb6
2020-02-05 12:37:30 +00:00
Raff Tsai
55422c7517 Add TEST_MAPPING to schedule auto test
Test: atest :postsubmit
Change-Id: Ied8e241ef223ea5e87ca6ee0f04f4128c51ddb87
Merged-In: I0847d1dea352d0e3b87b1bb95d5c2600a80a7438
2020-02-05 10:40:01 +00:00
zoey chen
d54004f45e [Settings] Cannot use UnsupportedAppUsage API, use #hasIccCard() to replace
Bug: 145967955
Test: make
Change-Id: I8b948d1d416e1eb79e34be073b8ad81645d5ebb1
Merged-In: I8b948d1d416e1eb79e34be073b8ad81645d5ebb1
2020-02-05 12:04:22 +08:00
Bonian Chen
ac55b2ca49 [Settings] fix failure test case - ConditionContextualCardController
Setup parameters required by CellularDataConditionController

Bug: 148834975
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=ConditionContextualCardControllerTest
Change-Id: I8e0c7435cf18cfdafa39f58697b6d29db34b1867
Merged-In: I974df385d956dbff10aac874487d07d626992e4b
2020-02-04 18:59:53 +08:00
Automerger Merge Worker
b0ebb47014 Merge "[Settings] Avoid rename inactive subscription from NullPointerException" am: 91638e079f am: eafda3c724
Change-Id: I3e92055ad03cfa4f0bbe80185840f5783559c96f
2020-02-04 10:59:36 +00:00
Automerger Merge Worker
eafda3c724 Merge "[Settings] Avoid rename inactive subscription from NullPointerException" am: 91638e079f
Change-Id: I9a488c3d7b6452b64d1cb8b532d0f66f25017773
2020-02-04 10:51:31 +00:00
Bonian Chen
91638e079f Merge "[Settings] Avoid rename inactive subscription from NullPointerException" 2020-02-04 10:43:01 +00:00
Bonian Chen
ab459dc194 [Settings] Avoid rename inactive subscription from NullPointerException
1. Init instance before accessing it
2. Re-enable test case

Bug: 147321836
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=RenameMobileNetworkDialogFragmentTest
Change-Id: I2375043f16b5a25372af5c9f413fb8384850316c
Merged-In: Ifc245bec739b4c81d2cee04b091bcdb54d567d4a
2020-02-04 11:43:37 +08:00
Automerger Merge Worker
4d2b61d408 Merge "[Mainline] Use the @SystemApi setAlwaysAllowMmsData in TelephonyManager for mainline" am: cc9aef705a am: 30d7fd79c9
Change-Id: Ia279507e094b7b547ea8293465817a53cc305913
2020-02-04 03:08:47 +00:00
Automerger Merge Worker
30d7fd79c9 Merge "[Mainline] Use the @SystemApi setAlwaysAllowMmsData in TelephonyManager for mainline" am: cc9aef705a
Change-Id: I222f5d247438e1a64c0c33123555b97c1b3c5dfd
2020-02-04 02:55:31 +00:00
Betty Chang
cc9aef705a Merge "[Mainline] Use the @SystemApi setAlwaysAllowMmsData in TelephonyManager for mainline" 2020-02-04 02:44:15 +00:00
Jason Chiu
59f7342986 Set the max length of user name field in Profile info
Settings may crash when entering a very long user name.

Fixes: 136005061
Test: manual, robotest
Change-Id: Ica17297588fc6b84ef111ef00017afb27360acd3
Merged-In: Ica17297588fc6b84ef111ef00017afb27360acd3
(cherry picked from commit ca2bbc0685)
2020-02-03 10:25:55 +00:00
Bill Yi
be651d3874 Import translations. DO NOT MERGE
Change-Id: I5afe4b717cfa2d20b5e78caaf3417b0a161eb62b
Auto-generated-cl: translation import
2020-02-01 15:30:04 -08:00
Automerger Merge Worker
ad5fbe4177 Merge "Fix strings in PlatformCompatDashboard" am: a9f0446ce8 am: e89b34a366
Change-Id: I9ac23dd4d5bce7da2841e529ea7be65260ce987c
2020-01-20 13:35:08 +00:00
Andrei-Valentin Onea
e89b34a366 Merge "Fix strings in PlatformCompatDashboard"
am: a9f0446ce8

Change-Id: I56cb47ccfe8278e722556fb6f9d4d08f0ac35d52
2020-01-20 05:25:45 -08:00
Andrei-Valentin Onea
a9f0446ce8 Merge "Fix strings in PlatformCompatDashboard" 2020-01-20 13:18:06 +00:00
Automerger Merge Worker
1cb6b91c7f Merge "Update api name" am: f82f807e03 am: c36a071238
Change-Id: I4f69bebb7f926588dd326061d030982d324b9b9b
2020-01-20 04:41:30 +00:00
hughchen
c36a071238 Merge "Update api name"
am: f82f807e03

Change-Id: I20240365a45eb27bcfed019ac77e4e6bfe09d24d
2020-01-19 20:25:49 -08:00
Andrei Onea
e2f4619602 Fix strings in PlatformCompatDashboard
Be more specific, by referring to 'target SDK', instead of just 'SDK'.

Test: atest PlatformCompatDashboardTest
Bug: 138280620
Change-Id: Ied8dd5d682ed20962040bf81e9b3b3b45166ea46
2020-01-17 16:41:46 +00:00
hughchen
50c064d502 Update api name
Use CachedBluetoothDevice.connect() instead of
CachedBluetoothDevice.connect(boolean) to connect
Bluetooth device.

Fixes: 141582844
Test: manually
Change-Id: I8c50678bdfd6de89fb8d56122bfa38bdd5ac5c9d
Merged-In: I8c50678bdfd6de89fb8d56122bfa38bdd5ac5c9d
2020-01-16 10:33:30 +08:00
Automerger Merge Worker
eff77d28b9 Merge "Add a RTT setting in A11y screen" into qt-qpr1-dev am: fb44d744c3
Change-Id: I1716dc3e0b13a430ed4d5ff525b95bb09eb0b90a
2020-01-14 00:49:32 +00:00
changbetty
4bdbd135fb [Mainline] Use the @SystemApi setAlwaysAllowMmsData in TelephonyManager for mainline
Bug: 146309719
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MmsMessagePreferenceControllerTest
Change-Id: Ia591e82e1a55f36c98e7b00965532ff0762e1e77
Merged-In: Ia591e82e1a55f36c98e7b00965532ff0762e1e77
2020-01-10 17:15:09 +08:00
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