Commit Graph

37240 Commits

Author SHA1 Message Date
Hugh Chen
9d00364da4 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 compare to calling package name with launch package name.
If they are not equal, the broadcast will not send to launch package name.

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: Ib8a5acde663e875912d300dd4912c4e9416f02f1
2021-03-12 14:56:57 +08:00
Sooraj Sasindran
7f444ead2f Merge "update isCrossSimCallingEnabledByUser name" into sc-dev am: 14a2fd6bc1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13832226

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2bcaee92a2e2c26431e9928780cda8e6d004ee25
2021-03-12 04:19:51 +00:00
Weng Su
8ce423cdd2 [Provider Model] Update Airplane mode message
- Show Airplane mode message when Airplane mode is enabled

- Show the same message whether Wi-Fi is enabled or disabled

- Screenshot:
  https://screenshot.googleplex.com/9FgqG7WWskRLZxo
  https://screenshot.googleplex.com/4g4kvnAT6aYN57s

Bug: 181858434
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I3cb5a8bc7cb4d1e8678eb6d75116effd00ac9432
2021-03-12 11:49:46 +08:00
Sooraj Sasindran
14a2fd6bc1 Merge "update isCrossSimCallingEnabledByUser name" into sc-dev 2021-03-11 23:55:50 +00:00
TreeHugger Robot
1f657a95ae Merge "Fallback to AOSP eSOS settings page if OEM impl fails" into sc-dev am: 9086ed36a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13828690

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3636c58d85d3df9945418203333f62ec20ced928
2021-03-11 23:14:48 +00:00
TreeHugger Robot
9086ed36a8 Merge "Fallback to AOSP eSOS settings page if OEM impl fails" into sc-dev 2021-03-11 22:37:50 +00:00
Fan Zhang
9fdceaea78 Fallback to AOSP eSOS settings page if OEM impl fails
When OEM eSOS implementation fails for any reason (app disabled,
misconfigured, etc), Emergency SOS settings should fallack to the
default settings page (rather than hiding the setting entirely)

Bug: 180959553
Test: robotests
Change-Id: I31c08449eff3f01d4c33bf827023f17beade93c2
2021-03-11 20:30:55 +00:00
Almaz Mingaleev
a29a6ceab4 Fix imports in LocationTimeZoneDetectionPreferenceController.
Capabilities are extracted to separate class to reuse them
in time API.

Bug: 172891783
Test: m -j30 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.datetime.LocationTimeZoneDetectionPreferenceControllerTest"
Change-Id: If7351c4f022c69262ddffd26efacd449dc7238c5
2021-03-11 17:58:26 +00:00
Sally Yuen
c2025d7180 Merge "Add seekBar properties 'tickMark' to LabeledSeekBarPreference" into sc-dev 2021-03-11 17:41:42 +00:00
Almaz Mingaleev
5238602615 Merge "Move GeoTZ toggle to Date&Time settings screen." into sc-dev am: 4a3ff95367
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13816452

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia67d2fba5b231a7508158c61df75cae77717b4ab
2021-03-11 14:22:19 +00:00
Almaz Mingaleev
4a3ff95367 Merge "Move GeoTZ toggle to Date&Time settings screen." into sc-dev 2021-03-11 14:04:01 +00:00
Andras Kloczl
0e9cbfc86e Prevent using invalid result uri during multi user image change am: 07e414017c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815798

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I98dd17745edd2e700169959537e640a33b81e07b
2021-03-11 10:24:24 +00:00
András Klöczl
f1125282f9 Merge "Prevent using invalid result uri during multi user image change" into pi-dev 2021-03-11 09:48:07 +00:00
Wesley Wang
54b58b9a97 Merge "Update UsageProgressBarPref icon when device is charging or low battery" into sc-dev am: 1d5d101aa6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13805543

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id96b38dce8a4dc895bbd2263df16c17294bf0fa4
2021-03-11 08:07:53 +00:00
Arc Wang
c57f2917bd Merge "Hide non-system overlay window on ActivityPicker" into sc-dev am: 3d1658e93d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13824398

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ief0358d51ddbace52059bbe3f8860fcac6ef1629
2021-03-11 08:07:40 +00:00
Wesley Wang
1d5d101aa6 Merge "Update UsageProgressBarPref icon when device is charging or low battery" into sc-dev 2021-03-11 07:53:12 +00:00
Arc Wang
aef628646a Hide non-system overlay window on ActivityPicker
To improve security.

Bug: 181962311
Test: manual
      Show an AlertDialog and observe if it will hide after below command.
      adb shell am start -a android.intent.action.PICK_ACTIVITY -n com.android.settings/.ActivityPicker
Change-Id: I6e2845cc19dc012cba2933318a067bbb8db90a23
(cherry picked from commit 3b4853e109)
2021-03-11 07:49:02 +00:00
Arc Wang
2445ba01cd Hide non-system overlay window on ActivityPicker
To improve security.

Bug: 181962311
Test: manual
      Show an AlertDialog and observe if it will hide after below command.
      adb shell am start -a android.intent.action.PICK_ACTIVITY -n com.android.settings/.ActivityPicker
