Commit Graph

28258 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
Joshua Duong
317c9dc2ca Merge "[adb-wireless] Add Wireless Debugging Switch in Developer options." 2020-02-21 16:27:10 +00:00
Daniel Hunt
9f74807e89 Catch crash in mobile network ProgressDialog
When enabling "Automatically select network" in "Settings -> Network &
internet -> Mobile network -> Advanced" and rotating the device while
the dialog is showing there will be an IllegalArgumentException since
the decorView isn't attached to the window when dismissing the dialog.
Fixed by simply catching the exception since the dialog will be gone
anyway.

Bug: 146057372
Test: manual (see comment above)
Change-Id: I15f1d6f505fdf33964ce973ece31d6aa0d8f3909
2020-02-21 10:47:12 +00:00
Automerger Merge Worker
0e17e3f891 Merge "Update OWNERS file" am: e4ad103957 am: 0e48a26373
Change-Id: Ib0ff08318795e637e738ed0bfbbad24592f5677b
2020-02-21 07:16:12 +00:00
Automerger Merge Worker
0e48a26373 Merge "Update OWNERS file" am: e4ad103957
Change-Id: Ie9bab07be49cff753100a4abc17f239e7a926b71
2020-02-21 07:03:45 +00:00
George Chang
75d2a7f065 Update OWNERS file
Test: None
Merged-In: Ifa7045000ce578a611bb065cd821a87a54edd49c
Change-Id: Id8fcd93340d7869d7f5f933c720dbb3d277a368a
2020-02-21 06:07:48 +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
Automerger Merge Worker
cad8efb2fa Merge "Update Settings UI for IKEv2/IPsec VPNs" am: 9579a76913 am: 033a021251
Change-Id: I62bce794bffab8425a4991484986481fd308933b
2020-02-19 08:07:38 +00:00
Automerger Merge Worker
033a021251 Merge "Update Settings UI for IKEv2/IPsec VPNs" am: 9579a76913
Change-Id: I6578907688551efef77caca68a2e7cafa818a30b
2020-02-19 07:51:14 +00:00
Benedict Wong
9579a76913 Merge "Update Settings UI for IKEv2/IPsec VPNs" 2020-02-19 07:39:41 +00:00
Benedict Wong
0c1abce1a6 Update Settings UI for IKEv2/IPsec VPNs
This CL updates Settings for IKEv2/IPsec Platform VPN profiles.

Platform VPN profiles currently configure DNS and routes based on the
configuration received from the server. As such, these parameters are
not required to start an always-on VPN.

Similarly, a numeric server address is not required, as the IKEv2
library will do the DNS resolution based on the current Network. This
has the nice property of allowing the VPN to run with IPv4 or IPv6 outer
addresses (as opposed to LegacyVpn, which runs only in IPv4)

Lastly, this always allows configuration of the IKEv2 local identifier,
whether MSCHAPv2, RSA or PSK authentication is used.

Bug: 148991741
Test: Compiles, manually tested.
Change-Id: Ib1049fdc602e349bb0d24de536767a6e15adf194
2020-02-17 16:19:20 -08: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
Automerger Merge Worker
df93007555 RESTRICT AUTOMERGE am: f8396c5cc0
Change-Id: I348080b2dc5d6ee8074a1e6275a4bb8644caa417
2020-02-13 00:12:19 +00:00
Yanting Yang
f8396c5cc0 RESTRICT AUTOMERGE
Fix NPE of launching Settings with malicious URL

Add SafetyNet logging for tracing.

Fixes: 122836081
Test: visual, robotests
Change-Id: I97430ea0208c570c46a02dd499dfd944d20eb06e
2020-02-11 16:17:08 +08:00
Automerger Merge Worker
36bc7f92b1 Merge "[Settings] To avoid use APIs in IccCard directly, calling APIs through TelephonyManager" am: 5503c8ea9e am: 4a121f066c
Change-Id: Ie77bbc3fe379e11bb87b5af9ff8fdf424f503008
2020-02-08 05:07:12 +00:00
Automerger Merge Worker
4a121f066c Merge "[Settings] To avoid use APIs in IccCard directly, calling APIs through TelephonyManager" am: 5503c8ea9e
Change-Id: I90ba1b6e6f530b069d504a045d7832a8cf9e5833
2020-02-08 04:46:59 +00:00
Zoey Chen
5503c8ea9e Merge "[Settings] To avoid use APIs in IccCard directly, calling APIs through TelephonyManager" 2020-02-08 04:25:32 +00:00
Treehugger Robot
af463b86c9 Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master" 2020-02-08 01:29:23 +00:00
Rafael Matias de Lima
9ddd3445f0 Fix for User edit info dialog during rotation
[issue]
1. Go to Settings > System > Multiple users;
2. Edit user info;
3. Take a picture in portrait mode;
4. Turn the device to landscape mode;

