Commit Graph

35482 Commits

Author SHA1 Message Date
Lei Yu
d85bdebe0e Merge changes I573e4fb9,I8e7baadc into oc-dev
am: 67e38774ce

Change-Id: Id3a830eb46004a3febdb9c4bf96a39b8c4afaedd
2017-05-18 17:08:33 +00:00
Lei Yu
67e38774ce Merge changes I573e4fb9,I8e7baadc into oc-dev
* changes:
  Drop the misc and not smear it.
  Smear screen power usage based on activity time.
2017-05-18 17:00:27 +00:00
jackqdyulei
7d7080ab64 Drop the misc and not smear it.
Bug: 38347725
Test: RunSettingsRoboTests
Change-Id: I573e4fb945bc212505c9211d9b92f77a6a9a2739
2017-05-17 18:12:03 -07:00
Fan Zhang
60d26cfffa Merge "Fix bug where accounts are duplicated in user&account list." into oc-dev
am: 2b030aeb65

Change-Id: I4c13fb0ce652108fdabbaa8ca215a5799374c8f8
2017-05-18 01:11:00 +00:00
jackqdyulei
2b923ce44f Smear screen power usage based on activity time.
Bug: 38328636
Test: RunSettingsRoboTests
Change-Id: I8e7baadcd88a8e9d674f5bc8d8e42e0f3953c98a
2017-05-17 18:06:47 -07:00
Fan Zhang
2b030aeb65 Merge "Fix bug where accounts are duplicated in user&account list." into oc-dev 2017-05-18 01:05:39 +00:00
Fan Zhang
3970916cf1 Merge "Fix robolectric test failure" into oc-dev
am: 2545bcaa74

Change-Id: I632edffaced0b4ce7d391d525c4d9288e5ba97cc
2017-05-18 01:01:12 +00:00
Fan Zhang
2545bcaa74 Merge "Fix robolectric test failure" into oc-dev 2017-05-18 00:41:18 +00:00
Fan Zhang
c754f59fb0 Fix bug where accounts are duplicated in user&account list.
This happens when user has different accounts with same account name. For
example: user@domain.com for type1 and same email for type2, etc. When
we refresh the account list during onResume(), the same account name
incorrectly causes the logic to think they are the same account and
updates the account list by mistake.

- Introduced a util method to generate unique key from Account object.
And set it as preference key.
- when updating preference on screen, use key to find preference instead
of the preference instance itself.

Change-Id: I0aa692cb965b7037155a746389a919cd155843da
Fix: 34035653
Test: make RunSettingsRoboTests
2017-05-17 23:50:30 +00:00
Youhan Wang
c6b1845d0f Merge "TelephonyMonitor: Replace boolean decision with multiple status." into oc-dev
am: 350ba4a4c3

Change-Id: Ia508085e2fe2dd2061d772b0caf976d039aaa213
2017-05-17 23:42:49 +00:00
Youhan Wang
350ba4a4c3 Merge "TelephonyMonitor: Replace boolean decision with multiple status." into oc-dev 2017-05-17 23:38:08 +00:00
Steven Ng
268be8edde Merge "DO NOT MERGE Fix build failure due to missing guava target" into nyc-mr2-dev-plus-aosp
am: 3b76c25cee  -s ours

Change-Id: I6b9f260b8494ced24cd758207981d60c9a5ca97e
2017-05-17 22:49:14 +00:00
Fan Zhang
28dcdb7c3b Fix robolectric test failure
Default UserManager caches instance across entire test suite, so 
test becomes flakey depending on the order they are run. Using a 
a ShadowUserManager without the cache ensures each test class gets
a UserManager with clean state.

Change-Id: Ia54f6a3259859add5a1e5d0101829497fb985ab1
Fix: 38393235
Test: make RunSettingsRoboTests
2017-05-17 22:46:27 +00:00
Steven Ng
3b76c25cee Merge "DO NOT MERGE Fix build failure due to missing guava target" into nyc-mr2-dev-plus-aosp 2017-05-17 22:43:11 +00:00
Steven Ng
3c03b45a16 DO NOT MERGE Fix build failure due to missing guava target
Test: 1) build sailfish-userdebug successfully
      2) m SettingsTests -j32 built successfully

Bug: 33059280
Change-Id: If1c281888e4581b5eb3b8842892464aebd04b827
2017-05-17 22:40:33 +00:00
Steven Ng
be7621e1d7 Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am: c07f39c791 am: e05ef08a8e -s ours am: 6496c3757b -s ours
am: 9eeb954d39  -s ours

Change-Id: I10aad8dbfe4b42a887b2166608456595640e0feb
2017-05-17 21:05:09 +00:00
Steven Ng
b0ad380d0c Fix phishing attack in ChooseLockGeneric
am: 56870f438c  -s ours

