PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
72,497 Commits 1 Branch 0 Tags
50b308df2edf8bf8ebdf71186cb8619ccf4881db
Commit Graph

72497 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
29302ad638 Merge "Switch Settings from IConnectivityManager to VpnManager." am: ace5a90870 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1574947

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d050875038408172e538290a53d10306d986578
 2021-02-09 12:21:58 +00:00
Jing Ji
492e985708 Fix crash issue when NetworkSelectSettings UI goes OFF and then ON 
When updating selected preference instance by index, since
mPreferenceCategory hasn't been updated yet, and then there is a
possibility that the index is over the size of preference, so this
would result to Settings crash because IndexOutOfBoundsException
was detected in NetworkSelectSettings.
After updating the network preferences of mPreferenceCategory, update
the selected preference.

Test: manual - Checked that crash does not occur when
NetworkSelectSettings UI goes OFF and then ON.
Test: auto - Passed NetworkSelectSettingsTest.
Bug: 179754915

Change-Id: Ib736fe8fdcc82c3ac01ad1828d0f2a1c24610f2b
 2021-02-09 09:42:03 +00:00
Treehugger Robot
ace5a90870 Merge "Switch Settings from IConnectivityManager to VpnManager." 2021-02-09 09:09:35 +00:00
android-build-team Robot
62f84cbeaf Merge cherrypicks of [13524839, 13524840, 13524841, 13524928, 13524929, 13524930, 13522744, 13524951, 13524860, 13524371, 13524372, 13524373, 13524374, 13524861, 13525166, 13525167, 13525168, 13524843, 13524957, 13524958, 13524936, 13525246, 13524939, 13524940, 13525248, 13524942, 13525249, 13525250, 13525251, 13524943, 13525169, 13525170, 13524358, 13524961, 13524962, 13524963, 13524966, 13524844, 13525325, 13525326, 13524964, 13525327, 13525328, 13524359, 13525307, 13525345] into rvc-qpr2-release 
Change-Id: I483a80fa8e5cccdfde9a4a2092fc9c6140b01a7c
 2021-02-09 01:25:36 +00:00
Hugh Chen
6d996e0138 DO NOT MERGE: resolve merge conflicts of c17ec818af to rvc-qpr-dev 
Bug: 167403112
Test: send intent to test right prompts message is pop up. make -j42 RunSettingsRoboTests
Change-Id: Iec4d1963e626829b696c2047c5979a684119acf7
Merged-In: Iec4d1963e626829b696c2047c5979a684119acf7
(cherry picked from commit dc2b694a54)
 2021-02-09 01:24:35 +00:00
Chiachang Wang
dbd031a46f Merge "Replace Proxy hidden constants and methods usages" am: e3be1ecb38 am: 5c5b36f19d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1574955

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7f3a634620e6467da136e0454ab98c994d7a23a6
 2021-02-08 11:31:48 +00:00
Chiachang Wang
5c5b36f19d Merge "Replace Proxy hidden constants and methods usages" am: e3be1ecb38 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1574955

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iba522bcd7591747f012918dc87f05f7aab1c2a1b
 2021-02-08 11:00:55 +00:00
Chiachang Wang
e3be1ecb38 Merge "Replace Proxy hidden constants and methods usages" 2021-02-08 10:27:05 +00:00
Lorenzo Colitti
04d34ced59 Switch Settings from IConnectivityManager to VpnManager. 
The VPN code is moving out of ConnectivityService to a new
VpnManagerService. Update Settings to call into the VpnManager
class instead of using the AIDL interface directly. This way,
the VPN code can be moved without touching Settings.

Bug: 173331190
Test: builds, boots
Test: manually verified VPN settings page
Change-Id: Id2731a166b5d6783acb1c711a54604b69aa8c0d7
 2021-02-08 16:50:25 +09:00
TreeHugger Robot
5130730d9b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 42f0c09a95 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13513511

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic015a19cf6a67a19a6100ff3e787fc62d2031f0a
 2021-02-08 05:03:09 +00:00
