Commit Graph

12377 Commits

Author SHA1 Message Date
Fan Zhang
80af194f8b Merge "Set device credential's Window flag to be SECURE." into nyc-dev am: e69c4dcb8f
am: e79c26a9da

Change-Id: I3652f6f77479a339b9acc387a49ee96fe70921ff
2017-10-31 21:16:32 +00:00
Fan Zhang
e79c26a9da Merge "Set device credential's Window flag to be SECURE." into nyc-dev
am: e69c4dcb8f

Change-Id: I30a0d2578343a7635da63a52cfc81f1427aab23b
2017-10-31 21:11:26 +00:00
Fan Zhang
e69c4dcb8f Merge "Set device credential's Window flag to be SECURE." into nyc-dev 2017-10-31 21:03:08 +00:00
Fan Zhang
1cc50ae190 Set device credential's Window flag to be SECURE.
This prevents showing any pattern/pin in recent list.

Change-Id: Ife33131004d66092bfa57aa57a9bb856800ce28d
Fixes: 64339515
Bug: 38258991
Merged-In: Ia9935ef710cf1795d9ce464e0a9edff75be9c0c3
Merged-In: I99c283dd4a1f2d579f565ccf5839a705e75ed6fc
Merged-In: Ibe781a3a1e1483a8c6fde4c7cc5dffbf54bdba59
Test: manual
2017-10-31 19:38:07 +00:00
Jeff Sharkey
7c41707eaf DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am: f32a4fad5d

Change-Id: I54e65289ff205196bd4fba9f0d40dc1f9f116e2b
2017-10-11 20:25:11 +00:00
Jeff Sharkey
f32a4fad5d DO NOT MERGE. ActivityPicker shouldn't grant permissions.
This picker has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.

Test: builds, boots
Bug: 32879772
Change-Id: I91c48c73287a271bd6c99e60e216dead22e68764
(cherry picked from commit 3f218e8431)
2017-10-03 20:31:23 +00:00
Jeff Sharkey
1cdc675d7d DO NOT MERGE. ActivityPicker shouldn't grant permissions.
This picker has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.

Test: builds, boots
Bug: 32879772
Change-Id: I91c48c73287a271bd6c99e60e216dead22e68764
(cherry picked from commit 3f218e8431)
2017-10-03 20:30:43 +00:00
Suprabh Shukla
1e9af33c41 Disabling the activate button when paused am: 8e08a9bb71
am: 08207f457d

Change-Id: I693fde0d9935e0b92fa8848b205db3a810a58b67
2017-08-16 19:25:59 +00:00
Suprabh Shukla
08207f457d Disabling the activate button when paused
am: 8e08a9bb71

Change-Id: I9b9ccd0bd849d34343ff0a6d6b579274d02264c6
2017-08-16 19:22:01 +00:00
Suprabh Shukla
8e08a9bb71 Disabling the activate button when paused
This revises the previous attempt to drop taps when another window is
obscuring the device admin details. Any system alert windows or toasts
are disabled when the activity is in focus, otherwise the button is
disabled so no floating activities can obscure it and delegate taps back
to the security sensitive "Activate" button.

Test: CtsVerifier -> Device Administration -> Device Admin Tapjacking Test

Bug: 35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Merged-In: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
2017-08-15 03:35:43 +00:00
Phil Weaver
e76e053595 Back-port ag/2491664
Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.

Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992
2017-07-18 15:51:28 -07:00
Phil Weaver
b1685ab057 Back-port ag/2491664
Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.

Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992
2017-07-18 09:23:14 -07:00
Steven Ng
c07f39c791 Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev 2017-05-16 21:17:59 +00:00
Steven Ng
741f99ad22 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-15 17:52:44 +00:00
Phil Weaver
8247008239 Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60
am: 9b8abd652a

Change-Id: I1eec44668bbd578003d3cc57763808ec2a80f0fa
2017-05-12 22:11:56 +00:00
Phil Weaver
9b8abd652a Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4
am: adf8f8bc60

Change-Id: Id26b90f8d4afbf6e50bc8e43afced432c70dba68
2017-05-12 22:08:53 +00:00
Phil Weaver
adf8f8bc60 Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67
am: 11b6279ed4

Change-Id: I370c3f0ffc78f86b465d9721a753503b03d56d54
2017-05-12 22:07:24 +00:00
Phil Weaver
11b6279ed4 Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e
am: beb7f31d67

Change-Id: I13dc112b756569d68bddad1716db0e3979d0c150
2017-05-12 22:05:52 +00:00
Phil Weaver
beb7f31d67 Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f
am: 5d6d70a50e

Change-Id: Ib4fca899498f1348263beff3908c24a9ec65c392
2017-05-12 22:02:53 +00:00
Phil Weaver
5d6d70a50e Don't enable a11y service if scary dialog obscured
am: 9a1b4eb21f