Change-Id: I3f71fa7a65f732de8816b43f02df3cf414e8408b
2017-05-17 21:04:40 +00:00
Steven Ng
9eeb954d39 Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am: c07f39c791 am: e05ef08a8e -s ours
am: 6496c3757b  -s ours

Change-Id: I1032e8ad372d0f5cff35e1a1f018ceecedf9bff2
2017-05-17 21:01:46 +00:00
Antony Sargent
3afb6616c6 Merge "Add a "Use high quality audio" option to Bluetooth A2DP device settings" into oc-dev
am: c439202da9

Change-Id: I2e0eed6c7332a9968b020c69dcc7f5507b355f6e
2017-05-17 19:12:43 +00:00
TreeHugger Robot
c439202da9 Merge "Add a "Use high quality audio" option to Bluetooth A2DP device settings" into oc-dev 2017-05-17 18:59:54 +00:00
Matthew Fritze
a939959838 Merge "Remove duplicates from sound settings" into oc-dev
am: 3abeba07d3

Change-Id: Ief8e333082ef6d8064a51fc54b052e1476880a55
2017-05-17 18:51:14 +00:00
Matthew Fritze
af054e63e0 Merge "Remove Backup and Reset duplicates from Settings search" into oc-dev
am: 4bd0f411ce

Change-Id: I680a407f9955e74b66e5c87af6b8a8d4335c530d
2017-05-17 18:50:28 +00:00
TreeHugger Robot
3abeba07d3 Merge "Remove duplicates from sound settings" into oc-dev 2017-05-17 18:29:54 +00:00
TreeHugger Robot
4bd0f411ce Merge "Remove Backup and Reset duplicates from Settings search" into oc-dev 2017-05-17 18:28:35 +00:00
Kenny Guy
020dd7b169 Merge "Disable managed profile version of shortcut picker." into oc-dev
am: c760135f14

Change-Id: I9df7203ba655e1f483464c0b5cbec14800919ae1
2017-05-17 17:43:44 +00:00
TreeHugger Robot
c760135f14 Merge "Disable managed profile version of shortcut picker." into oc-dev 2017-05-17 17:38:30 +00:00
Matthew Fritze
d53409356d Merge "Remove Network Restrictions duplicate from setting search" into oc-dev
am: 09dbc8043f

Change-Id: Ia172fc4c93b2259ed9a51248159784a89fbdf638
2017-05-17 17:37:51 +00:00
Steven Ng
56870f438c Fix phishing attack in ChooseLockGeneric
Cherry-pick of 436256c36d

Test: 1) make and run SettingsTests. It passes.
      2) Manual test 1
         a) On a device supports fingerprint, set a password but not fingerprint.
         b) adb shell am start -a android.app.action.SET_NEW_PARENT_PROFILE_PASSWORD
         c) Confirm Lock password screen is shown
         d) Select "Skip fingerprint". There isn't a second lock password confirmation screen.
         e) A new password can be set successfully.
      3) Manual test 2
         a) Repeat step 2)a) - 2)c)
         b) Select "Fingerprint + PIN". There isn't a second lock password confirmation screen.
         c) A new password and fingerprint can be enrolled successfully.

Bug: 33059280
Change-Id: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
Merged-In: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
2017-05-17 18:37:01 +01:00
TreeHugger Robot
09dbc8043f Merge "Remove Network Restrictions duplicate from setting search" into oc-dev 2017-05-17 17:27:57 +00:00
Matthew Fritze
70db53a8d5 Merge "Remove Legal Information duplicate from Settings search" into oc-dev
am: 915f0cea5b

Change-Id: I508afeb3b832ffc444fa5dafe4836fc0ae202eb0
2017-05-17 17:26:07 +00:00
TreeHugger Robot
915f0cea5b Merge "Remove Legal Information duplicate from Settings search" into oc-dev 2017-05-17 17:17:14 +00:00
Matthew Fritze
79cfaa7b91 Merge "Remove default app duplicates in search" into oc-dev
am: 0c55014b88

Change-Id: I62f5fbd444836aa73b6ff801bad944c9a8fddd4b
2017-05-17 17:14:24 +00:00
Matthew Fritze
5a151d23ab Merge "Remove Wallpaper duplicate from setting search" into oc-dev
am: 564b965ccc

Change-Id: I955360c67d040a7c05685e8928e54dc6ac1109b6
2017-05-17 17:13:46 +00:00
TreeHugger Robot
0c55014b88 Merge "Remove default app duplicates in search" into oc-dev 2017-05-17 17:08:12 +00:00
TreeHugger Robot
564b965ccc Merge "Remove Wallpaper duplicate from setting search" into oc-dev 2017-05-17 17:06:18 +00:00
Kenny Guy
4761da3b73 Disable managed profile version of shortcut picker.
Don't show managed profile version of shortcut
picker as it lunaches same activities as personal
one.

