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

72023 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Peter Wang
b4f375fdc4 Merge "Add an intent filter for MobileNetworkListActivity to enable access from the LPA" am: ffccb8a611 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1554772

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia9cd23da0ae90f7f5c38fae54900b30e7ca12bad
 2021-01-27 22:03:32 +00:00
Peter Wang
ffccb8a611 Merge "Add an intent filter for MobileNetworkListActivity to enable access from the LPA" 2021-01-27 21:39:51 +00:00
Yo Chiang
06bf3f1993 Merge "Remove feature flag "settings_dynamic_system"" am: df58c6505d am: 7ac7030d49 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1540949

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I11d9849150aac649b704cfa129256deba6ac862b
 2021-01-26 23:08:05 +00:00
Yo Chiang
7ac7030d49 Merge "Remove feature flag "settings_dynamic_system"" am: df58c6505d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1540949

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I141aeae1f09a535aad5084f335c6ecbed696bfde
 2021-01-26 11:34:53 +00:00
Yo Chiang
df58c6505d Merge "Remove feature flag "settings_dynamic_system"" 2021-01-26 10:53:54 +00:00
Bill Yi
195b137800 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d70a7f7442 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0c33d55aab01e1a4bfc168b995dd4f6bd0e452b3
 2021-01-24 17:17:21 +00:00
Bill Yi
d70a7f7442 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I31f2d5d2686777c42e311f92bc352efd150eb164
 2021-01-24 00:41:08 -08:00
Peter Wang
7e8d24e073 Add an intent filter for MobileNetworkListActivity to enable access 
from the LPA

Bug: 170507492
Test: Local
Change-Id: I6e87d3a3c75c832354c3a3ad407889e8d2701cbd
Merged-In: I6e87d3a3c75c832354c3a3ad407889e8d2701cbd
 2021-01-19 22:21:45 -08:00
Bill Yi
f1d3def534 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0e76c6245 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I09ad3498255e42ca23debb04cb6eed6cfb5bc488
 2021-01-15 07:48:35 +00:00
Bill Yi
d0e76c6245 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I84b4dc12bad46b115fabd1c1dd6a756d5705a712
 2021-01-14 22:07:28 -08:00
Yo Chiang
f1065e359f Remove feature flag "settings_dynamic_system" 
Bug: 176795908
Test: Presubmit
Test: DSULoader
Change-Id: Ib6b450489c63913c47858cf295e4785fd5d0cfbb
Merged-In: Ib6b450489c63913c47858cf295e4785fd5d0cfbb
 2021-01-14 15:47:41 +08:00
TreeHugger Robot
a8b695c31f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: bb974b69a0 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I890c875c147001a6d2318b95f7091327e9063c78
 2021-01-13 18:42:26 +00:00
TreeHugger Robot
bb974b69a0 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-01-13 17:58:40 +00:00
Bill Yi
129b3b91d1 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iaea90af3fb9836088e85de6a8a692b965b4419fa
 2021-01-12 23:26:57 -08:00
Benjamin Franz
04bbd87254 Merge "Update constructor usage for CompatibilityChangeInfo" am: 39a920dd22 am: 9229794727 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1541372

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I91b4bd641afa6811cb5837763e60fbfd0decb82e
 2021-01-12 16:41:53 +00:00
Benjamin Franz
9229794727 Merge "Update constructor usage for CompatibilityChangeInfo" am: 39a920dd22 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1541372

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4946065f619aac04cf681c310bfe04a6e5e68099
 2021-01-12 16:22:18 +00:00
Benjamin Franz
39a920dd22 Merge "Update constructor usage for CompatibilityChangeInfo" 2021-01-12 15:38:01 +00:00
Alisher Alikhodjaev
a75273fe12 Merge "Fix robotests failure in connectivity settings" into rvc-qpr-dev am: 07bb0280f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13298728

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia942e29d02f120905558779723fdb4a7b00117f5
 2021-01-11 23:31:02 +00:00
