Commit Graph

26978 Commits

Author SHA1 Message Date
Stanley Wang
0b76ef19b5 Merge "Fix security issue for using mock location without permission." into qt-qpr1-dev 2020-03-27 03:09:09 +00:00
TreeHugger Robot
3c137d807d Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into qt-qpr1-dev 2020-03-20 02:51:54 +00:00
Sarah Chin
bd8bbca27c Merge "5G meteredness for telephony framework" into qt-qpr1-dev 2020-03-19 19:11:00 +00:00
Sarah Chin
20974b6814 5G meteredness for telephony framework
Add listener for SubscriptionPlans changed

Bug: 151630253
Test: atest FrameworksTelephonyTests
Change-Id: I0c8e84f74fd1f69ffc7e1046819966fcb04732a6
Merged-In: I0c8e84f74fd1f69ffc7e1046819966fcb04732a6
2020-03-17 18:47:07 +00:00
Automerger Merge Worker
19ff9101ee RESTRICT AUTOMERGE am: 077dd9b07f
Change-Id: I73f9a68326f6e6c477fc43eeb84b3349f519b658
2020-03-11 20:05:35 +00:00
Christopher Tate
36f182159f DO NOT MERGE - Track framework changes to crashApplication
Bug: 128649910
Test: manual
Test: atest OsHostTests#testForegroundServiceBadNotification
Merged-In: Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc
Change-Id: I6894e3df309669ba98ad23432aa18d6043739aad
2020-03-10 15:52:05 -07: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
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
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
Stanley Wang
0d9ad30b05 Fix security issue for using mock location without permission.
Remove mock location apps if developer option is disabled.

Bugs: 145136060
Test: manual
Change-Id: I7ecf0bdbfc49674b350cdfe81fe1a626da5ef3ca
2020-03-03 14:12:05 +08:00
Arc Wang
9e46a0bc93 [Wi-Fi] Ignore incorrect user certificates
These incorrect user certificates displayed when users
editing a Wi-Fi network of WPA3-Enterprise in 192bit.

Bug: 149763958
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigControllerTest
Change-Id: Idcbc80aa3e945f83ba6b77ebf9ef443398ef8e3c
Merged-In: Iab35ac975933abc54fda83b99a2109d53d6722d4
2020-03-02 22:28:46 +08:00
TreeHugger Robot
594a5c71f5 Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev 2020-02-28 06:04:46 +00:00
Betty Chang
efe4cc3db4 Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev 2020-02-27 06:10:25 +00:00
Mill Chen
077dd9b07f RESTRICT AUTOMERGE
Allow LockScreenPattern to be launched in the pinning screen

If work profile lock is enabled and work app is pinned, users will get a
black/white screen on the phone. That's because Settings is prevented
from other apps launch any pages of Settings in the pinning mode.

In order to launch some pages of Settings from other apps, we add a
condition to the preventive mechanism and allow the activity inherited
from SettingsBaseActivity to override the condition to have the activity
to be launched from other apps in the pinning mode.