Test: manual - check badged shortcut isn't present in launcher.
Bug: 38333213
Change-Id: Iade6595255524a8dbf223a70a6c8312087258c23
2017-05-17 16:44:01 +01:00
Charles He
af36129ae9 Merge "Properly remove fingerprints when removing device lock." into oc-dev
am: 98229bdf32

Change-Id: I98ed8a43e4644d709d9cb9ddeb799672a8fb6bc6
2017-05-17 13:04:40 +00:00
Charles He
98229bdf32 Merge "Properly remove fingerprints when removing device lock." into oc-dev 2017-05-17 12:58:21 +00:00
Matthew Fritze
f8b8ecebea Merge "Revert "Replace dynamic summary text for SettingPref"" into oc-dev
am: bcb2565e05

Change-Id: I8a89b5a7676a9fb9961e4275c417a425baa5938e
2017-05-17 04:46:15 +00:00
TreeHugger Robot
bcb2565e05 Merge "Revert "Replace dynamic summary text for SettingPref"" into oc-dev 2017-05-17 04:34:02 +00:00
Matthew Fritze
8061aaef62 Revert "Replace dynamic summary text for SettingPref"
This reverts commit 03dfa50996.

Change-Id: I1f7188b35ad657f3d9721bab3bbdec697d3c1ae3
Bug: 36101902
Fixes: 38352100
2017-05-17 02:56:28 +00:00
Youhan Wang
c426fe6c68 TelephonyMonitor: Replace boolean decision with multiple status.
Test: make ROBOTEST_FILTER=TelephonyMonitorPreferenceControllerTest
RunSettingsRoboTests -j40

Use enable, disable, user_enable, user_disable four statuses to
replace the old boolean value,

Bug:36704500
Change-Id: I5d3fd36aecaf36bb6969a6f6354c85bb162a0293
2017-05-17 01:11:53 +00:00
Matthew Fritze
06976317cb Remove duplicates from sound settings
Duplicates include:
- Do not disturb preferences
- Block Visual Disturbances
- Emergency broadcasts

Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I3de430b80fd11d7937d3bec908fbbaa6a176e785
2017-05-16 15:58:54 -07:00
Matthew Fritze
c6192251b2 Merge "Remove Special App Access duplicate from Setting search" into oc-dev
am: d6aa9f3454

Change-Id: I0ae7c3ec171d1954a362c908ea73a8a5741f2554
2017-05-16 22:44:49 +00:00
Matthew Fritze
6fe35bb031 Remove Backup and Reset duplicates from Settings search
Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I3539f9581939255d94ccf04134278414fbe9c72b
2017-05-16 15:43:21 -07:00
Charles He
7569bb1881 Properly remove fingerprints when removing device lock.
When strong auth (PIN, password, or pattern) is removed from a user,
fingerprints enrolled for that user should also be removed. Then, if the
user has a work profile guarded by a unified work challenge, the work
profile's fingerprints should also be removed.

Previously, when removing the fingerprints of the current user,
ChooseLockGeneric checked the finger id of the onRemovalSucceeded() and
onRemovalError() callbacks, and assumed the removal had completed when
the id was 0. Only after this would it initiate the removal of work
profile fingerprints, if any.

However, the finger id is actually non-zero even for the user's last
fingerprint. This means the work profile fingerprints (under unified
challenge) were never removed. Another more visible symptom was that
when the user removed the device lock by choosing "None" or "Swipe" in
ChooseLockGeneric, the activity failed to exit, since finish() is called
only at the end of the removal flow which was not executed.

In this CL, we check the number of remaining fingerprints instead of
relying on the finger id, thus allowing the removal flow to complete and
the activity to finish().

Bug: 37938345
Test: manual, both with and without work profile
Test: make SettingsRoboTests
Change-Id: Ic04fd01177ad6d4a061023a4b6889af585f8f2b7
2017-05-16 23:40:38 +01:00
Matthew Fritze
2e89758b01 Remove Legal Information duplicate from Settings search
Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: Icee65b7a683ad80cd587e22a575b4abc4b009d8f
2017-05-16 15:39:03 -07:00
TreeHugger Robot
d6aa9f3454 Merge "Remove Special App Access duplicate from Setting search" into oc-dev 2017-05-16 22:37:22 +00:00
Steven Ng
17bb961066 Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am: c07f39c791 am: e05ef08a8e -s ours am: 6496c3757b -s ours
am: 00266d056c  -s ours

Change-Id: Id573a18a0066575ef6aa53bc4b742949eb090461
2017-05-16 21:39:54 +00:00
Steven Ng
00266d056c Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am: c07f39c791 am: e05ef08a8e -s ours
am: 6496c3757b  -s ours

Change-Id: I2c58871339e8d2591afe38d58b2ec26b66f917b5
2017-05-16 21:36:53 +00:00