Commit Graph

60048 Commits

Author SHA1 Message Date
Automerger Merge Worker
900b87d0c5 Revert "DO NOT MERGE - Track framework changes to crashApplicati..." am: 12ed043fdb
Change-Id: I7c09136d531f7a09c945c50c99200448f6757a82
2020-03-06 04:26:23 +00: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
Chris Tate
ab78a5cd9c Revert "DO NOT MERGE - Track framework changes to crashApplicati..."
Revert "[automerger skipped] Merge "DO NOT MERGE - Add test of f..."

Revert submission 10557201-am-f98a6c51a74d42d6bc57f980bd694e3e

Reason for revert: Should not have been automerged from qt-dev; the whole topic should have been skipped.

Reverted Changes:
I01c0b570b:[automerger skipped] Merge "DO NOT MERGE - Add tes...
I7451c89d1:DO NOT MERGE - Track framework changes to crashApp...
Iec866858c:DO NOT MERGE - Track framework changes to crashApp...
I200606752:[automerger skipped] Merge "DO NOT MERGE - Kill ap...

Change-Id: I4099413042f3f275f75695d661c401baad85ebc1
2020-03-06 03:35:09 +00: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
20110a9a95 DO NOT MERGE - Track framework changes to crashApplication API am: 4a89abe279 am: 86ce68877f
Change-Id: Iec866858c5b18ff5bfc1d8a2151a4c2780d82386
2020-03-06 01:43:35 +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
cd8fc3550b Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 7d35be74cb am: 3dfc9bc59f
Change-Id: Iff7a718249f46373b0ff46b2731bf6b9ac405029
2020-03-06 00:27:25 +00:00
Automerger Merge Worker
4b0b20986c Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 09be9fbb17 am: 567f83adbe
Change-Id: Id3d1ed3b88c3d74f02d75bfa04a8dcb18892ced1
2020-03-06 00:26:49 +00: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
Automerger Merge Worker
ef5570fd64 Merge "Use contrasted color icons" into rvc-dev am: 64fff70aa5
Change-Id: I99c8ee2ce6a6cb2a33ba9566bc2429183e6ed44d
2020-03-05 17:05:04 +00:00
Julia Reynolds
64fff70aa5 Merge "Use contrasted color icons" into rvc-dev 2020-03-05 17:02:15 +00:00
Automerger Merge Worker
ece27868c4 PreferredNetworkModePreferenceController's summary no 5G item am: 8598dccce1
Change-Id: Idaa3569dbc41841a59103fd77c6d56895d89a102
2020-03-05 17:00:34 +00:00
menghanli
fd5143751e Update edit shortcut dialog measurements and assets.
Bug: 148837311
Test: Manual test
Change-Id: I0c018f3f39e43657cbbd45734846213c9964a268
2020-03-05 22:32:33 +08:00
SongFerngWang
8598dccce1 PreferredNetworkModePreferenceController's summary no 5G item
Bug: 150839189
Test: Summary show 5G items
Change-Id: I5fa42e48b8c073b4c4933b32417c2cbeada09a40
2020-03-05 14:08:53 +00:00
jasonwshsu
0259f84c5f Align help resource usage in caption preferences.
* Add string to get the help page intent