Change-Id: I6e2845cc19dc012cba2933318a067bbb8db90a23
(cherry picked from commit 3b4853e109)
2021-03-11 07:48:38 +00:00
Arc Wang
855b1f428d Hide non-system overlay window on ActivityPicker
To improve security.

Bug: 181962311
Test: manual
      Show an AlertDialog and observe if it will hide after below command.
      adb shell am start -a android.intent.action.PICK_ACTIVITY -n com.android.settings/.ActivityPicker
Change-Id: I6e2845cc19dc012cba2933318a067bbb8db90a23
(cherry picked from commit 3b4853e109)
2021-03-11 07:47:37 +00:00
Arc Wang
3d1658e93d Merge "Hide non-system overlay window on ActivityPicker" into sc-dev 2021-03-11 07:45:43 +00:00
TreeHugger Robot
921567214d Merge "Use title area for enrollment error messages" into sc-dev am: 53d7495162
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13824391

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id960686ac67fad4be87622d6ad81bf745bd42a62
2021-03-11 06:44:26 +00:00
Wesley.CW Wang
e940dcb448 Update UsageProgressBarPref icon when device is charging or low battery
- Add new icon for battery low state
 - Update UsageProgressBarPref icon when charging or low battery
 Screenshots:
   https://screenshot.googleplex.com/9HBvV6t6dVsG8eD.png
   https://screenshot.googleplex.com/6TsRu6BTN338FvT.png
   https://screenshot.googleplex.com/nGE29cfsmgKuuaP.png
   https://screenshot.googleplex.com/85NWXSg2PevXAsy.png

Bug: 179237746
Test: make RunSettingsRoboTests -j40
Change-Id: I057874bbf45594c90466cf346b054bf033815dac
2021-03-11 06:32:20 +00:00
TreeHugger Robot
53d7495162 Merge "Use title area for enrollment error messages" into sc-dev 2021-03-11 06:16:42 +00:00
Yi Jiang
5531480a80 Merge "Fixes UI style issues in Screen Timeout setting" into sc-dev am: 5c11109ffc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13828187

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If656cd60942d21319e1f49044285141bdfb5643f
2021-03-11 05:14:04 +00:00
Yi Jiang
5c11109ffc Merge "Fixes UI style issues in Screen Timeout setting" into sc-dev 2021-03-11 04:48:04 +00:00
Arc Wang
3b4853e109 Hide non-system overlay window on ActivityPicker
To improve security.

Bug: 181962311
Test: manual
      Show an AlertDialog and observe if it will hide after below command.
      adb shell am start -a android.intent.action.PICK_ACTIVITY -n com.android.settings/.ActivityPicker
Change-Id: I6e2845cc19dc012cba2933318a067bbb8db90a23
2021-03-11 12:10:18 +08:00
Treehugger Robot
c96d4d9328 Merge "Update src/com/android/settings/inputmethod/OWNERS" am: e9dff191b0 am: dac69ccd8f am: eda1be644f am: 2817c677b1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624591

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I91223c2147f0ea173fe4bb8675d692fba0f80615
2021-03-11 03:59:54 +00:00
Treehugger Robot
2817c677b1 Merge "Update src/com/android/settings/inputmethod/OWNERS" am: e9dff191b0 am: dac69ccd8f am: eda1be644f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624591

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I755a0f00c44dfd39b84e4f843a1553de2e8850a2
2021-03-11 03:23:22 +00:00
Treehugger Robot
eda1be644f Merge "Update src/com/android/settings/inputmethod/OWNERS" am: e9dff191b0 am: dac69ccd8f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624591

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I80ebc15814491a28b3da23b6554b81022ab49db3
2021-03-11 02:41:39 +00:00
Kevin Chyn
4ff118db02 Merge changes from topics "fp-revokeChallenge", "new-revokeChallenge" into sc-dev am: 13b05b6fb8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13820985

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id6343bd4f0c9cfcb3d76cb11ed627f8ec54680ab
2021-03-11 02:00:45 +00:00
Kevin Chyn
26e7d7d23a Update revokeChallenge together with frameworks/base am: e91e39b604
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13818078

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I76939100b1559b07ef29c58e7e348296f246bbc0
2021-03-11 02:00:43 +00:00
Abel Tesfaye
70c11a7047 Update auto-rotate UI to comply with guidelines
Bug: 182411771

Test: locally with flame
Change-Id: Id94ae379dcf2590460b9cbbdf7a292290666796d
2021-03-11 01:52:18 +00:00
Kevin Chyn
13b05b6fb8 Merge changes from topics "fp-revokeChallenge", "new-revokeChallenge" into sc-dev
* changes:
  Update fingerprint revokeChallenge with frameworks/base
  Update revokeChallenge together with frameworks/base
2021-03-11 01:14:15 +00:00
Sooraj Sasindran
1ce8eb765a update isCrossSimCallingEnabledByUser name
update isCrossSimCallingEnabledByUser name to
isCrossSimCallingEnabled

