Commit Graph

34847 Commits

Author SHA1 Message Date
TreeHugger Robot
852a19b7a6 Merge "Fix phishing attacks over Bluetooth due to unclear warning message" 2020-12-17 08:46:03 +00:00
Bonian Chen
4e077caefc Merge "[Settings] Close reset network confirm dialog when SIM removed" 2020-12-17 07:31:59 +00:00
Bonian Chen
24b64276fb Merge "[Settings] code refactor - rename isSubscriptionCanBeDisplayed" 2020-12-17 07:31:24 +00:00
Hugh Chen
db9175015a Fix phishing attacks over Bluetooth due to unclear warning message
Before this CL, there is a possible phishing attack allowing a malicious
BT device to acquire permissions based on insufficient information
presented to the user in the consent dialog. This could lead to local
escalation of privilege with no additional execution privileges needed.
User interaction is needed for exploitation.

This CL add more prompts presented for users to avoid phishing attacks.

Bug: 167403112
Test: send intent to test right prompts message is pop up. make -j42 RunSettingsRoboTests
Change-Id: Idc6ef558b692115bb82ea58cf223f5919b618633
2020-12-17 11:29:31 +08:00
TreeHugger Robot
5c522ea088 Merge "Immediately finish FingerprintEnroll when no FingerprintManager" 2020-12-17 03:29:00 +00:00
tim peng
ff8ce9d88a Merge "Remove MediaOutputGroupPanel" 2020-12-17 03:18:31 +00:00
Bonian Chen
79b8ce0212 [Settings] code refactor - rename isSubscriptionCanBeDisplayed
canSubscriptionBeDisplayed is more readable.

Reasonale:
When cherry-picking ag/12886476 into Android R branch (ag/13209427), a comment from code reviewer suggested this change.
Since ag/12886476 has been merged for a while, another patch for it is perferred option when comparing with reverting that CL and resubmit it.

Bug: 175830728
Change-Id: Ie91eb82504fd7cff6671803a2bc2560139690952
Test: build pass
2020-12-17 03:04:24 +00:00
Kevin Chyn
516c3cea50 Immediately finish FingerprintEnroll when no FingerprintManager
Fixes: 161603652
Test: adb shell am start -a android.settings.FINGERPRINT_ENROLL
Change-Id: I52e2770a8870a1699dec5b20cb8c54db8991a14d
2020-12-16 16:07:58 -08:00
TreeHugger Robot
12a10a11d5 Merge "Forward gatekeeper password handle to enrollment" 2020-12-16 23:33:12 +00:00
Yi Jiang
1a5e735773 Removes TimeoutPreferenceController in Settings.
Test: unit tests
Bug: 173450342
Change-Id: I16470192fc41afe83cf601baa79fea360e8dc1d1
2020-12-16 21:30:59 +00:00
Kevin Chyn
ee1dd50e74 Forward gatekeeper password handle to enrollment
Fixes: 169629017
Test: Wipe device, go through setup flow with a managed account.
      Successfully set up credential and fingerprint

During the conversion to GkPwHandle (instead of HAT), the code in
Choose/ConfirmLock* and most of the biometric paths were updated, with
the exception of 2a below.
1) Only multi-biometric devices request Choose/ConfirmLock in
   BiometricEnrollActivity.
2) Single-biometric devices (in almost all paths) request credentials
   in their intro activities (FingerprintEnrollIntro, etc).
2a) However, there is a special path used by work profiles where
    credentials are first set up, and the GkPwHandle is passed into
    BiometricEnrollActivity, with the request to skip the fingerprint
    enroll introduction page. In this case, we must remember to
    forward the GkPwHandle to the relavent enrollment page
    (FingerprintEnrollFindSensor).

At some point in the future we should have all credential stuff
done in BiometricEnrollActivity. However, due to legacy APIs, etc,
it may be more work than it's worth right now.

Change-Id: I3f95876de6969fee7130d7a19c8db363da69c4c2
2020-12-16 12:34:44 -08:00
TreeHugger Robot
0cb322b44e Merge "a11y fix: read emergency numbers as digits, not numbers." 2020-12-16 20:04:54 +00:00
Peter Wang
5eb94b4a00 Merge "Added an option in reset menu in Settings to enable resetting Euicc data only" 2020-12-16 20:03:25 +00:00
Wilson Wu
714a9b8f8f Merge "Apply ResultCallback to isImeTraceEnabled" 2020-12-16 09:33:42 +00:00
Bonian Chen
0da056b2dd [Settings] Close reset network confirm dialog when SIM removed
When SIM removed, the network reset confirm UI no longer represents
the wordings which presented to the user.

Proceed on resetting will only reset APN on removed SIM and
lead to some side effect if user inserted a new SIM while
keeping displaying the confirmation dialog.

With this situation, close the confirmation dialog is current
decision in design. And the UI which prior to the confirm UI
also need to be updated to avoid from user accessing that
removed SIM.

Bug: 171070050
Test: manual
Change-Id: I338835ca98593f95d98bafa70f12b177c43bf91a
2020-12-16 02:35:26 +00:00
Peter Wang
ecd856eeeb Added an option in reset menu in Settings to enable resetting Euicc data
only