Change-Id: I0a288cb9cef29d730ec82028cf0dc003970db734
2017-05-12 22:00:23 +00:00
Phil Weaver
9a1b4eb21f Don't enable a11y service if scary dialog obscured
Bug: 38134845
Test: Trivial back-port of ag/2066325; relying on treehugger
Change-Id: I784eebebe45847431e67aa9032f2f1367156a440
2017-05-09 10:51:32 -07:00
Dmitry Dementyev
3b5b2d6d20 resolve merge conflicts of 3964c51bf2 to nyc-dev am: 0f04a5a93f
am: 8c5c5b5cec

Change-Id: I56f7364b5b70fe41a5d09fbaf334c0e15f073750
2017-03-09 18:22:11 +00:00
Dmitry Dementyev
8c5c5b5cec resolve merge conflicts of 3964c51bf2 to nyc-dev
am: 0f04a5a93f

Change-Id: I5bb82c0b56e43903d10304007bc17165be3c23f9
2017-03-09 18:19:10 +00:00
Dmitry Dementyev
0f04a5a93f resolve merge conflicts of 3964c51bf2 to nyc-dev
Bug: 33123882
Test: manual tests
Merged-In: If68343d155364654fa7db55ace3fb3c4db508c7e
Change-Id: I17ceca883819a161c4eab2a414abf0b64c320378
2017-03-08 17:12:40 -08:00
Dmitry Dementyev
3964c51bf2 resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9 am: b7e2545217
am: def3eddb43

Change-Id: I103086932e0f5071b1fa554a9e11a524b0d36d7d
2017-03-08 19:17:42 +00:00
Dmitry Dementyev
def3eddb43 resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9
am: b7e2545217

Change-Id: I40643a3a88c3ec9344604917dd0e765cd9078f29
2017-03-08 19:15:40 +00:00
Dmitry Dementyev
b7e2545217 resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258
am: 3a5e567ab9

Change-Id: Ie14fd1ef35f12fffadf4e241e3cd8146a1063d8a
2017-03-08 19:13:10 +00:00
Dmitry Dementyev
3a5e567ab9 resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c
am: 5c4276a258

Change-Id: Iba7445a15febacfd49ee8a415d8b5a02691b084b
2017-03-08 19:11:13 +00:00
Dmitry Dementyev
e24780ed4c resolve merge conflicts of 75ae46d035 to lmp-mr1-dev
Change-Id: Ib80d006bbd7b76396b4941e001f5c69fb7b643fa
Bug: 33123882
Test: manual tests:
2017-03-07 19:52:02 -08:00
Dmitry Dementyev
75ae46d035 Add permission check to Intents used by Authenticator Settings.
Setting shares system uid and can be used to bypass different security
checks.
We add proper handling for intents which resolve toexported=true
activities with permission filed.
Added nested preferences filtering.

Bug: 33123882
Test: manual tests
Change-Id: Ib5bab7989fc44b4391f9050c6b18f81c58c09cf6
2017-02-21 11:05:45 -08:00
Fan Zhang
c9cdc25f41 Fix crash when opening account sync detail for external app
Bug: 32426306
Test: Manual, and added unit test
Change-Id: I8703c9a13a60e57d7dd2bab2ae3cf6be362e351a
(cherry picked from commit e3ad2b56c3)
2016-10-31 21:57:36 +00:00
Steven Ng
378dec1495 Nexus imprint setting is missing while adding corp account from SUW
+ This is caused by the encryption interstitial result code not handled
  in ChooseLockGeneric. Change the request code of launching encryption
  interstitial screen to CHOOSE_LOCK_BEFORE_FINGERPRINT_REQUEST if it
  is set new password flow.

Testing
Test: See below
1) Auto
   make RunSettingsRoboTests
2) Manual
   On a device (Nexus 5x) that shows encryption interstital screen and
   supports fingerprint.
   1) Nexus imprint flow (regression test)
      Fingerprint can be enrolled with the following flow.
      Settings > Security > Nexus Imprint > FingerprintEnrollIntroduction
      > ChooseLockGeneric (Unlock selection) > Encryption Interstitial
      > Password setup > Notification Interstitial
      > Find sensor and fingerprint enrollment
   2) Set new password test
      i) $ adb shell am start -a android.app.action.SET_NEW_PASSWORD
      ii) Click Nexus Imprint + Pattern.
      iii) Choose "Require pattern to start device"
      iv) Set a pattern lock.
      v) Choose any of the notification behavior.
      vi) Can enroll a fingerprint.

Bug: 32382952

Change-Id: Ie66ffca2e8c3cc46b5e8b619bd35986e4f41d5ab
2016-10-25 20:01:23 +00:00
Doris Ling
4245ad4771 Ensure that the gesture animation video is paused properly.
Add the handling to pause the animation video when user navigates away
from the gesture settings.

Test: Manual - play gesture animation videos, then switch to another app
in recents. Verifies from logcat that NuPlayerDriver is not active.
Fix: 32064123

