Commit Graph

26 Commits

Author SHA1 Message Date
Tsung-Mao Fang
ff5bfb40c8 [DO NOT MERGE] FRP bypass defense in the settings app
Over the last few years, there have been a number of
Factory Reset Protection bypass bugs in the SUW flow.
It's unlikely to defense all points from individual apps.

Therefore, we decide to block some critical pages when
user doesn't complete the SUW flow.

Test: Can't open the certain pages in the suw flow.
Bug: 258422561
Fix: 200746457
Bug: 202975040
Fix: 213091525
Fix: 213090835
Fix: 201561699
Fix: 213090827
Fix: 213090875
Change-Id: Ia18f367109df5af7da0a5acad7702898a459d32e
Merged-In: Ia18f367109df5af7da0a5acad7702898a459d32e
2022-12-07 03:09:30 +00:00
Yi-Ling Chuang
f46fd991fa Fix DevelopmentSettingsDashboardFragmentTest
Fixes: 151206654
Bug: 150907639
Test: robotests
Change-Id: I36a1dacc7fe2ccd3b724a9aa135447db97fa3d41
2020-03-11 19:16:35 +08:00
James Lemieux
f1dade40d2 Use binary resource support in robolectric
The resources available to tests are now exactly the merged resources
located in the APK under test.

Bug: 74359828
Test: make -j56 RunSettingsRoboTests
Change-Id: I050db81a92decefea23314b5ec7a62f77ff4bb2b
2018-12-12 19:53:49 -08:00
Chienyuan
eda2987b86 Show reboot dialog when tunring off developer option
The toggle button "Disable Bluetooth A2DP hardware offload" in developer
options need reboot to take effect when value changed. Otherwise, the
A2DP will not work until user reboot the device.

If we want this toggle button change back to default value when turning
off developer options, we need reboot device as well.

This patch will check the property value of A2DP hardware offload. If
turning off developer options will change the value, show a dialog to
force the user to reboot device.

Bug: 80449594
Test: make -j50 RunSettingsRoboTests

Change-Id: Ibace1ff72c1b41bd55444242a74e3f0b49187668
2018-12-06 17:40:21 +08:00
James Lemieux
1fc96ea98d Prepare tests for impending robolectric merge
Setting's ShadowUserManager.reset() was unnecessary and collided with a
newly introduced reset() method in its super class. It has been removed.

Test: make -j56 RunSettingsGoogleRoboTests &&
  make -j56 RunSettingsRoboTests &&
  make -j56 RunSettingsLibRoboTests

Change-Id: I63c50eca0de3581fd4f64f4862233446f5937d0c
2018-11-19 16:56:40 -08:00
Fan Zhang
cdf284b732 Make Settings robotest work with tot Robolectric
Bug: 116278591
Test: make -j RunSettingsRoboTests
Change-Id: I32cb2fcf6094675f79d2fc24702ef6298a9691e4
2018-10-31 17:59:17 -07:00
Fan Zhang
23f8d59d02 Sort imports
Having consistent import order will reduce chance of merge
conflict between internal and external master

Test: rebuild
Change-Id: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
2018-08-28 22:13:15 +00:00
Hansong Zhang
e8cb916849 Remove developer menu: AVDTP delay reports/inband ringing
Bluetooth AVDTP delay reports and inband ringing are used by default.
Developer option menu no longer used.

Bug: 79610154
Test: robolectric
Change-Id: I67fe10808151f101fc7e891f75953f8539255026
2018-05-12 00:22:21 +00:00
Christine Franks
4c3c7fbfa6 Allow developer options in retail mode
Also, add new tests and fix existing tests.

Bug: 70985064
Test: make -j100 && make RunSettingsRoboTests -j100
Change-Id: Ied84cf0de02e18c10949eed4f3642782c1246e7b
2018-03-20 16:32:50 -07:00
James Lemieux
22a39c2b93 Use external/robolectric-shadows/run_robotests.mk
This allows Settings to test against the latest framework changes.

Also replaced TestConfig with traditional robolectric.properties.

Bug: 73173204
Bug: 73892008
Test: make -j56 RunSettingsRoboTests
Change-Id: I3135b4fa5f095ba79b282a76f45dd9baa2584bc7
2018-03-04 03:50:08 -08:00
Fan Zhang
155d6829e9 Move restriction check for dev settings into controller
Change-Id: I99dae6e82aca40b92e1965ba7db2c54f3c59d33f
Fixes: 72815875
Test: robotests
2018-02-07 22:33:10 -08:00
jeffreyhuang
cbfb099a40 Rename SDK_VERSION_O to SDK_VERSION
Test: make RunSettingsRoboTests -j40
Change-Id: I6715062d8addadda441e32809db1af55f15e3a90
2017-12-05 16:43:54 -08:00
jeffreyhuang
876d3c13b2 Move development test package to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: I886a72774442884329d15e5dd276b00a269201c5
2017-11-28 12:03:31 -08:00
jeffreyhuang
e89dc36149 rename v2 controllers
- Remove v2 postfix on controllers now that v1 dev options have been
 removed

