PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
55,792 Commits 1 Branch 0 Tags
4f02905051fe819c4785ce04a0b71a6ec07ad82c
Commit Graph

55792 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
9e2de70584 Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev am: 594a5c71f5 
Change-Id: Ifeeb244d4dddebb4b05b4a7489d0fb28a195c4ad
 2020-02-28 06:16:40 +00:00
Automerger Merge Worker
46e57b10cc Skip QQ2A.200113.001 in stage-aosp-master am: 28f9734a4a 
Change-Id: I9728ea85ac963bc6da1d5bf3a965c6a93c3b3dfd
 2020-02-28 06:10:38 +00:00
TreeHugger Robot
594a5c71f5 Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev 2020-02-28 06:04:46 +00:00
Xin Li
9fe7d6c59b DO NOT MERGE - Skip QQ2A.200305.003 in stage-aosp-master 
Bug: 150410372
Change-Id: I5a62dae10a3c5d0b6fd38c364cf38a39de021e2d
 2020-02-27 15:45:16 -08:00
Xin Li
28f9734a4a Skip QQ2A.200113.001 in stage-aosp-master 
Bug: 146167222
Change-Id: I28eeb421d0e76d44f825436d0e4a61badd7e866d
 2020-02-27 15:36:13 -08:00
Daniel Hunt
26aaf07e9d Fix NPE in PanelFragment 
When updating the panel after getting a second intent to the
activity, there is a small window of opportunity for the user
to close the activity before the animation ends, causing an
NPE when onFinish is called as the activity already closed down.
This change will check that there is an activity before trying
to finish it.

Bug: 150322041
Test:
For an easy way to reproduce this, turn the screen on and run the
following in a terminal:
 while true; do adb shell am start -a \
 android.settings.panel.action.INTERNET_CONNECTIVITY; \
 sleep 0.1; done
Then press the back button while the screen is attempting to
display the fragment. There should be no Settings crash.
Change-Id: I4ca831d71a7221a7a4a62bb29e802f507ce5213c
 2020-02-27 15:47:38 +01:00
Automerger Merge Worker
1a3755c443 Merge "Fixes ApnEditor not restoring previous UI" am: cd4ca97828 am: 9ac493094e 
Change-Id: Ic9fbef9eb26c6ae7830e94f6b81e543ff853afec
 2020-02-27 09:12:37 +00:00
Automerger Merge Worker
9ac493094e Merge "Fixes ApnEditor not restoring previous UI" am: cd4ca97828 
Change-Id: I20438b787bb2424cc4455c476e5f6bd95d559d87
 2020-02-27 09:02:56 +00:00
Treehugger Robot
cd4ca97828 Merge "Fixes ApnEditor not restoring previous UI" 2020-02-27 08:50:37 +00:00
Automerger Merge Worker
48b2b18c89 Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev am: efe4cc3db4 
Change-Id: I53a9add4cf2cd2b5dcac408d8d1953e2166eacfc
 2020-02-27 06:25:24 +00:00
Betty Chang
efe4cc3db4 Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev 2020-02-27 06:10:25 +00:00
Lee Chou
80d8c3bc83 Fixes ApnEditor not restoring previous UI 
ApnEditor tries read and set the UI in onCreate, before the previous
bundle is restored. This caused problems when the configuration has
changed (such as switching to Dark Theme).

This moves the UI changes to onViewRestored

Fixes: 146399432
Test: make SettingsGoogle and manual test UI
Change-Id: I8147ec96569fa28867c088d6c36584aa344f40ed
Merged-In: I8147ec96569fa28867c088d6c36584aa344f40ed
 2020-02-27 12:33:16 +08:00
changbetty
288fa30c2d [Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null 
Bug: 149307162
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ImeiInfoDialogControllerTest
Change-Id: I1dd83ba55b34433b2b600b8a998000347b6ae5e8
Merged-In: I011b52fd25ca9ad48be3afcdabd9bdd443cd121d
 2020-02-26 18:23:31 +08:00
Automerger Merge Worker
f2748437b8 Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7 am: 840506e88a 
Change-Id: I7ee6383097ed4a3e8b33769da09ca0a8334d08a1
 2020-02-24 21:36:33 +00:00
Automerger Merge Worker
840506e88a Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7 
Change-Id: Ifa566bf809360db17a6932ee5ebaede2eb63e1b3
 2020-02-24 21:15:28 +00:00
Xiangyu/Malcolm Chen
aaee4539c7 Merge "Catch crash in mobile network ProgressDialog" 2020-02-24 21:07:17 +00:00
Automerger Merge Worker
b9964d4545 Fix volume panel crashing am: ef009cc832 
Change-Id: I4b1ffaaea0f3fccc1acfebb3061bb4679b18f165
 2020-02-24 15:06:04 +00:00
Raff Tsai
ef009cc832 Fix volume panel crashing 
slider position is smaller than min value causes the exception.
Fixed by limit the position within min and max value.

Fixes: 148270968
Fixes: 149973990
Test: manual
Change-Id: I3d162f6d2f1035b81b1b2eb915b488084e7ea36e
(cherry picked from commit fcd9f1a870)
Merged-In: I3d162f6d2f1035b81b1b2eb915b488084e7ea36e
 2020-02-24 07:04:03 +00:00
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
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