Bug: 149887377
Test: manual test
Change-Id: I15b9c4edd260153aa929d68845faed0af16a4ffa
2020-03-05 21:02:47 +08:00
Automerger Merge Worker
b7fedbde23 String change on Storage page am: b7a3c9a8c6
Change-Id: Ib41098cad76e8f35cb96c1297a44286ec206683c
2020-03-05 11:45:30 +00:00
Arc Wang
ac5e1acfba [Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled
In the current Settings framework onSwitchToggled has been implemented
to monitor the change in Settings done by user but its getting called
even when Settings is changed using setChecked where under certain
condition like rotation during config changed,
Tether Settings is disabled and then enabled and later before Rotation
Settings remained false due to stop Tethering with Tether Enabled
After Rotation when settings is initialized it is set as disabled
and even after receiving the Tether Enabled it remains Off.
Hence used onClick to monitor user ON/OFF Settings

Bug: 142625203
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherSwitchBarControllerTest.java
Test: Manual
1. Go to Wifi Hotspot Settings
2. Turn ON
3. Change SSID and save
4. Rotate screen soon after saving
Result: Hotspot does not turn ON, remains in OFF state.
Signed-off-by:JeiFeng Lee <linger.lee@mediatek.com>

Change-Id: Ibddacdf35eb3196f40cdb2c240efa902f9123646
2020-03-05 18:21:39 +08:00
Tsung-Mao Fang
b7a3c9a8c6 String change on Storage page
The string of the CTA under "Settings > Storage" from "Free up space" to
"Manage storage" to match the new ux flow.

Test: visual
Fix: 150782402
Change-Id: Ic636d73b92f11f6f332475d591ff92633083bc85
2020-03-05 08:45:03 +00:00
Automerger Merge Worker
087e60ca06 Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into rvc-dev am: e8f1c6c814
Change-Id: I650985673b4c7401f5da545f8175f9baddb5f864
2020-03-05 08:08:41 +00:00
TreeHugger Robot
e8f1c6c814 Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into rvc-dev 2020-03-05 07:53:51 +00:00
Automerger Merge Worker
15d36aeddc Merge "Add package name when launching output switcher from remote slice" into rvc-dev am: 5578920e4c
Change-Id: I558b9d04bab94d072ff325937966f8dfb813465e
2020-03-05 05:58:56 +00:00
Tim Peng
c88dc498e8 Add getSessionName() API for group name in worker
Bug: 150827723
Test: make -j50 RunSettingsRoboTests
Change-Id: Id09cb61b8ce23520761252fbb8ffbe3e323adf8e
2020-03-05 13:49:04 +08:00
tim peng
5578920e4c Merge "Add package name when launching output switcher from remote slice" into rvc-dev 2020-03-05 05:45:44 +00:00
Tsung-Mao Fang
2fc9fed89c 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-05 05:38:55 +00:00
Automerger Merge Worker
4a4ee98a19 Merge "Update SharedPreference values based on tethering state" into rvc-dev am: 042aa85b50
Change-Id: I50df00daa2471adc120a9934febc4554a3608bde
2020-03-05 03:15:33 +00:00
Automerger Merge Worker
35014d26ed Merge "Remove the unnecessary dependent on WifiTrackerLib." into rvc-dev am: d9f611fe6b
Change-Id: I4f9570ea05ef71ae565fc1950c766f3d7bd8b618
2020-03-05 03:15:14 +00:00
Zhen Zhang
042aa85b50 Merge "Update SharedPreference values based on tethering state" into rvc-dev 2020-03-05 02:58:24 +00:00
TreeHugger Robot
d9f611fe6b Merge "Remove the unnecessary dependent on WifiTrackerLib." into rvc-dev 2020-03-05 02:57:24 +00:00
changbetty
081414e84d [Telephony Setting] Enable the Settings test case
Bug: 147464840
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AirplaneModePreferenceControllerTest
      make RunSettingsRoboTests ROBOTEST_FILTER=MobileNetworkPreferenceControllerTest

Change-Id: I192385b1d847323d18ebc621f29ccc65cd7473d8
2020-03-05 10:21:54 +08:00
Steven Liu
cc6eb5c0f7 Remove the unnecessary dependent on WifiTrackerLib.
Bug: 150467119
Test: build
Change-Id: I947d4ee2f88aadc2d8b2002a2c5b04f60c4d853b
2020-03-04 14:51:27 -08:00
Automerger Merge Worker
c49ada9182 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: b79218f56d -s ours
am skip reason: subject contains skip directive

Change-Id: Ibd939d46e2bcc31623f69049c6a06015e39c137a
2020-03-04 21:13:02 +00:00
TreeHugger Robot
b79218f56d Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-03-04 20:59:22 +00:00
Automerger Merge Worker
306d47bca5 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 3779025590 -s ours am: e0bc29df11 -s ours
am skip reason: subject contains skip directive

Change-Id: I5977827c3ebecc7f3055d491922d875f6f8a88a3
2020-03-04 19:53:34 +00:00
Automerger Merge Worker
e0bc29df11 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 3779025590 -s ours
am skip reason: subject contains skip directive

Change-Id: I98d470799b1ddddd9cc497d4f3729f2d04fd613c
2020-03-04 19:40:30 +00:00
Automerger Merge Worker
b9cbd0368e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 3779025590 -s ours
am skip reason: subject contains skip directive

Change-Id: I9107eb36235d9f4204d61869019e626149d2bf9e
2020-03-04 19:40:22 +00:00
TreeHugger Robot
3779025590 Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2020-03-04 19:24:28 +00:00
Zhen Zhang
0c02d33818 Update SharedPreference values based on tethering state
TetherEnabler need to update tethering state of each tethering
interfaces to make sure other preferences that depends on these
SharedPreferences be consistent with UI.

Bug: 148968321
Test: TetherEnablerTest; CodeInspectionTest. Manully test, built and
flashed to crosshatch device.

Change-Id: Ie0be7748adf20e6fb0ff5489795b0ca0664b6323
2020-03-04 10:59:29 -08:00
Automerger Merge Worker
12d9e009a6 Merge "Add new DialogFragment and Controller for capability discovery opt-in" into rvc-dev am: 6bdf1393f8
Change-Id: I4eed6959e7c36171a7df1a37ce9087166ba75418
2020-03-04 18:06:25 +00:00