PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59,914 Commits 1 Branch 0 Tags
40a6857244e7cc1d6a1e09d7391f6f86e63a0280
Commit Graph

59914 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad Ebinger
60204898ec Fixes ContactDiscoveryDialogFragmentTest 
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony
Fixes: 150908269
Change-Id: I06df2928116b33fec39aade733401d60e6cde1c1
 2020-03-06 20:54:00 +00:00
Automerger Merge Worker
045a1c53b0 Merge "Log errors on history load" into rvc-dev am: d27d2b375e 
Change-Id: I6d67f30948567491a777c505b18084e383d4fa4b
 2020-03-06 20:35:26 +00:00
Julia Reynolds
d27d2b375e Merge "Log errors on history load" into rvc-dev 2020-03-06 20:23:02 +00:00
Automerger Merge Worker
b2d8e01b7a [automerger skipped] Revert "DO NOT MERGE - Track framework changes to crashApplicati..." am: 12ed043fdb -s ours am: eae534cda7 
Change-Id: I4aa269491f46a80bcf05ac2afb4fc428e34ae83a
 2020-03-06 16:32:24 +00:00
Automerger Merge Worker
b329c29a04 [automerger skipped] DO NOT MERGE - Track framework changes to crashApplication API am: 4a89abe279 am: 86ce68877f -s ours am: 9a4bdcaca6 -s ours 
am skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 9efc5ab929 is in history

Change-Id: I5746e863609c14f30eaa6284463046a853e9323a
 2020-03-06 16:31:58 +00:00
Automerger Merge Worker
eae534cda7 [automerger skipped] Revert "DO NOT MERGE - Track framework changes to crashApplicati..." am: 12ed043fdb -s ours 
am skip reason: subject contains skip directive

Change-Id: Id498eb2c8fe327e3639328d488db5900174240ec
 2020-03-06 16:18:58 +00:00
Automerger Merge Worker
9a4bdcaca6 [automerger skipped] DO NOT MERGE - Track framework changes to crashApplication API am: 4a89abe279 am: 86ce68877f -s ours 
am skip reason: subject contains skip directive

Change-Id: I2ac28217bd616bc49859f09a9eab0a20e1d5d285
 2020-03-06 16:17:35 +00:00
Julia Reynolds
78b1848509 Log errors on history load 
Test: manual
Bug: 150336474
Change-Id: I10e0e5ab9d51d88b67678be0f7040c360dcbcbe4
 2020-03-06 10:05:30 -05:00
Automerger Merge Worker
1ab6e8b4fb Merge "Fix PlatformCompatDashboardTest." into rvc-dev am: f1fe93bc2f 
Change-Id: I9816aac3c87fa49554badf0710edd3a217dee6bc
 2020-03-06 14:41:27 +00:00
Anna Trostanetski
f1fe93bc2f Merge "Fix PlatformCompatDashboardTest." into rvc-dev 2020-03-06 14:38:29 +00:00
Automerger Merge Worker
ba597a6f39 Merge "Add string for output switcher transferring state" into rvc-dev am: c241e434d5 
Change-Id: I6c363e7a541aa37d77897466fac1e188be9283cc
 2020-03-06 14:23:13 +00:00
tim peng
c241e434d5 Merge "Add string for output switcher transferring state" into rvc-dev 2020-03-06 14:08:28 +00:00
Arc Wang
f5e9927668 [Wi-Fi] Implement ConnectedWifiEntryPreference to show gear icon 
click the gear icon will always switch to Wi-Fi detail screen.

Bug: 150911380
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ConnectedWifiEntryPreferenceTest
Change-Id: I640d180ae5684ffaa9b2adec7b1be401b2bfd89d
 2020-03-06 19:27:08 +08:00
Automerger Merge Worker
2bce5cdd68 Merge "Ignore some failed tests." into rvc-dev am: 2093ad6ac0 
Change-Id: I679f15c379b1ac742d9573052921f1e1080f1e65
 2020-03-06 10:25:32 +00:00
Automerger Merge Worker
3f5aa48b55 Merge "Ignore failed test cases" into rvc-dev am: 90d5d45506 
Change-Id: Ia8c7631512d6e65752bb67b630254c9975d9dacb
 2020-03-06 10:25:11 +00:00
Automerger Merge Worker
b4e56a9f35 Merge "Require authorization before turning off eSIM security feature" into rvc-dev am: f3ce231d17 
Change-Id: Ie89044a623e320ef2b790a8f89e271988de0531a
 2020-03-06 10:24:41 +00:00
Automerger Merge Worker
abbb4ee257 Merge "Update edit shortcut dialog measurements and assets." into rvc-dev am: b6ab224ddb 
Change-Id: I71aa23a4d507d3266e096cec04c22a706ba2eb0a
 2020-03-06 10:24:09 +00:00