Bug: 179143945
Test: build
Change-Id: I8bb0196cc04dc437ed709548ecd569c4dd7828a1
2021-03-10 16:43:49 -08:00
Andras Kloczl
9c0024f455 Prevent using invalid result uri during multi user image change
Test: manual
Bug: 172939189
Change-Id: I258c305f825da94474c8027828e3b9707b463699
Merged-In: I258c305f825da94474c8027828e3b9707b463699
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2021-03-11 00:16:03 +00:00
Andras Kloczl
e0f8214e80 Prevent using invalid result uri during multi user image change
Test: manual
Bug: 172939189
Change-Id: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2021-03-11 00:15:46 +00:00
Andras Kloczl
798bdd90b0 Prevent using invalid result uri during multi user image change
Test: manual
Bug: 172939189
Change-Id: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2021-03-11 00:15:27 +00:00
Andras Kloczl
e36357b20c Prevent using invalid result uri during multi user image change
Test: manual
Bug: 172939189
Change-Id: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2021-03-11 00:14:59 +00:00
Andras Kloczl
07e414017c Prevent using invalid result uri during multi user image change
Test: manual
Bug: 172939189
Change-Id: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2021-03-11 00:13:05 +00:00
jasonwshsu
ffe8521b9f Add seekBar properties 'tickMark' to LabeledSeekBarPreference
Bug: 173940869
Test: manual
Change-Id: I135e52181bdb86ded6187a3fa30b9cffeb69d451
(cherry picked from commit 9584ba6b57)
2021-03-10 23:34:26 +00:00
Treehugger Robot
e9dff191b0 Merge "Update src/com/android/settings/inputmethod/OWNERS" 2021-03-10 23:05:57 +00:00
Yi Jiang
01f1c660a0 Fixes UI style issues in Screen Timeout setting
1. Remove help url and search icon.
2. Uses BannerMessage for permission missing notification.

Test: manual
Bug: 182297705
Change-Id: Id4dc998d7276f4c4f7593b1b0312d92097ec83cf
2021-03-10 12:58:46 -08:00
Ahaan Ugale
6819eb7a83 Merge "AF: Unit tests for PasswordsPreferenceController." into sc-dev am: e9355553ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13797113

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie7276a0f144ca9787c220efbb884a07841dda0a4
2021-03-10 20:15:17 +00:00
Ahaan Ugale
e9355553ee Merge "AF: Unit tests for PasswordsPreferenceController." into sc-dev 2021-03-10 20:08:08 +00:00
Yohei Yukawa
5878a77218 Update src/com/android/settings/inputmethod/OWNERS
Let's update this legacy OWNERS file based on the current reality.

Hopefully this would make it easier for contributers to find available
owner reviewers.

Fix: 182385491
Test: n/a
Change-Id: If47b5c0b83d561dceacc58c8fbd3643524432d62
2021-03-10 10:37:51 -08:00
Weng Su
6a0ef56917 [Provider Model] Adjust slice title and subtitle
- Show "Airplane mode" title when airplane mode is enabled

- Remove "Airplane mode is on" subtitle

- Show "Wi-Fi is turned on" subtitle when both airplane mode and Wi-Fi
is enabled

- Remove the function related to isApmNetworksAvailable()

- Screenshot:
  https://screenshot.googleplex.com/6X9nzmXRCUfw4Lp
  https://screenshot.googleplex.com/6jQryMjU2yDDpmM

Bug: 181858434
Test: manual test
atest -c InternetConnectivityPanelTest \
         InternetPreferenceControllerTest \
         InternetUpdaterTest

Change-Id: I84e5d4c60ed91d58443b27c35286a84bf72ac173
2021-03-10 22:34:35 +08:00
Mill Chen
a01f882e61 Use title area for enrollment error messages
This CL is trying to put the enrollment error messages into the title
area for UDFPS, and left the red text for the older devices with a rear
fingerprint.

Fixes: 178432748
Test: visual verified
Change-Id: Ib3a81531219dc963723ad0de99f079a230c580f5
2021-03-10 19:46:13 +08:00
Almaz Mingaleev
ab05918e08 Move GeoTZ toggle to Date&Time settings screen.
Previous sub-menu is deleted.

Toggle is always enabled and shows current configuration
setting. If MLS or auto time zone detection is off,
the toggle has not effect.

Bug: 152746236
Test: toggled and checked dumpsys time_zone_detector
Test: checked summary info on different MLS/set time zone automatically
states combinations
Test: m -j30 RunSettingsRoboTests
ROBOTEST_FILTER="com.android.settings.datetime.LocationTimeZoneDetectionPreferenceControllerTest"

Change-Id: I75ee41cfcaaf34b1b63e18809be4cd614446017d
Merged-In: I75ee41cfcaaf34b1b63e18809be4cd614446017d
2021-03-10 11:07:36 +00:00
Yanting Yang
8d6f0c36e4 Merge "Update metrics category for new app page" into sc-dev am: 16b6910b7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13806594

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ied3951c2b266c2597e53a5cc9745bba22f6d29cc
2021-03-10 09:16:33 +00:00
Yanting Yang
16b6910b7d Merge "Update metrics category for new app page" into sc-dev 2021-03-10 08:43:13 +00:00