Bug: 159650638
Fix: 159650638
Test: Local
Change-Id: Ia260b47a4dd0ddf0363740891b5e1d818c8631b7
2020-12-15 18:27:34 -08:00
Fan Zhang
8e154d094f a11y fix: read emergency numbers as digits, not numbers.
Instead of reading as one hundred and ten, it should read as one-one-o.

Also make the number override dialog text input box a little bigger

Fix: 175517632
Fix: 175514672
Test: robotests
Change-Id: I7e3e823792f885004868ede790fc414a3fa66f01
2020-12-15 12:29:39 -08:00
tim peng
b802a1a878 Merge "Remove MediaOutputGroupSlice" 2020-12-15 07:10:03 +00:00
Wilson Wu
8279b8ee5a Apply ResultCallback to isImeTraceEnabled
With CL[1], the isImeTraceEnabled in InputMethodManager
require to use ResultCallback mechanism. Change this API
usage in DevelopmentTiles.

[1] : I1547b98b2aacf764e33aadc9ab784f2013f58f2f

Bug: 163453493
Test: make RunSettingsRoboTests ROBOTEST_FILTER="WinscopeTraceTest"
Change-Id: I767069892c713023b064525105ef2b55946b7bb8
2020-12-15 14:08:11 +08:00
Xiangyu/Malcolm Chen
aebc5db4f3 Merge "Automatically dismiss SIM combination warnings and selection dialogs." 2020-12-15 04:53:44 +00:00
timhypeng
c5a28d3ec0 Remove MediaOutputGroupPanel
Bug: 174192979
Test: build pass
Change-Id: I8023b66f24825bbe019c5d8369bb4813f5ba95f1
2020-12-15 12:25:04 +08:00
Yi Jiang
cf9e39b2f3 Merge "Grays out Screen Timeout Setting when disabled." 2020-12-15 02:59:04 +00:00
timhypeng
1602bccd9e Remove MediaOutputGroupSlice
Bug: 170558292
Test: build pass
Change-Id: I06c710a8b06c8666cb2cf5198d5b59eda7a7649a
2020-12-15 09:47:39 +08:00
Jiashen Wang
881d253247 Merge "Fix minor issue for DeleteEuiccSubscriptionDialogActivity" 2020-12-15 01:32:15 +00:00
TreeHugger Robot
92107059b1 Merge "Add a developer option to enable / disable location indicators." 2020-12-14 20:16:23 +00:00
Malcolm Chen
3ad8509b15 Automatically dismiss SIM combination warnings and selection dialogs.
When configuring CBRS profiles this dialog / notification will be
dismissed after configuration is done, to avoid confusion.

Bug: 142092510
Test: manual and unittest
Change-Id: Iaf30062f555ec2c119c4aafd6aa013e73b5253f0
2020-12-14 11:55:07 -08:00
Yi Jiang
942e598092 Merge "Adds 'options disabled by admin' icon in timeout settings." 2020-12-14 18:06:50 +00:00
Yi Jiang
aed7559a59 Adds 'options disabled by admin' icon in timeout settings.
Bug:171257091
Test: atest ScreenTimeoutSettingsTest

Change-Id: Id0411b009a2d4dc0e4f6abf2825580ca42ad8442
2020-12-14 00:31:51 -08:00
Wei Wang
edbe2cca13 Add a developer option to enable / disable location indicators.
Also bundled location related developer options into the location
category.

Bug:175357420

Test: Manual && make RunSettingsRoboTests ROBOTEST_FILTER=LocationScanningPreferenceControllerTest

Change-Id: Ic33ad6e70d258c9afc2cefba70ab6e7b2bafd16a
2020-12-13 21:33:56 -08:00
Jeremy Goldman
e092a54381 Merge "Update string for discarding changes to a particular APN's settings." 2020-12-14 04:42:09 +00:00
Jeremy Goldman
11f91e47ea Merge "Enhanced4gBasePreferenceControllerTest migrated to junit" 2020-12-14 02:58:24 +00:00
Jeremy Goldman
7a16e45290 Update string for discarding changes to a particular APN's settings.
Previously was unclear whether the changes, or the entire APN was
being discarded. The word "Cancel" more closely implies that the most
recent changes to the screen will be discarded rather than the entire
APN.

This only changes the resource for english. However, many other
languages have a menu_cancel string that seems much closer
to "Cancel" than "Discard" as well.

i.e. http://cs/android/packages/apps/Settings/res/values-zu/strings.xml?l=1029&rcl=a7397bec91183a7a32561fd8d67b0478af6c65bb
http://cs/android/packages/apps/Settings/res/values-es/strings.xml?l=1029&rcl=a7397bec91183a7a32561fd8d67b0478af6c65bb