Automerger Merge Worker
545d58d702 Merge "Add getSessionName() API for group name in worker" into rvc-dev am: 2d15cecf54 
Change-Id: I8e638569fd4567519f1b2072a3b77aeff74568a9
 2020-03-06 10:23:55 +00:00
Tsung-Mao Fang
91399607fe Fix pendingIntent in SettingsSliceProvider could be Hijacked 
A malicious app is able to obtain this pending intent.
It can then mutate all fields except for the action and
launch the intent. This can be used to launch any activity
with the ACTION_SETTINGS action.

So, we enfore assign the package name for this intent,
it only can launch the settings app.

Fix: 147355897
Test: a) Install the new settings apk, and it won't launch other screen.
(See details in bug)
b) Start the settings search, slice search results work as normal.

Change-Id: Ie954d8a4b7153d6a4cac40621f363b45185990f2
(cherry picked from commit b3c0a2a6c1)
Merged-In: Ie954d8a4b7153d6a4cac40621f363b45185990f2
 2020-03-06 18:14:03 +08:00
menghanli
5d7083a103 ShortcutPreference Toggle design (2/n) 
- Removes edit shortcut disable condition.
- Shows "off" if user removes all items in edit dialog.
- Restores last time what user chosen options when show edit dialog.

Bug: 148989269
Test: Manually test
Change-Id: I105abda782999d38c92e3de9811e2fd378869e73
 2020-03-06 18:02:53 +08:00
TreeHugger Robot
2093ad6ac0 Merge "Ignore some failed tests." into rvc-dev 2020-03-06 09:23:35 +00:00
Bonian Chen
3fef55d53b Remove reference of Phoneconstants for SUBSCRIPTION_KEY 
- use SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX instead of it

Test: make
Test: m RunSettingsRoboTests
Merged-In: Ic635b11c995077ebf1e143d9562b100d7730fe52
Change-Id: I42cbf1074af3b325ebb37281efd505954a2ca25c
 2020-03-06 09:07:24 +00:00
TreeHugger Robot
90d5d45506 Merge "Ignore failed test cases" into rvc-dev 2020-03-06 08:48:25 +00:00
Lee Chou
f3ce231d17 Merge "Require authorization before turning off eSIM security feature" into rvc-dev 2020-03-06 08:45:09 +00:00
Menghan Li
b6ab224ddb Merge "Update edit shortcut dialog measurements and assets." into rvc-dev 2020-03-06 08:01:59 +00:00
Yi-Ling Chuang
db4fd2b1c3 Ignore some failed tests. 
These test failures may relate to change of PowerManager. Ignore them
first and will have people working on the fix.

Bug: 150914017
Test: robotests
Change-Id: Id4d3bb9945a993517964376b5d52e31dd293e634
 2020-03-06 15:20:09 +08:00
tim peng
2d15cecf54 Merge "Add getSessionName() API for group name in worker" into rvc-dev 2020-03-06 06:56:30 +00:00
Tim Peng
37e8a34a40 Update failed test case 
Bug: 150909916
Test: make RunSettingsRoboTests -j42
Change-Id: I541eea02cfa553f44e6da09c993e58ef5efb1471
 2020-03-06 14:53:16 +08:00
hughchen
fbea0dc06d Ignore failed test cases 
Bug: 150909916
Test: make RunSettingsRoboTests -j42
Change-Id: Ice6c8e635a0a39c0cf86ad60e0175222cf32cf4b
 2020-03-06 14:52:22 +08:00
Automerger Merge Worker
5a886e51a6 Merge "Fix AdaptiveSleepPreferenceControllerTest." into rvc-dev am: a6760b347c 
Change-Id: Ia1711e7a5f33f967ab39cc7f43a2e102dc1dd642
 2020-03-06 06:44:51 +00:00
TreeHugger Robot
a6760b347c Merge "Fix AdaptiveSleepPreferenceControllerTest." into rvc-dev 2020-03-06 06:27:29 +00:00
Automerger Merge Worker
5585d61a51 Fix Robotests failure on accessibility ShortcutPreference am: a5936ba266 
Change-Id: Ifa92c4ff403eca485552a2cbc265c41472405e26
 2020-03-06 06:14:49 +00:00
menghanli
a5936ba266 Fix Robotests failure on accessibility ShortcutPreference 
Bug: 150906744
Bug: 150910193
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ShortcutPreferenceTest
Change-Id: I2feaad60eae3688f6452c29242affc55a80411a0
 2020-03-06 13:39:15 +08:00
