PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
55,686 Commits 1 Branch 0 Tags
9a49dd2bc446ef89884eede2d04b6cc24f8e66be
Commit Graph

55686 Commits

This Branch
This Branch
All Branches
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
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
Treehugger Robot
e4ad103957 Merge "Update OWNERS file" 2020-02-21 06:54:10 +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
Betty Chang
251329c85c Merge "[Mainline] To use getActiveSubscriptionInfo() instead of get default subscription Info with data/sms/voice" 2020-02-17 06:38:29 +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
936ebd0367 Merge "Set the max length of user name field in Profile info" into qt-qpr1-dev 2020-02-14 06:20:29 +00:00
Automerger Merge Worker
df93007555 RESTRICT AUTOMERGE am: f8396c5cc0 
Change-Id: I348080b2dc5d6ee8074a1e6275a4bb8644caa417
 2020-02-13 00:12:19 +00:00
Automerger Merge Worker
d8ffaba4ae [automerger skipped] Merge "Import translations. DO NOT MERGE" am: 226ef3d100 -s ours am: 707aeaca7d -s ours 
am skip reason: subject contains skip directive

Change-Id: Idff5a28b6a63996c4f89cfa4493154ddfe022cde
 2020-02-12 01:38:27 +00:00
Automerger Merge Worker
707aeaca7d [automerger skipped] Merge "Import translations. DO NOT MERGE" am: 226ef3d100 -s ours 
am skip reason: subject contains skip directive

Change-Id: Id2f88bf0aa3ce2da5a1666798d1a71e1e20ff62a
 2020-02-12 01:22:22 +00:00
Treehugger Robot
226ef3d100 Merge "Import translations. DO NOT MERGE" 2020-02-12 01:12:50 +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
7863cde18d Merge "Launch TetherSettings via Settings.ACTION_TETHER_SETTINGS" am: bc80ff1630 am: 66864cb891 
Change-Id: I9088e5dc52fec154c884bf5659378ae5bafba8fc
 2020-02-11 02:51:01 +00:00
Automerger Merge Worker
66864cb891 Merge "Launch TetherSettings via Settings.ACTION_TETHER_SETTINGS" am: bc80ff1630 
Change-Id: I71c32a98356d268d90b8c99345041fedd023b06e
 2020-02-11 02:37:24 +00:00
Paul Hu
bc80ff1630 Merge "Launch TetherSettings via Settings.ACTION_TETHER_SETTINGS" 2020-02-11 02:27:00 +00:00
Automerger Merge Worker
2759bebf32 [automerger skipped] Import translations. DO NOT MERGE am: d41b716f6c -s ours 
am skip reason: subject contains skip directive

Change-Id: I1c94527f6a741b5e036635c0b89c9e86148c0b1d
 2020-02-09 03:24:35 +00:00
Bill Yi
d41b716f6c Import translations. DO NOT MERGE 
Change-Id: I802d73dcc63414bed8b9b5bba8ff87ad38c22ebc
Auto-generated-cl: translation import
 2020-02-08 01:07:28 -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
Automerger Merge Worker
c8e044de48 Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master" am: af463b86c9 am: cd27b5b901 
Change-Id: I07988bb74d92486adfddb88142c0b3f92d2110ba
 2020-02-08 01:57:10 +00:00
Automerger Merge Worker
b946cbd92c DO NOT MERGE - Merge QQ1A.200205.002 into master am: 8c472e240f am: abf86230e4 
Change-Id: Id79f92e9ea099ca850428be4748f24cd28ea30e0
 2020-02-08 01:55:27 +00:00
Automerger Merge Worker
cd27b5b901 Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master" am: af463b86c9 
Change-Id: I58a086074b45bedb194752973412dc4c1e6cd1ab
 2020-02-08 01:48:45 +00:00
Automerger Merge Worker
abf86230e4 DO NOT MERGE - Merge QQ1A.200205.002 into master am: 8c472e240f 
Change-Id: I6aca2687101666e27b3a20d0dc54bad50739cfb1
 2020-02-08 01:38:43 +00:00
Treehugger Robot
af463b86c9 Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master" 2020-02-08 01:29:23 +00:00
Automerger Merge Worker
b29e64ace1 Bug:PreferredNetworkModePreferenceController.java not being refreshed am: b5dcd35969 
Change-Id: Ib2e8c6b3249a1137559fa9259348dcf26b7d8a0e
 2020-02-07 12:54:50 +00:00
paulhu
08efd36bf2 Launch TetherSettings via Settings.ACTION_TETHER_SETTINGS 
Bug: 149068177
Test: Build, Flash, manual test.
Change-Id: If01bdeb7f6ea021cc28c462360a969985882348b
 2020-02-07 14:42:08 +08: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