Alisher Alikhodjaev
07bb0280f6 Merge "Fix robotests failure in connectivity settings" into rvc-qpr-dev 2021-01-11 23:08:40 +00:00
TreeHugger Robot
07c98be876 Merge "Add adaptive charging to the top level settings menu" into rvc-qpr-dev am: 4046f5c134 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13287641

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie23c4efbf1923e89c4f077decb397251f6c70f28
 2021-01-09 00:02:13 +00:00
TreeHugger Robot
4046f5c134 Merge "Add adaptive charging to the top level settings menu" into rvc-qpr-dev 2021-01-08 23:16:28 +00:00
Bill Yi
834bce20d7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d5c247dbf -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ife4a611a82a86cb6ed3236ed244cb691d48ea985
 2021-01-08 18:00:46 +00:00
Bill Yi
1d5c247dbf Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic94d377a34a4c4e4df254418e06023ef13abb5b8
 2021-01-08 07:36:39 -08:00
Treehugger Robot
f83f554a75 Merge "Fix too many receivers Exception" am: 2e6cde6b94 am: 8c2b2cc806 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1498417

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iac11b0261e6c2323558d974e7e81788c54661029
 2021-01-08 10:14:26 +00:00
Treehugger Robot
8c2b2cc806 Merge "Fix too many receivers Exception" am: 2e6cde6b94 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1498417

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id69d676c8386f74a7e642984ea7387baacd2711c
 2021-01-08 09:22:52 +00:00
Treehugger Robot
2e6cde6b94 Merge "Fix too many receivers Exception" 2021-01-08 05:35:46 +00:00
Bryan Ferris
1b11dbe557 [automerger skipped] Merge "RESTRICT AUTOMERGE Update String" into pi-dev am: 8a79a4314d -s ours am: 12033fe425 am: f5477b05d9 -s ours am: 857f330841 am: 421dce1928 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276368

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc4696861836d97e73a376f20280a16cc6f236ca
 2021-01-08 04:16:46 +00:00
Bryan Ferris
421dce1928 [automerger skipped] Merge "RESTRICT AUTOMERGE Update String" into pi-dev am: 8a79a4314d -s ours am: 12033fe425 am: f5477b05d9 -s ours am: 857f330841 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276368

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1b1f1188958d52b025bd67bc27c847725b38598f
 2021-01-08 03:53:39 +00:00
Bryan Ferris
857f330841 [automerger skipped] Merge "RESTRICT AUTOMERGE Update String" into pi-dev am: 8a79a4314d -s ours am: 12033fe425 am: f5477b05d9 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I41680fe10178c008dbf5a173f8c73892cb49422d
 2021-01-08 03:17:10 +00:00
Bryan Ferris
f5477b05d9 [automerger skipped] Merge "RESTRICT AUTOMERGE Update String" into pi-dev am: 8a79a4314d -s ours am: 12033fe425 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276368

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie1e8ff34d2a4976e89d5cbe03db797156dc764e5
 2021-01-08 02:56:12 +00:00
Bryan Ferris
12033fe425 [automerger skipped] Merge "RESTRICT AUTOMERGE Update String" into pi-dev am: 8a79a4314d -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23717e289650bb8996db1e51e601b78515cdd81b
 2021-01-08 02:12:14 +00:00
Bryan Ferris
8a79a4314d Merge "RESTRICT AUTOMERGE Update String" into pi-dev 2021-01-08 01:35:51 +00:00
TreeHugger Robot
8c2cbae90a Merge changes Ib9a3c4fa,Idc6ef558 into qt-dev am: c0cd669bef am: af29a157db am: 0b9260031d am: b9faf1cd4a am: 072b5f4bda 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I43d14c1a953f1ae7183acfddd88bf0384f5637f5
 2021-01-07 18:31:47 +00:00