Commit Graph

55804 Commits

Author SHA1 Message Date
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
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
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
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
android-build-team Robot
328b2e27d2 Merge cherrypicks of [10301183, 10301340, 10301110, 10299537, 10300908, 10301450, 10300619, 10301451, 10301654, 10301341, 10301342, 10301343, 10301344, 10301508, 10301184, 10301185, 10301309, 10301290, 10301310, 10301345, 10301346, 10301464, 10301291, 10300931, 10301382, 10301383, 10301465, 10301384, 10301385, 10301408, 10301386, 10299538, 10301387, 10301388, 10301389, 10301390, 10301391, 10301292, 10301392, 10301393, 10301694, 10301695, 10301489, 10299807, 10299808, 10299809, 10300620, 10301491, 10301111, 10301348] into qt-qpr2-release
Change-Id: I8ff23443d78652a0cdda7542393f1c09b7d5e779
2020-02-12 01:26:23 +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
Bill Yi
dae5254cd8 Import translations. DO NOT MERGE
Bug: 143905457

Change-Id: I14e7311ac25f37bbf8bc846a79963d0c560d98c8
Auto-generated-cl: translation import
(cherry picked from commit 4ea25da221)
2020-02-12 01:18:59 +00:00
Curtis Belmonte
ec2106d5a3 Update L2U string for face unlock in settings
Test: Checked in Settings for flame-userdebug build
Bug: 143905457
Change-Id: I2705b6bf9ae0a140f69ffaa5490a91500745f1e0
Merged-In: I1e98b95e81dea355c66e8c0f30664db21632d05c
(cherry picked from commit 13a5924c8d)
2020-02-12 01:18:52 +00:00
Bill Yi
3f7cd6e788 Import translations. DO NOT MERGE
Change-Id: If28324d88c5dabf515e6ce440d4816b185a39a00
Auto-generated-cl: translation import
(cherry picked from commit 250b9e7012)
2020-02-12 01:18:43 +00:00
Treehugger Robot
226ef3d100 Merge "Import translations. DO NOT MERGE" 2020-02-12 01:12:50 +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
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
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
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
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
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
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
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
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
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
Treehugger Robot
5c262a92de Merge "Add TEST_MAPPING to schedule auto test" 2020-02-05 12:22:33 +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
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
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
Benedict Wong
e9b3f3303e Merge changes from topic "platform-vpn-user-consent"
* changes:
  Update setVpnPackageAuthorization call with VPN type
  Add Platform VPNs to VPN list
2020-02-04 23:56:16 +00:00
Benedict Wong
62e55361a8 Update setVpnPackageAuthorization call with VPN type
This commit updates the Settings to also pass the additional
VPN type for app-based VPNs.

Bug: 144246835
Test: Compiles, manually tested to be working
Change-Id: I10cf17419636c3c30e1ec06bb3e6751cb5c65d9b
Merged-In: I10cf17419636c3c30e1ec06bb3e6751cb5c65d9b
2020-02-04 21:06:07 +00: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
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
Automerger Merge Worker
d9d463013f Merge "Use IEC units in app info data usage." am: 1668f18a16
Change-Id: Ief2ba0f1b8338b5b9472bb2837fcb778d2652aba
2020-02-04 04:43:28 +00:00
Treehugger Robot
1668f18a16 Merge "Use IEC units in app info data usage." 2020-02-04 04:33:30 +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