TreeHugger Robot
32a131a0f5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: ad376e668d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13513510

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5178301f18df626ea068796c638a59a436029e11
 2021-02-08 05:02:34 +00:00
TreeHugger Robot
42f0c09a95 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-02-08 04:28:36 +00:00
TreeHugger Robot
ad376e668d Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-02-08 04:24:35 +00:00
Bill Yi
94fc64396b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I68d5c5e5ec56489504224bdd9e431bb96555d6de
 2021-02-07 19:27:59 +00:00
Bill Yi
857a2e0052 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ieee517e48487579ff5ce29f1aaf4ab7cae860688
 2021-02-07 18:58:53 +00:00
Chiachang Wang
9aaad19a82 Replace Proxy hidden constants and methods usages 
Proxy is a part of incoming connectivity mainline module. The
hidden APIs are no longer available outside the module. These
shared constants and methods are moving to ProxyUtils insdide
net shared lib. Update the corresponding usage in the caller
side.

Bug: 172183305
Test: atest SettingsRoboTests
Change-Id: I2d51442e65dbcdf1a36940d8a25c7571363d56e6
 2021-02-05 17:37:14 +08:00
Sarah Chin
ad0fcc19c0 [automerger skipped] Merge "Update onSubscriptonOverride listener" am: bff5a89842 am: d25b9c12b6 -s ours 
am skip reason: Change-Id I9436b414608d7c964185d3d5c3f1f554c65b2c12 with SHA-1 57fbecc6c1 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1569300

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ife9b2672c9674f4fb5dbb53e820342ff5d98da69
 2021-02-05 06:16:01 +00:00
Sarah Chin
d25b9c12b6 Merge "Update onSubscriptonOverride listener" am: bff5a89842 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1569300

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05f0d8e4e7b335fef2c9f92829f75c88b8d36dc1
 2021-02-05 05:49:59 +00:00
Sarah Chin
bff5a89842 Merge "Update onSubscriptonOverride listener" 2021-02-05 05:14:50 +00:00
Sarah Chin
3af9f8835e Merge "Update onSubscriptonOverride listener" into rvc-qpr-dev-plus-aosp 2021-02-05 03:05:24 +00:00
Alex Salo
76190cf069 Merge "Implemented nearby button that displays wifi sharing intent and long press button that opens wifi qr share fragment" am: d1b9b7f87f am: 72dad8bc9d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1552081

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iae883594bbcf485c096b77152a82154b3caafdef
 2021-02-05 01:27:56 +00:00
Alex Salo
72dad8bc9d Merge "Implemented nearby button that displays wifi sharing intent and long press button that opens wifi qr share fragment" am: d1b9b7f87f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1552081

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iafddf0eb17f24f4b0c845411092ed8c6c36fbbd5
 2021-02-05 00:25:15 +00:00
Alex Salo
d1b9b7f87f Merge "Implemented nearby button that displays wifi sharing intent and long press button that opens wifi qr share fragment" 2021-02-05 00:02:42 +00:00
changbetty
4de946a1e3 [automerger skipped] [Telephony settings] Settings crashes when rotate screen in Preferred network type am: acdb2d29e9 -s ours 
am skip reason: Change-Id Id169353f6dc10306dddd823a904f0803b26a6ddc with SHA-1 dd91eadaaf is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13472811

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib38e3dea462169b38e1f0be4350e33a42005522b
 2021-02-04 23:42:03 +00:00
Abel Tesfaye
2babd2d36a Implemented nearby button that displays wifi sharing intent and long press button that opens wifi qr share fragment 
Test: locally with phone
Change-Id: I73663cd3e9e86431a9264925661159fbcd16b9d3
Merged-In: I931aabaada09c87b4a7936bcde4fcff8bc237dd0
 2021-02-04 22:07:08 +00:00
