Hugh Chen
208e32af9f
RESTRICT AUTOMERGE Fix bluetooth settings will broadcast to anywhere when some cases
...
BluetoothPermissionActivity and DevicePickerFragment will send
broadcast to return the result to calling apps. As this broadcast
intent is from Settings with uid 1000, it will be sent to any
protected BroadcastReceivers in the device. It can make an attacker
send broadcast to protected BroadcastReceivers like factory reset intent
(android/com.android.server.MasterClearReceiver) via
BluetoothPermissionActivity or DevicePickerFragment.
This CL will not allow to set package name and class name to avoid
the attacker.
Bug: 179386960
Bug: 179386068
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify factory reset not started and no system UI notification.
Change-Id: Id27a78091ab578077853b8fbb97a4422cff0a158
(cherry picked from commit 8adedc6249 )
2021-04-26 03:42:48 +00:00
TreeHugger Robot
5619486876
Merge "Fix unable to change language" into sc-dev am: 4cc4b47adf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14292671
Change-Id: I05058a4bea3682405236959a7bb60cedfbd1856c
2021-04-26 03:28:49 +00:00
TreeHugger Robot
81850c1a7a
Merge "Fix unable to change language" into sc-dev am: 4cc4b47adf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14292671
Change-Id: I2abb035fc3b86649772562072487d996e9cb09e0
2021-04-26 03:27:04 +00:00
Hugh Chen
e21d06f6ee
RESTRICT AUTOMERGE Fix bluetooth settings will broadcast to anywhere when some cases
...
BluetoothPermissionActivity and DevicePickerFragment will send
broadcast to return the result to calling apps. As this broadcast
intent is from Settings with uid 1000, it will be sent to any
protected BroadcastReceivers in the device. It can make an attacker
send broadcast to protected BroadcastReceivers like factory reset intent
(android/com.android.server.MasterClearReceiver) via
BluetoothPermissionActivity or DevicePickerFragment.
This CL will not allow to set package name and class name to avoid
the attacker.
Bug: 179386960
Bug: 179386068
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify factory reset not started and no system UI notification.
Change-Id: Id27a78091ab578077853b8fbb97a4422cff0a158
(cherry picked from commit 8adedc6249 )
2021-04-26 03:12:21 +00:00
TreeHugger Robot
4cc4b47adf
Merge "Fix unable to change language" into sc-dev
2021-04-26 03:11:34 +00:00
Peter_Liang
5c05e0f160
Fix the GAR issue of TalkBack said "double-tap to activate" on the
...
slider title of Accessibility button page.
Root cause:
Set "android:selectable" as true.
Solution:
Remove "android:selectable".
Bug: 183469419
Test: manual test
Change-Id: I337cfe0795205dec5e4654b90d6c7e2c7fd7ca77
2021-04-26 09:32:41 +08:00
Joshua Mccloskey
a5ba299ab7
Merge "Updated settings for new get/set feature change" into sc-dev am: 5487f2fa6c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14202131
Change-Id: I59b0e7aac88f85382ef8513a53a356f265b17fd0
2021-04-25 23:34:39 +00:00
Joshua Mccloskey
ecdce82c6f
Merge "Updated settings for new get/set feature change" into sc-dev am: 5487f2fa6c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14202131
Change-Id: Ia1eb05aabe80e2617c6854a18852423ee3ecfaf2
2021-04-25 23:29:19 +00:00
Joshua Mccloskey
5487f2fa6c
Merge "Updated settings for new get/set feature change" into sc-dev
2021-04-25 23:20:35 +00:00
ykhung
3a6bdd5c11
Fix incorrect battery history merging logic to cause data losing am: 5e578ddd13
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299195
Change-Id: Ia57002ef0ff4f085f89271eb7bf65b5e53199ff9
2021-04-25 11:25:20 +00:00
ykhung
3fa5df6ec7
Refresh category title by different time slot condition am: 41fd8a7494
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299187
Change-Id: Ic548683719cf72a5a9ad168f6f4b8b610bd83784
2021-04-25 11:25:19 +00:00
ykhung
f64775502a
Fix incorrect battery history merging logic to cause data losing am: 5e578ddd13
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299195
Change-Id: I746e0ef1f7330d78f001c1b1ce92beac5464597b
2021-04-25 11:23:33 +00:00
ykhung
1d54252b9f
Refresh category title by different time slot condition am: 41fd8a7494
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299187
Change-Id: I394b045149277fff4bf4712849ef300a50c99b7d
2021-04-25 11:23:31 +00:00
ykhung
75c5fc5906
Wrap and carry clicked slot information data for restriction page
...
Refresh category title by different time slot condition
Bug: 177406865
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I006f6825fdb471f863c0355c65bfc4ca9d980191
2021-04-25 11:05:03 +00:00
ykhung
5e578ddd13
Fix incorrect battery history merging logic to cause data losing
...
Bug: 184807417
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Ic26799f4d95b9f990e873ee26a42d6cc0c404659
2021-04-25 08:35:55 +00:00
ykhung
41fd8a7494
Refresh category title by different time slot condition
...
Bug: 177406865
Bug: 185187729
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Ib124e1cfb9549f838540ff547bc616049f65180d
2021-04-25 07:47:31 +00:00
Eugene Susla
7dc2624b51
Companion Device App showing in Settings
...
Added a feature that users are able to see/remove the apps' associations
in Settings/Connected devices.
It will display the icon of the associations app, app's name and a button
that users are able to remove the associations. Also it will pop up a
dialog alerting user before remove the associations.
Screenshot:
https://screenshot.googleplex.com/APSRhW2retYmAAK
Bug: 165951651
Test: Manually Test
Change-Id: Iccaeaf516e8a78d4ef33415c1c2d7379139ec88c
2021-04-24 21:31:25 +00:00
Santos Cordon
f7b6e27c94
Merge "Use new getBrighntessInfo() API for brightness" into sc-dev am: 219dabcabf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14076526
Change-Id: Ia12243c9edbe07502d3948a6f51c45e64a320446
2021-04-24 16:01:09 +00:00
Santos Cordon
b7d64ed7e7
Merge "Use new getBrighntessInfo() API for brightness" into sc-dev am: 219dabcabf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14076526
Change-Id: I0541a077707c635124bd89211f154234cad81c84
2021-04-24 15:59:26 +00:00
Santos Cordon
219dabcabf
Merge "Use new getBrighntessInfo() API for brightness" into sc-dev
2021-04-24 15:38:20 +00:00
YUKAI HUNG
34f4df5a48
Merge "Add test cases for utcToLocalTime in the ConvertUtils" into sc-dev am: 230c3f2de0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14296275
Change-Id: Ie55a76e212c3dc33d8c82c5d2cb62496784cd418
2021-04-24 13:17:14 +00:00
YUKAI HUNG
ab4e189c58
Merge "Add test cases for utcToLocalTime in the ConvertUtils" into sc-dev am: 230c3f2de0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14296275
Change-Id: Ice2a60064723c72f6203a9fb06edc0fcd58192e2
2021-04-24 13:15:33 +00:00
YUKAI HUNG
230c3f2de0
Merge "Add test cases for utcToLocalTime in the ConvertUtils" into sc-dev
2021-04-24 13:03:08 +00:00
Timi
06af9f9005
Device picker: add title to fix offset in progressbar
...
* Add a title to device picker fragment in order to
move the progressbar to the correct place
Test: make Settings, share a file via Bluetooth,
verify progressbar is properly placed
Change-Id: I2fcf293ed2d70d123d65cf76051a6d7d745a773b
Signed-off-by: Timi Rautamäki <timi.rautamaki@gmail.com >
2021-04-24 08:43:41 +00:00
ykhung
ef6cea8c84
Add test cases for utcToLocalTime in the ConvertUtils
...
Bug: 177406865
Bug: 185187729
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I22bda2db821e69c40202db692ada52e96af25e16
2021-04-24 13:41:45 +08:00
Julia Reynolds
c74fcc9f52
Merge "Move preference loading to a background thread" into sc-dev am: 9d77efb7e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14297890
Change-Id: I8d4d02f6769de4de84d7a46781f7b0dca91f804d
2021-04-24 00:55:22 +00:00
Julia Reynolds
6847795ce6
Merge "Move preference loading to a background thread" into sc-dev am: 9d77efb7e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14297890
Change-Id: I95ff44498dd066c991dad2e152a5a764b5f3ef50
2021-04-24 00:53:28 +00:00
Julia Reynolds
9d77efb7e7
Merge "Move preference loading to a background thread" into sc-dev
2021-04-24 00:34:26 +00:00
Dmitri Plotnikov
a485d8dfd5
Replace TIME_COMPONENT_... constants with POWER_COMPONENT_ constants
...
Bug: 186006876
Test: make RunSettingsRoboTests
Change-Id: I873fa5a492dfcddbb65004c30764d1bf8911f78f
2021-04-23 14:27:37 -07:00
TreeHugger Robot
8dc93befa6
Merge "Do not auth in settings if UDFPS" into sc-dev am: 8eec01fc17
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14282593
Change-Id: I670eeadb081514dc41bc8923ab60667cd28dab34
2021-04-23 20:31:22 +00:00
TreeHugger Robot
c5afdce49d
Merge "Do not auth in settings if UDFPS" into sc-dev am: 8eec01fc17
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14282593
Change-Id: I1189e3aff61536dd014bce38dca21c4ba9b72959
2021-04-23 20:29:27 +00:00
TreeHugger Robot
8eec01fc17
Merge "Do not auth in settings if UDFPS" into sc-dev
2021-04-23 20:12:46 +00:00
Julia Reynolds
aee53bc98d
Move preference loading to a background thread
...
To improve the loading time of the Notifications screen. Also introduce
placeholder preferences to minimize jank when the data becomes available
Test: Robotests, adb shell am start -W -a android.settings.NOTIFICATION_SETTINGS
Fixes: 185877371
Change-Id: Id63469fdb42e1a66468f2c5f1da8c366686f06e4
2021-04-23 19:48:02 +00:00
Chloris Kuo
4a1526263f
Merge "NAS setting onboarding string change" into sc-dev am: b0ab98b92d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14268599
Change-Id: Ibaca3e55dd95b9b33e4bfcc9bef19814318f6a7c
2021-04-23 19:38:04 +00:00
Chloris Kuo
99ed186650
Merge "NAS setting onboarding string change" into sc-dev am: b0ab98b92d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14268599
Change-Id: I72c3d19cb78e2e0507dc732ec5cd5c953a80b876
2021-04-23 19:33:28 +00:00
Chloris Kuo
b0ab98b92d
Merge "NAS setting onboarding string change" into sc-dev
2021-04-23 19:17:36 +00:00
Adam Bookatz
f493bf0cdb
UserDetailsSettings uses Guest string, not Guest name
...
The UserDetailsSettings panel, and its title, show the user's UserInfo.name.
This is correct for a regular user (and for the Owner). But for a Guest user,
this is incorrect, and the user_guest string should be used instead.
The difference occurs if the system language is changed after the guest is created;
the word 'guest' should update to the current language, not be frozen to the
language at the time of the guest's creation.
Bug: 185309160
Test: atest UserDetailsSettingsTest
Change-Id: I545aa3e6cc5d00c0bcc49960f37dddd9334b153b
2021-04-23 10:39:27 -07:00
TreeHugger Robot
1861ec1bd7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 75de88c1d6 -s ours am: be34fd7ec5 -s ours am: 9f5f9bc960 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14295547
Change-Id: Iebfe764f561a7394b8521b150e16746e3b402e34
2021-04-23 17:29:51 +00:00
Bill Yi
6df96fb9e0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7201890895 -s ours am: b63c84d427 -s ours am: 4e9da6061d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14295546
Change-Id: I4ac484b450a48ca6617b5fdb8dcd418bbce5ec94
2021-04-23 17:29:47 +00:00
TreeHugger Robot
099e91276c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f7682416b6 -s ours am: bed3b3f0d6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14294924
Change-Id: Iadd663cf86a84e45bdd98a5e29a90ecad714ffa6
2021-04-23 17:29:39 +00:00
Bill Yi
b1e98782ec
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 700eca8b5f -s ours am: d7726af0d1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14295545
Change-Id: I8933f9fc78f71be325b1f2a02ea6db601c73a2ea
2021-04-23 17:29:08 +00:00
TreeHugger Robot
ace841e0a2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 75de88c1d6 -s ours am: be34fd7ec5 -s ours am: 9f5f9bc960 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14295547
Change-Id: Ia8b6cc22ee9824aca763061a6b2f680805ce521c
2021-04-23 17:28:21 +00:00
Bill Yi
d9ff7d4813
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7201890895 -s ours am: b63c84d427 -s ours am: 4e9da6061d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14295546
Change-Id: I8c0f829bf6325e6a4a66698dbde564c42dc8b2ff
2021-04-23 17:27:59 +00:00
TreeHugger Robot
e7c67bafc4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f7682416b6 -s ours am: bed3b3f0d6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14294924
Change-Id: Id7d7d66f8e0e46e7d251bb7b7de98bff7e4cb647
2021-04-23 17:27:41 +00:00
Bill Yi
472cfd26b7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 700eca8b5f -s ours am: d7726af0d1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14295545
Change-Id: I7dbd5ab0244c08c7fc48f961303aa2fac0eb84b1
2021-04-23 17:27:10 +00:00
TreeHugger Robot
9f5f9bc960
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 75de88c1d6 -s ours am: be34fd7ec5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14295547
Change-Id: I626e49c4ddce9a2410b4e7f2f4a89df47e341819
2021-04-23 17:19:14 +00:00
Bill Yi
4e9da6061d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7201890895 -s ours am: b63c84d427 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14295546
Change-Id: I9db0d41fb1d64fdfcba7b172f7ea6fd039cfa2cb
2021-04-23 17:18:15 +00:00
TreeHugger Robot
bed3b3f0d6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f7682416b6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14294924
Change-Id: Id7417778176b4fe4fcecb558ea94a4f5fd0026da
2021-04-23 17:07:55 +00:00
Bill Yi
d7726af0d1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 700eca8b5f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14295545
Change-Id: I3092aed10393846f2becc03c781ad2ad48102142
2021-04-23 17:07:07 +00:00
TreeHugger Robot
13cae1a933
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f92d565f22 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14295608
Change-Id: I7379fe1e1eab5e6d79ca0ec1e767c812cad10dd5
2021-04-23 16:57:14 +00:00