Bug: 34203528
Test: compiles and tests still pass
Change-Id: I7a937e914293233801dbd1d9536b7b47ee70d591
2017-11-22 16:51:15 -08:00
jeffreyhuang
d5e2fd30a9 Rename dev options xml file
Bug: 34203528
Test: Builds and tests still pass
Change-Id: I7990555244c57f526b8609ae11154683aed889be
2017-11-13 16:58:55 -08:00
jeffreyhuang
60ab063ea3 Introduce LogPersistPreferenceControllerV2
- Create new LogPersistPreferenceControllerV2
 - Deprecate LogPersistPreferenceController
 - Add DisableLogPersistWarningDialog
 - Create controller inside the DashboardFragment
 - Port logic from DevelopmentSettings into the controller

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I8ff49ec4ece15cad2d0c60bd21488e3f5d55ee98
2017-10-10 16:05:32 -07:00
jeffreyhuang
fe537c8d84 Refactor AdbPreferenceController
- Refactor AdbPreferenceController to use
 AbstractEnableAdbPreferenceController

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: If34e2968ff8900276023e12f89d9cc86468adf7a
2017-10-09 11:50:29 -07:00
Jeffrey Huang
aded3c3bce Merge "Introduce ClearAdbKeysPreferenceController" 2017-10-03 16:48:56 +00:00
jeffreyhuang
97dbff233d Introduce ClearAdbKeysPreferenceController
- Create new ClearAdbKeysPreferenceController
 - Added ClearAdbKeysWarningDialog
 - Create controller inside the DashboardFragment
 - Port logic from DevelopmentSettings into the controller

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: Ia12bfee753f2c9222e6d833b1fb7e099f3602fdf
2017-10-02 17:22:43 -07:00
Fan Zhang
feaa82ce8f Make robotest less flaky
Change-Id: Ic9ed1ccbb7b7f802b6a5cf915aeb96c799007a7d
Fixes: 67307841
Test: rerun robotest
2017-10-02 13:10:08 -07:00
jeffreyhuang
25ce51f4af Introduce BluetoothInbandRingingPreferenceCtrl
- Create new BluetoothInbandRingingPreferenceController
 - Create controller inside the DashboardFragment
 - Port logic from DevelopmentSettings into the controller

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I2551803b50323c93ce8f1595d5bbab92b7a18ed4
2017-09-28 11:19:21 -07:00
jeffreyhuang
8d8f1663b4 Introduce AdbPreferenceController
- Create new AdbPreferenceController
 - Create AdbOnChangeListener interface for adb change callbacks
 - Create EnableAdbSettingWarningDialog
 - Create controller inside the DashboardFragment
 - Port logic from DevelopmentSettings into the controller
 - Add deprecated annotation to EnableAdbPreferenceController

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: Id57146149943d770bf5ccc9ed5ecc6ea9d8ae66c
2017-09-27 12:57:52 -07:00
jeffreyhuang
6162fa5ef8 Introduce PictureColorModePreferenceController
- Create new PictureColorModePreferenceController
 - Create controller inside the DashboardFragment
 - Refactor ColorModePreference so isAvailable() no longer depends on
 ColorModePreference
 - Port logic from DevelopmentSettings into the controller

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I8dff5b0d5ad1d7f043fc7ead540b2c0c960933e3
2017-09-21 12:24:32 -07:00
jeffreyhuang
223484ea3c Introduce OemUnlockPreferenceController
- Create new OemUnlockPreferenceController
 - Add new onActivityResult method in DeveloperOptionsController
 - Create controller inside the DashboardFragment
 - Port logic from DevelopmentSettings into the controller

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I0b1387b9547e7c9f2a1a0963421d0ebea55d9ff4
2017-09-19 13:21:25 -07:00
Fan Zhang
d77881f88d Add switch bar to enable/disable dev settings in new page.
Bug: 65522852
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=Development
Change-Id: I0958950dc6aaee24d8d5e0be58d7564d108bc72e
2017-09-12 10:25:43 -07:00
Fan Zhang
4c26da9e13 Fork a new developer options page.
- Create a new activity/fragment and add it to manifest
- Mark old activity/fragment deprecated
- Enable/disable the new activity based on FeatureFlag
- Initial skeleton code for new fragment

Bug: 65522852
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=DevelopmentSettingsDashboardFragmentTest
Change-Id: Ib1395693f8b6f61d4726573a9ea841ea53cf207b
2017-09-10 15:02:51 -07:00