Sarah Chin
57fbecc6c1 Update onSubscriptonOverride listener 
Test: atest FrameworksTelephonyTests
Test: atest SubscriptionManagerTest
Bug: 175723642
Change-Id: I9436b414608d7c964185d3d5c3f1f554c65b2c12
Merged-In: I9436b414608d7c964185d3d5c3f1f554c65b2c12
 2021-02-04 13:13:24 -08:00
Bill Yi
573a375a5a [automerger skipped] Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE" am: 0e0360963a -s ours am: 21cea68a24 -s ours 
am skip reason: Change-Id Ied29947db9713f171dd3c582554fddbb0a1c8d7e with SHA-1 3e1fb17420 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1573546

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97e093144665318f408cf8031422b8b0ab06101a
 2021-02-04 18:40:34 +00:00
Bill Yi
21cea68a24 [automerger skipped] Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE" am: 0e0360963a -s ours 
am skip reason: Change-Id Ied29947db9713f171dd3c582554fddbb0a1c8d7e with SHA-1 3e1fb17420 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1573546

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id4a3153c551d622287caed126207c367a8427c0d
 2021-02-04 18:19:16 +00:00
Bill Yi
0e0360963a Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE" 2021-02-04 17:08:42 +00:00
Treehugger Robot
93726f4de6 Merge "[Settings] Add owner into Settings/network" am: 18b440997f am: 14993282f1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1574280

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibec0968f801f6a0d581394f06b41f26204277c37
 2021-02-04 09:19:27 +00:00
Treehugger Robot
14993282f1 Merge "[Settings] Add owner into Settings/network" am: 18b440997f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1574280

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5cd2673f9d2daea6de8c3329172e1f65590a03e1
 2021-02-04 08:26:11 +00:00
Treehugger Robot
18b440997f Merge "[Settings] Add owner into Settings/network" 2021-02-04 08:01:46 +00:00
Zoey Chen
f74551eb47 [Settings] Add owner into Settings/network 
Bug: None
Test: Not required
Change-Id: I7cc22c9455f4f074c1e22dd27e1f9cb4028376a8
 2021-02-04 13:11:04 +08:00
changbetty
acdb2d29e9 [Telephony settings] Settings crashes when rotate screen in Preferred network type 
When activity is recreated, fragments are automatically reattached.
Need to check the savedInstanceState is null or not when we want to add framgment in MobileNetworkActivity.
(lost to check in ag/9667137)

Bug: 154087690
Test: Manual
      make RunSettingsRoboTests -j ROBOTEST_FILTER=MobileNetworkActivityTest
Change-Id: Id169353f6dc10306dddd823a904f0803b26a6ddc
Merged-In: Id169353f6dc10306dddd823a904f0803b26a6ddc
 2021-02-04 12:53:16 +08:00
Bill Yi
0f8ac7d168 Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE 
Merged-In: Ied29947db9713f171dd3c582554fddbb0a1c8d7e
Merged-In: I402b212594a9e9f4c118d94008f53177d3430361
Change-Id: I19cd6d4c1152270a8936d7a9b999c870415f4221
 2021-02-03 17:01:33 -08:00
TreeHugger Robot
15cd80a3b5 Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into rvc-qpr-dev am: 6dc9f825ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13432622

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I935c42a6c063f5a2a881aea48b33576b3a2ae572
 2021-02-03 17:59:37 +00:00
TreeHugger Robot
6dc9f825ec Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into rvc-qpr-dev 2021-02-03 17:24:05 +00:00
Weng Su
05d6fa9bcb [Security Report] Fix Settings WifiScanModeActivity Overlaid issue 
- Disallowed non system overlay windows

- Screenshot
  https://screenshot.googleplex.com/77fJ9QN6pV4zFYc

Bug: 174047492
Test: manual test
Merged-In: Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff
Change-Id: Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff
(cherry picked from commit d47d8e4fc5)
 2021-02-03 10:00:07 +00:00
Aaron Huang
68bdb8e8b8 Merge "Replace @hide API with public API" am: d52cff9b57 am: 3178dfc76a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1566248

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a1b589342e82b22a5a5a960fe94feaca2505adc
 2021-02-03 09:35:49 +00:00