Bug: 171538880
Test: N/A
Change-Id: I80fde04dbc36078d5c53e68231fcc4e5c3cf94e6
2020-12-14 02:57:39 +00:00
TreeHugger Robot
e1f15ccc1d Merge "Add the mutability flag to BluetoothDevicesSlice." 2020-12-14 02:47:41 +00:00
TreeHugger Robot
6571548a37 Merge "[Provider Model] Fix the NetworkDashboardFragmentTest failed issue" 2020-12-13 15:18:40 +00:00
Yi Jiang
111004958d Grays out Screen Timeout Setting when disabled.
Previously we would hide the screen timeout setting when it is disabled
by admin. Instead of hide it in Display Settings, now we gray it out and
also provide the info of the enforced admin.

Bug: 174834978
Test: manually
Change-Id: Idaa3c4512eb648b67fcf6df2996c771a2f1b9617
2020-12-11 15:53:45 -08:00
Jeremy Goldman
4348c2c826 Enhanced4gBasePreferenceControllerTest migrated to junit
Bug: 175389659
Test: atest -c Enhanced4gBasePreferenceControllerTest
Change-Id: I7ebcb303eb74168b81dd650fe78f3988647aa64d
2020-12-12 01:11:13 +08:00
Zim
abb239f4a4 Change transcoding default values
1. transcode_enabled: s/false/true/
2. transcode_default: s/false/true/

This is to maintain consistence with the MediaProvider defaults and it
only affects the 'checked' state when a user hasn't checked anything

Test: Manual
Bug: 175309276
Change-Id: Ic81490a944407e30f9cd207f64f2a0f5530a23d3
2020-12-11 15:48:21 +00:00
Zoey Chen
e05e21bfe7 Merge "[Provider Model] Should show "No SIM" if there is no SIM in the device." 2020-12-11 14:55:51 +00:00
Zoey Chen
44559badaf [Provider Model] Should show "No SIM" if there is no SIM in the device.
Bug: 172053880
Test: atest NetworkProviderCallsSmsControllerTest#getSummary_noSim_returnNoSim
Change-Id: I31fd8b4b6928ef8aa7c45ac7651fa26e0b08446e
2020-12-11 20:29:13 +08:00
Yi-Ling Chuang
32e7118161 Add the mutability flag to BluetoothDevicesSlice.
Starting Android S, all PendingIntent has to have a explicit mutability
flag set.

Fixes: 172207505
Fixes: 172811893
Test: Enable BluetoothDevicesSlice and play on it.
Play on the volume panel.

Change-Id: I618455de683d619fe300309e31864b3c64f12ad1
2020-12-11 15:32:23 +08:00
Weng Su
66869d2ff5 [Provider Model] Fix the NetworkDashboardFragmentTest failed issue
Since the getPreferenceScreenResId() is modified to return different resource ID when provider model enabled. So we need to update SEARCH_INDEX_DATA_PROVIDER class to match the same behavior.

Bug: 175290124
Test:
- Set Settings/System/Developer options/Feature
flags/settings_provider_model to true.
- atest -c NetworkDashboardFragmentTest

Change-Id: I05b0f830158429ddbbfba414cdb33a6df6a7465e
2020-12-10 13:29:49 +00:00
Manish Singh
7a418b240e Merge "Remove transcoding for apps from Settings." 2020-12-10 07:50:17 +00:00
Jiashen Wang
a0a5165c72 Fix minor issue for DeleteEuiccSubscriptionDialogActivity
Bug: 170508680
Test: Manually tested
Change-Id: I656b16f6ca568cd9f5dcbf9a0b031f1ee6f71b49
2020-12-09 23:27:04 -08:00
TreeHugger Robot
04322e2202 Merge "Add mutability flag to WifiSlice." 2020-12-10 06:37:36 +00:00
Robert Luo
ce694271f2 Merge "Migrate media output switcher metrics - 3/n" 2020-12-10 02:36:59 +00:00
TreeHugger Robot
6172a98b2b Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c am: 2117006bc6 am: cfdae774cd am: 635029b87f am: f49e9d2196 am: 423bcb4fbe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I01cfff4403d6e3499ae2608e34b9184b6358097f
2020-12-09 14:31:49 +00:00
TreeHugger Robot
f49e9d2196 Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c am: 2117006bc6 am: cfdae774cd am: 635029b87f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I36f99bfb1e5eee253bb4ce030d7000cb40c2ff63
2020-12-09 13:49:10 +00:00
Yi-Ling Chuang
49cda22b76 Add mutability flag to WifiSlice.
Starting Android S, PendeingIntent should have a explicit mutability
flag to avoid vulnerability.

Fixes: 172204181
Test: 1. adb shell am start -a
android.settings.panel.action.INTERNET_CONNECTIVITY and play on the wifi
panel.
2. Enable contextualWifiSlice and play on it.
3. Adjust volume on the volume panel.

Change-Id: I23f03cae8c481d9f5836b7fb967f734e9c99cd65
2020-12-09 21:35:15 +08:00
TreeHugger Robot
635029b87f Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c am: 2117006bc6 am: cfdae774cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad91ec439965d52c652f79ce4d6fe3b125631f79
2020-12-09 13:03:53 +00:00
TreeHugger Robot
cfdae774cd Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c am: 2117006bc6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If3605d2b4dbad8b7b4979b644c89352ee8449ba1
2020-12-09 12:17:08 +00:00