PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
72,444 Commits 1 Branch 0 Tags
060bf953e39b3310c04a0440acf702aeb691207c
Commit Graph

72444 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
android-build-team Robot
45b2d085ca Snap for 7128020 from acdb2d29e9 to rvc-qpr3-release 
Change-Id: Iad01012e2f2319b1fe9cbeba55f24b2c1d5c5a9c
 2021-02-06 00:05:58 +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
android-build-team Robot
f5ebcf9f29 Snap for 7122074 from 6dc9f825ec to rvc-qpr3-release 
Change-Id: Ib466fe2de642376d0bfbbe074332980af9f662b0
 2021-02-04 00:11:00 +00: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
android-build-team Robot
06503bb046 Snap for 7116531 from 6ec886a0e3 to rvc-qpr3-release 
Change-Id: I2feb84671d651829ba4d3e3c98ae04c11e2944e8
 2021-02-02 00:24:23 +00: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
Weng Su
58b0f2d5b3 [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:39:30 +00:00
Weng Su
eaeb50271e [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:34:01 +00:00
android-build-team Robot
51c6425868 Snap for 7112073 from 8865c08a85 to rvc-qpr3-release 
Change-Id: I42be5e3d33a2ef3bc0b107eb2085f29557044eaa
 2021-01-30 00:10:06 +00:00
Jiun-Yang Hsu
5da8b8b933 Merge "Create folder and OWNERS file for component test" am: cf231cad93 am: 1e2386b14b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1564814

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8474a2ec62e212d932865419b866c42c2fbd8826
 2021-01-29 23:43:05 +00:00
Jiun-Yang Hsu
1e2386b14b Merge "Create folder and OWNERS file for component test" am: cf231cad93 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1564814

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I60949e540697933fb138ab9d42d28657474cf136
 2021-01-29 23:21:55 +00:00
Bill Yi
ce7427560d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8865c08a85 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic082f3c3eb9d0b8019e5684618193874bec23797
 2021-01-29 20:41:29 +00:00
tom hsu
ae6a21427c Avoid wrong telephonymanager with wrong sub id. 
When initialized SimStatusDialogController, also create TelephonyManager
with sub id.

Bug: 174171839
Test: Manual test passed, see b/174171839#25
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SimStatusDialogControllerTest passed
Change-Id: I6bd6975e39c75884252b9d0bcd9d5548dbdfe6d5
Merged-In: I6bd6975e39c75884252b9d0bcd9d5548dbdfe6d5
 2021-01-29 14:31:02 +00:00
Jiun-Yang Hsu
cf231cad93 Merge "Create folder and OWNERS file for component test" 2021-01-29 12:48:32 +00:00
Jiun-Yang Hsu
2d0baa2c27 Create folder and OWNERS file for component test 
Test: No test needed for creating folder and OWNERS
Change-Id: I6b1aff581df36a9c70309df2f2ce30d547a820d5
 2021-01-29 09:01:30 +00:00
Bill Yi
8865c08a85 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I339425d596ff5e795d643ef724c65ab15e9438b7
 2021-01-29 00:47:28 -08:00
Peter Wang
003e5dc7c2 Merge "Add an intent filter for MobileNetworkListActivity to enable access from the LPA" am: ffccb8a611 am: b4f375fdc4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1554772

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib4dc9ab9b5b990924ad06d206adb9950c3d95552
 2021-01-27 22:24:35 +00:00