Bug: 137015265
Bug: 135604684
Test: manual test
Change-Id: I8070de79a83350d1658efcb19e983669dad0e673
2020-02-26 13:09:55 +00:00
changbetty
288fa30c2d [Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null
Bug: 149307162
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ImeiInfoDialogControllerTest
Change-Id: I1dd83ba55b34433b2b600b8a998000347b6ae5e8
Merged-In: I011b52fd25ca9ad48be3afcdabd9bdd443cd121d
2020-02-26 18:23:31 +08:00
Raff Tsai
ef009cc832 Fix volume panel crashing
slider position is smaller than min value causes the exception.
Fixed by limit the position within min and max value.

Fixes: 148270968
Fixes: 149973990
Test: manual
Change-Id: I3d162f6d2f1035b81b1b2eb915b488084e7ea36e
(cherry picked from commit fcd9f1a870)
Merged-In: I3d162f6d2f1035b81b1b2eb915b488084e7ea36e
2020-02-24 07:04:03 +00:00
Yanting Yang
f8396c5cc0 RESTRICT AUTOMERGE
Fix NPE of launching Settings with malicious URL

Add SafetyNet logging for tracing.

Fixes: 122836081
Test: visual, robotests
Change-Id: I97430ea0208c570c46a02dd499dfd944d20eb06e
2020-02-11 16:17:08 +08:00
SongFerngWang
b5dcd35969 Bug:PreferredNetworkModePreferenceController.java not being refreshed
Bug: 146594872
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
PreferredNetworkModePreferenceControllerTest (PASS)

Change-Id: Ic3579e630c1d9422d7105a2d8fb619409a5823d6
Merged-In: Ib5cc06cdbfd2fa70cd115d70337b21500e362da6
2020-02-06 17:11:48 +08:00
Christopher Tate
4a89abe279 DO NOT MERGE - Track framework changes to crashApplication API
Bug: 128649910
Bug: 140108616
Test: manual
Test: atest OsHostTests#testForegroundServiceBadNotification
Change-Id: Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc
Merged-In: Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc
2020-02-04 17:48:06 -08:00
Arc Wang
f3848729b4 [Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS
To improve security.

Bug: 143601727
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigControllerTest
Change-Id: Idb93d5ca1eb81bdcc2bc139679f72053161e3e35
Merged-In: I0cb1ceda6d89a52224f80ea5ffd1af709a6acace
2020-02-03 11:21:30 +08:00
Sunny Shao
74ded43527 Add whitelist in ResetAppsHelper
- Add "com.android.systemui" and "com.android.vending" into the whitelist.
- Add "com.android.providers.downloads" and "android" into the whitelist.
- Do not data clear in the whitelist.

Fixes: 147124412
Test: manual test
Change-Id: Ie2f527309f9159babe79636a69ff13fe3ceb64d9
Merged-In: Ie2f527309f9159babe79636a69ff13fe3ceb64d9
(cherry picked from commit b54d2f90f2)
2020-01-30 22:19:05 +08:00
Tsung-Mao Fang
8a91fbec72 Add a RTT setting in A11y screen
- Add RTT setting in Accessibility screen.
- Create a controller for RTT setting preference.
- Create an array strings to define the subtext.

Test: Rebuild, and visual
Change-Id: I248654c822284473b8a8265de4a3938af89cdf7a
Merged-In: I248654c822284473b8a8265de4a3938af89cdf7a
Fix: 146540478
2020-01-10 07:16:25 +00:00
SongFerng Wang
f9f41df89a Merge "Phone Info UI shows network type list which depends on RAT supported" into qt-qpr1-dev 2019-12-27 18:26:49 +00:00
SongFerngWang
75c5940b7c Phone Info UI shows network type list which depends on RAT supported
Phone Info UI shows preferred network type list which depends on
device RAT supported. If device is 5G supported, UI shows 5G list.
If device is not 5G supported, UI shows LTE list.

Bug: 146504601
Test: 1.Build pass.
2. go to Phone Info UI, and set preferred network type (PASS)

Change-Id: I079d40b4ed593dd6629caf96ca8a94aaf69e9f04
Merged-In: Id32982fe3e6fbf686fafe94ecc6c8549c7a5243c
Merged-In: Id62a2bf4b2c44efcd48319734d1cab6ed969ee06
2019-12-27 07:02:39 +00:00
TreeHugger Robot
12510978c3 Merge "Add Tapjacking Protection for SettingsHomepageActivity" into qt-qpr1-dev 2019-12-20 18:11:29 +00:00
TreeHugger Robot
bc96cf54cd Merge "Update the behavior of the Dark theme slice" into qt-qpr1-dev 2019-12-20 15:23:53 +00:00
Sunny Shao
5f42f2f7a7 Update the behavior of the Dark theme slice
- Dark theme slice disappear when battery saver is ON.

Bug: 146149658
Fixes: 142476879
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=ROBOTEST_FILTER=com.android.settings.homepage.contextualcards.slices.DarkThemeSliceTest
Change-Id: I071014d7f0658db2098e353717afda905f162ecd
2019-12-20 13:25:49 +08:00
Tsung-Mao Fang
8e58e2c7a5 Remove permission bar chart in Privacy setting
- Because permission hub is already postponed,
we don't need to show this UI in privacy settings.

Test: Rebuild, visual, robotest
Change-Id: I51aca52bc605a3c6b0cafc084e8e491c280d770f
Fix: 143447873
Merged-In: I51aca52bc605a3c6b0cafc084e8e491c280d770f
(cherry picked from commit ab914adc00)
2019-12-19 16:51:58 +08:00
Sunny Shao
a74060c1b7 Add Tapjacking Protection for SettingsHomepageActivity
Add/remove the SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS flag into/from
SettingsHomepageActivity and SettingsPanelActivity with lifecycle.

Bug: 138442483
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.homepage
      make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.panel
      manual test
Change-Id: I72f9a947f57f74a8c09127d6c39173594c248ddc
Merged-In: I72f9a947f57f74a8c09127d6c39173594c248ddc
2019-12-19 02:59:10 +00:00
TreeHugger Robot
5b71fccabd Merge "[Wi-Fi] Fix transition mode problems" into qt-qpr1-dev 2019-12-18 02:27:28 +00:00
Kevin Chyn
8472279900 Merge "Add feature provider for face unlock" into qt-qpr1-dev 2019-12-17 05:27:01 +00:00
Kevin Chyn
15f241b296 Add feature provider for face unlock
Bug: 146085546

Test: Builds
Change-Id: If5c7d57c12a3f679d81cee22fb94a53fce1de29a
2019-12-16 18:19:20 -08:00
Alex Lin
58bffb7f71 Merge "[DO NOT MERGE] Add country blacklist support" into qt-qpr1-dev 2019-12-16 21:34:45 +00:00
Jay Aliomer
8b95d6ab2a Merge "Dark theme settings activity" into qt-qpr1-dev 2019-12-12 20:32:01 +00:00
Raff Tsai
2790889921 Fix Settings crash when clicks Notifications
- FaceSettingsLockscreenBypassPreferenceController's preference key
is different from that in xml. Use DashboardFragment generic way to
create PreferenceController which bind the preference key defined in
xml.
- Also refine the way of fixing b/140878309

Fixes: 145893081
Test: manual check FaceSettings and Notification Settings
Change-Id: Ia80e755e3f86b44e771b0cf80c9bf53a8ef8f430
2019-12-12 07:41:36 +00:00
Jay Aliomer
82a0ea022e Dark theme settings activity
Dark theme settings is now launchable as an activity

Test: launch activity android.settings.DARK_THEME_SETTINGS
Fixes: 145560830

Change-Id: I24b8d3211e9d6e7a5b1f226001882573ae7fb311
2019-12-11 17:41:35 +00:00
Automerger Merge Worker
4fd41fe196 Prevent accounts page directly opening in screen pinning mode am: a545a85f9d am: fd45c98d53
Change-Id: Id48f14bb8258d615dc2fe9e552640ab06aa528ab
2019-12-11 06:51:34 +00:00
Automerger Merge Worker
fd45c98d53 Prevent accounts page directly opening in screen pinning mode am: a545a85f9d
Change-Id: If2d4c0acb794a9a506b7611fa2f622c90054b393
2019-12-11 06:32:39 +00:00
Alex Lin
d4420d4ce4 [DO NOT MERGE] Add country blacklist support
Adding a country blacklist, except for pixel2(walleye, taimen) will still uses whitelist
Bug: 144702079
Test: manually tested

Change-Id: Ic03abd0d2706b7bb9fdc56be7906411b731b186b
2019-12-11 00:15:48 +00:00
Arc Wang
be02f16b3a [Wi-Fi] Fix transition mode problems
Replace SECURITY_PSK_SAE_TRANSITION & SECURITY_OWE_TRANSITION with
AccessPpoint#isPskSaeTransitionMode() &
AccessPpoint#isPskOweTransitionMode()

Bug: 144320676
Bug: 144320649
Bug: 144325162
Bug: 144321574
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: I6596c48ea54adcaf579682634965c379c7938895
Merged-In: Ic3c7ac1238a51b6e215ed63761720d2bc371d012
2019-12-09 19:20:55 +08:00
Mill Chen
a545a85f9d Prevent accounts page directly opening in screen pinning mode
In Settings there is no auth mechanism to prevent accounts page being
opened in screen pinning mode. This CL makes it so that when users are
trying to navigate to any pages in Settings from other apps in screen
pinning mode, Settings app will directly close its page.

Bug: 137015265
Bug: 135604684
Test: manual
Change-Id: If26eda408a9ef6fa03ad82e5bee51bb7185950d6
Merged-In: If26eda408a9ef6fa03ad82e5bee51bb7185950d6
(cherry picked from commit f3242dab35)
2019-12-09 03:18:24 +00:00
Ilya Matyukhin
95820eb001 Merge "Fix "Skip lock screen" not working for secondary user" into qt-qpr1-dev 2019-12-06 01:58:55 +00:00
TreeHugger Robot
c08f70b7dd Merge changes from topic "update_battery_icon" into qt-qpr1-dev
* changes:
  Sync dimen from SystemUI
  Battery icon is too large
2019-12-06 01:05:30 +00:00
Ilya Matyukhin
1de3feb026 Fix "Skip lock screen" not working for secondary user
Bug: 140878309
Test: the option is not grayed out for secondary user.
Change-Id: I2413aa3c634e89a90d104e9ad60df15e49c75ed2
(cherry picked from commit e17caeea3f)
2019-12-05 04:11:49 +00:00
TreeHugger Robot
1284d9de67 Merge "Always use local timezone for parsing date" into qt-qpr1-dev 2019-12-05 02:49:13 +00:00
Tsung-Mao Fang
be895aea4c Always use local timezone for parsing date
Use local time zone to be in line with entry
in phonesky mainline module.

Test: Rebuild
Bug: 143357811
Change-Id: I1ecf57ec7952cff580af932e58c453622d4536f0
2019-12-03 09:06:59 +00:00
Jay Aliomer
f4bc80c45c Battery saver mode should disable dark mode modification
disable toggle options and disable the dark theme drop down selection

Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.DarkUIPreferenceControllerTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeActivationPreferenceControllerTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeObserverTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeScheduleSelectorControllerTest"

Fixes: 	145098277
Fixes: 145297188
Fixes: 	145254016
Change-Id: I5c81a295810cc2d9a45657978104647e9c15da46
2019-12-02 18:19:52 +00:00
timhypeng
b6b29c1af0 Battery icon is too large
-sync layout from SystemUI

Bug: 141139595
Test: make -j42 RunSettingsRoboTests
Change-Id: I5e165e953682fcfdebf0d06475bb1abd171684d9
(cherry picked from commit c71f996da9)
Merged-In: I5e165e953682fcfdebf0d06475bb1abd171684d9
2019-11-26 12:35:22 +08:00
Jay Aliomer
53ad4fedc6 Revert "Revert "Add settings for scheduling dark theme""
This reverts commit 50c0fa136c.

Reason for revert: Fixed the error which is code incompatibility
Test: run all settings tests
Change-Id: I8f05b50f8198c4b2565bb9b6f62ddda5029c8365
Merged-In: I8f05b50f8198c4b2565bb9b6f62ddda5029c8365
Bug: 141567787
2019-11-22 20:58:23 +00:00
Hai Shalom
775106e40d Merge "Revert submission" into qt-qpr1-dev 2019-11-22 03:46:02 +00:00