Change-Id: I3d0fb3946e4d0d77a686aa97cfabe667862cac17
2016-10-21 14:28:54 -07:00
TreeHugger Robot
08254e5b4f Merge "Fix help & feedback link in data usage summary screen." into nyc-mr1-dev 2016-10-20 20:18:44 +00:00
Fan Zhang
9b52836251 Fix help & feedback link in data usage summary screen.
The fragment was not providing the correct string for help & feedback
button, causing no result page when user navigates to help article page
from actionbar overflow menu.

Change-Id: I076846c44d4fc95efea743f019a7ad4aab47f214
Fixes: 32291069
Test: manual
2016-10-20 09:13:36 -07:00
Adrian Roos
ee5eef1492 Merge "Separate ambient display triggers" into nyc-mr1-dev 2016-10-18 22:00:08 +00:00
Lei Yu
7fee46383f Merge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev 2016-10-18 16:45:35 +00:00
jackqdyulei
013da34209 Suspend action in security patch when browser is disabled
When queryIntentActivities(intent, flag) return empty, don't send out
that intent to stop crash. This is a special catch only in security
patch.

Bug: 32054067
Test: Manual, hard to mock the situation to disable all the apps for
a specific action.

Change-Id: Ibc96b814a4170926972cff8e0bc954ea57b33c10
2016-10-17 14:35:15 -07:00
Adrian Roos
82829ee0b1 Separate ambient display triggers
Allows configuring notification and sensor triggers
separately. Introduces a helper class that hosts the
logic for determining what kinds of triggers a device
supports.

Bug: 32073185
Change-Id: Ie7e8eb6b895dcc54e6f972e70642c7248b9e223a
Test: disable "ambient display", sensor triggers should still work
2016-10-17 14:05:53 -07:00
Doris Ling
ec5314f2f5 Merge "Add static preview images to gesture settings." into nyc-mr1-dev 2016-10-17 20:11:31 +00:00
Sanket Padawe
8591f26fa3 Fix multi-sim popup issue in data usage.
+ Avoid sending popup dialog when data is enabled on currently active
data sim.

Bug: 31736014
Change-Id: I60e9e049f546cb176283bc4c4e20cb2d3e7ac386
2016-10-14 15:41:52 -07:00
Daniel Sandler
0f6ae3aa87 Merge "Suppress notif block/silence settings for essential packages." into nyc-mr1-dev 2016-10-12 13:38:56 +00:00
Doris Ling
12e4bebabf Add static preview images to gesture settings.
Set the animation preview image view to the newly added preview image
instead of loading it from animation video.

Test: manual - launch gesture settings and visually check the animation
preview images.

Bug: 31636637

Change-Id: If25a0e3501bea0c6343326a143d665ec79e3d7c7
2016-10-11 16:44:58 -07:00
Doris Ling
49c0bab8bf Merge "Remove pickup gesture settings if sensor is not found." into nyc-mr1-dev 2016-10-11 23:42:42 +00:00
Doris Ling
94e0da52fc Remove pickup gesture settings if sensor is not found.
Update gesture settings to check for available pickup sensor before
showing pickup gesture settings.

Test: manual - launch gesture settings on different device and check for
pickup preference. Auto test pending.

Bug: 32072298

Change-Id: Iaab0290dcfeb2b0c9195df685f225d092a658347
2016-10-11 14:23:59 -07:00
Nick Kralevich
73dfef91b2 Delete "Show CPU usage"
This functionality hasn't worked since Lollipop.

Bug: 21388590
Change-Id: Ie3684ba0f8b3a5f577462e4cc4a1ceba53931eff
2016-10-11 09:03:29 -07:00
Salvador Martinez
e0b74a6de0 Fixed spans getting stripped from disclaimer
In the support disclaimer the text
"Privacy Policy" and "Terms of Service"
will no longer have their url spans
stripped.

Test: Instrumentation Test
Bug: 31939039
Change-Id: Ifdd9c3b5249d4678b30e677b909d0b58dd2c5edc
2016-10-07 19:30:01 +00:00
Salvador Martinez
8a468ccbdf Merge "Added onClick logic for domain url list screen" into nyc-mr1-dev 2016-10-06 22:37:05 +00:00
Salvador Martinez
26e5760033 Added onClick logic for domain url list screen
This class was created from a code refactoring
in ManageApplications but the functionality
associated with clicking on a preference was
accidently left out. This CL restores that
functionality.

Test: run ManageDomainUrlsEspressoTest class
Bug: 31958776
Change-Id: I1a7f5ee92daeebdb9fd7d9c83a564f0d104aa562
2016-10-05 14:46:34 -07:00
TreeHugger Robot
6cea122bfc Merge "Fix a NPE in confirm lock screen." into nyc-mr1-dev 2016-10-05 19:52:03 +00:00