Aaron Huang
3178dfc76a Merge "Replace @hide API with public API" am: d52cff9b57 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1566248

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a7897d737557abe1b7ede7f3931b2798e9610ab
 2021-02-03 08:30:43 +00:00
Aaron Huang
d52cff9b57 Merge "Replace @hide API with public API" 2021-02-03 07:37:33 +00:00
Tsung-Mao Fang
211a2fff0d Fix security issue 
Settings#CredentialStorage could be overlaid to
trick user into clearing all credentials.

Disallow non-system overlay on activity.

Test: Trigger the debug apk again, and no overlay
Bug: 176753731
Change-Id: I657de039d667f5aee0941336e9361ae04f056c33
Merged-In: I657de039d667f5aee0941336e9361ae04f056c33
 2021-02-03 06:44:56 +00:00
Bill Yi
d5c30053f5 [automerger skipped] Merge RQ1A.210205.004 to stage-aosp-master - DO NOT MERGE am: 3e1fb17420 -s ours 
am skip reason: Change-Id Ia1d85c7136b824e69077ea06c68d142a706c2b11 with SHA-1 62f6b96b51 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13462033

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I402b212594a9e9f4c118d94008f53177d3430361
 2021-02-03 01:34:44 +00:00
Bill Yi
3e1fb17420 Merge RQ1A.210205.004 to stage-aosp-master - DO NOT MERGE 
Merged-In: Ia1d85c7136b824e69077ea06c68d142a706c2b11
Change-Id: Ied29947db9713f171dd3c582554fddbb0a1c8d7e
 2021-02-02 09:44:11 -08:00
Sarah Chin
123205e141 Update onSubscriptonOverride listener 
Test: atest FrameworksTelephonyTests
Test: atest SubscriptionManagerTest
Bug: 175723642
Change-Id: I9436b414608d7c964185d3d5c3f1f554c65b2c12
Merged-In: I9436b414608d7c964185d3d5c3f1f554c65b2c12
 2021-02-01 18:33:34 -08:00
Tom Hsu
62f6b96b51 Merge "Avoid wrong telephonymanager with wrong sub id." into rvc-qpr-dev am: 6ec886a0e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13413809

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia1d85c7136b824e69077ea06c68d142a706c2b11
 2021-02-01 18:00:38 +00:00
Tom Hsu
6ec886a0e3 Merge "Avoid wrong telephonymanager with wrong sub id." into rvc-qpr-dev 2021-02-01 17:26:47 +00:00
Aaron Huang
3bb961affd Replace @hide API with public API 
ProxyInfo is inculded in framework-connectivity module
which should not have external dependencies on its hidden API.
Thus, migrate getExclusionListAsString to getExclusionList.

Bug: 178777253
Test: build
Change-Id: I64b9d5be062bec43c7be3ea68d1f63054319df2d

Change-Id: I400df793fc669d0e574fb4cf022d021d99859d53
 2021-02-01 19:16:23 +08:00
Weng Su
32d5d3a3a3 [Security Report] Fix Settings WifiScanModeActivity Overlaid issue 
- Disallowed non system overlay windows

- Screenshot
  https://screenshot.googleplex.com/77fJ9QN6pV4zFYc

Bug: 174047492
Test: manual test

Merged-In: Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff
Change-Id: Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff
(cherry picked from commit d47d8e4fc5)
 2021-02-01 03:45:27 +00:00
Weng Su
faa5f6b5f6 [Security Report] Fix Settings WifiScanModeActivity Overlaid issue 
- Disallowed non system overlay windows

- Screenshot
  https://screenshot.googleplex.com/77fJ9QN6pV4zFYc

Bug: 174047492
Test: manual test

Merged-In: Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff
Change-Id: Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff
(cherry picked from commit d47d8e4fc5)
 2021-02-01 03:42:15 +00:00