Tim Peng
bd56ef94d2 Add string for output switcher transferring state 
Bug: 150903460
Test: manual
Change-Id: Iaebe013e891300f3275ff551e79e3298e55e21c4
 2020-03-06 13:14:07 +08:00
Yi-Ling Chuang
91ec8ce068 Fix AdaptiveSleepPreferenceControllerTest. 
Fixes: 150910069
Test: robotests
Change-Id: Ie8c33533747d17ec4f0571f5c7ea2de82ce7c66e
 2020-03-06 12:14:01 +08:00
Chris Tate
12ed043fdb Revert "DO NOT MERGE - Track framework changes to crashApplicati..." 
Revert submission 10556828-am-2e2e7004e4cb4ef8b776d65e9ffe33f3

Reason for revert: Should never have automerged downstream from qt-dev; the entire topic should have been skipped.
Reverted Changes:
I241d8d8da:DO NOT MERGE - Track framework changes to crashApp...
Ib1a5695f9:[automerger skipped] Merge "DO NOT MERGE - Add tes...
I3e6eb3f5c:[automerger skipped] Merge "DO NOT MERGE - Kill ap...
Ibe4652916:DO NOT MERGE - Track framework changes to crashApp...

Change-Id: Ic68e376aa93c5c22a499d87f001bd22314c3f46e
 2020-03-06 03:54:52 +00:00
SongFerngWang
000ddb3194 PreferredNetworkModePreferenceController's summary no 5G item 
Bug: 150839189
Test: Summary show 5G items
Change-Id: I5fa42e48b8c073b4c4933b32417c2cbeada09a40
Merged-In: I5fa42e48b8c073b4c4933b32417c2cbeada09a40
 2020-03-06 11:37:58 +08:00
Automerger Merge Worker
081c161005 Merge "[Telephony Setting] Enable the Settings test case" into rvc-dev am: 997a458e76 
Change-Id: Ie0b97fe0fa7d8da3ad105a44f1686bac23eba775
 2020-03-06 03:20:17 +00:00
Betty Chang
997a458e76 Merge "[Telephony Setting] Enable the Settings test case" into rvc-dev 2020-03-06 03:01:32 +00:00
Automerger Merge Worker
86ce68877f DO NOT MERGE - Track framework changes to crashApplication API am: 4a89abe279 
Change-Id: Ibe465291626661a7bcd4ad38e11ff1525fbab512
 2020-03-06 01:35:03 +00:00
Kevin Chyn
260a77f39d Update enrollment with API update 
Bug: 150499348
Fixes: 150823201

Test: Builds
Test: CtsVerifier
Change-Id: Ic02b43447d1baaaa611e265498c8790d8812a12d
 2020-03-05 16:39:39 -08:00
Automerger Merge Worker
f8d7068d84 [automerger skipped] Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 7d35be74cb am: 3dfc9bc59f -s ours 
am skip reason: subject contains skip directive

Change-Id: I36730d6958077d8f43cd1bd259f2071c898c6d8e
 2020-03-06 00:26:03 +00:00
Automerger Merge Worker
9b03774e7c [automerger skipped] Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 09be9fbb17 am: 567f83adbe -s ours 
am skip reason: subject contains skip directive

Change-Id: Ia410ff9b6c93b99dc2a3e0a162bdc32881901589
 2020-03-06 00:25:28 +00:00
Automerger Merge Worker
3dfc9bc59f Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 7d35be74cb 
Change-Id: I841a54be0ccf815e08eed0b4d769ef01e7151317
 2020-03-06 00:12:48 +00:00
Automerger Merge Worker
567f83adbe Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 09be9fbb17 
Change-Id: I02042e7d32a1daa74e624c18633ef69dace67838
 2020-03-06 00:12:13 +00:00
Zhen Zhang
1745955f35 Refresh summary when update state of preference 
TogglePreferenceController won't call refresh summary for
SwitchPreference. Need to call it explicitly in updateState to update
the subtext.

Bug: 150885013
Test: Manually test
Change-Id: I0dafd78d867fc0c66906ee9a2daa7692bb15224b
 2020-03-05 14:10:37 -08:00
Automerger Merge Worker
90a99332e7 Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" into rvc-dev am: 54edae5e54 
Change-Id: Id8ea47aadc2d443bd8ac77cca1f7fc4ba4f63eca
 2020-03-05 19:33:47 +00:00
TreeHugger Robot
54edae5e54 Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" into rvc-dev 2020-03-05 19:15:30 +00:00
Bill Yi
7d35be74cb Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" 2020-03-05 18:27:29 +00:00
Bill Yi
09be9fbb17 Merge stage-aosp-master to aosp-master - DO NOT MERGE 
Change-Id: Ic40bc7d2b6b306b5cfb0b061e5a3a6f8fe3737c9
 2020-03-05 09:51:19 -08:00