Observe selected image is not retained;

[rootcause]
Fragments no longer need to check if the dialog
is showing up during onSaveInstanceState.

[test]
1. Edit user info;
2. Select a picture;
3. Turn the device to landscape mode;
2020-02-07 11:35:48 -03:00
Automerger Merge Worker
b29e64ace1 Bug:PreferredNetworkModePreferenceController.java not being refreshed am: b5dcd35969
Change-Id: Ib2e8c6b3249a1137559fa9259348dcf26b7d8a0e
2020-02-07 12:54: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
7425059fc9 Merge "Update profile api" am: 4f4c05addb
Change-Id: I8d3010852f55959ea7247b6487e197cd7c67a997
2020-02-07 02:57:38 +00:00
Treehugger Robot
4f4c05addb Merge "Update profile api" 2020-02-07 02:46:12 +00:00
Automerger Merge Worker
403ab5da4d Merge "Refactored cell broadcast area info support" am: c36cc4e120 am: 62480277ed
Change-Id: Ibb2f1dd5e007a78ab77dab21f086749df3a5a9cf
2020-02-06 17:40:08 +00:00
Automerger Merge Worker
62480277ed Merge "Refactored cell broadcast area info support" am: c36cc4e120
Change-Id: Ib1648fc64bc12d11b889468cd6a6c5c4ff09f0c2
2020-02-06 17:26:15 +00:00
Jack Yu
c36cc4e120 Merge "Refactored cell broadcast area info support" 2020-02-06 17:17:49 +00:00
SongFerngWang
b5dcd35969 Bug:PreferredNetworkModePreferenceController.java not being refreshed
Bug: 146594872
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
PreferredNetworkModePreferenceControllerTest (PASS)

Change-Id: Ic3579e630c1d9422d7105a2d8fb619409a5823d6
Merged-In: Ib5cc06cdbfd2fa70cd115d70337b21500e362da6
2020-02-06 17:11:48 +08: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
Automerger Merge Worker
07f9393486 Add whitelist in ResetAppsHelper am: 74ded43527
Change-Id: I8d784426362d6e9d523b262c25ef2d3c663f3373
2020-02-06 06:03:18 +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
Xin Li
8c472e240f DO NOT MERGE - Merge QQ1A.200205.002 into master
Bug: 147428392
Change-Id: I37f2fe376d2feaf5e6e3e640c3eef6bb42f14c52
2020-02-05 10:45:13 -08:00
Jack Yu
98973e3ba1 Refactored cell broadcast area info support
Area info cell broadcast messages are not handled
by cell broadcast receiver anymore. Instead, they will
be processed in cell broadcast service. Privileged apps
that are interested in getting the information will need
to get it directly from cell broadcast service.

Note this is only enabled for certain countries and carriers.

Test: Manual
Bug: 141318859
Merged-In: If6a0a0c6a76e8b90a8feaea1e2771993e2d0edfe
Change-Id: If6a0a0c6a76e8b90a8feaea1e2771993e2d0edfe
(cherry picked from commit c4da22a2ce)
2020-02-04 20:42:43 -08: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
Christopher Tate
4a89abe279 DO NOT MERGE - Track framework changes to crashApplication API
Bug: 128649910
Bug: 140108616
Test: manual
Test: atest OsHostTests#testForegroundServiceBadNotification
Change-Id: Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc
Merged-In: Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc
2020-02-04 17:48:06 -08:00
Automerger Merge Worker
8ef20ea9c5 Merge changes from topic "platform-vpn-user-consent" am: e9b3f3303e am: 5437a80536
Change-Id: I82d301a58cb8ea8234f2d4924123a07a3f02b784
2020-02-05 00:24:12 +00:00
Automerger Merge Worker
00e44f608c Add Platform VPNs to VPN list am: bcd6b8cbca am: 846de91c30
Change-Id: Ice85a8a0c5b526f67a56e004e3b2d3092076c658
2020-02-05 00:24:10 +00:00
Automerger Merge Worker
5437a80536 Merge changes from topic "platform-vpn-user-consent" am: e9b3f3303e
Change-Id: Ia6cd10ee5a8d78f6002874f69d08ed53a3013572
2020-02-05 00:07:43 +00:00
Automerger Merge Worker
846de91c30 Add Platform VPNs to VPN list am: bcd6b8cbca
Change-Id: Ic6e288d2e4b9634ad7a050361b309fab212e6520
2020-02-05 00:07:40 +00:00