45457 Commits

Author SHA1 Message Date
Ricky Wai
a79a655e4b Catch KeyStoreException for setting profile lock am: c8fa5ed8f2 am: 3b546019dc am: c40b9a8ee2
am: b5ddc22675

Change-Id: Idc10bc9e849e4f5d23bba8ee33a7caf72626428b
2016-11-18 01:52:08 +00:00
Chris Tate
428d4847d4 Merge "Schedule agentDisconnected() in handler thread" am: c02a4a4613 am: 72a838e704 am: 18d0df806e
am: f053fc7133

Change-Id: Ice34a562d184b5228f7ffa2adf47a5e9c1e37a82
2016-11-18 01:47:08 +00:00
Ricky Wai
b5ddc22675 Catch KeyStoreException for setting profile lock am: c8fa5ed8f2 am: 3b546019dc
am: c40b9a8ee2

Change-Id: Ibbdef0242e12ba5e942cb8162e21a34fa30c9a92
2016-11-18 01:47:06 +00:00
Ricky Wai
c40b9a8ee2 Catch KeyStoreException for setting profile lock am: c8fa5ed8f2
am: 3b546019dc

Change-Id: Id668766a96473ae2f68e83dae1ecb547b26de6fc
2016-11-18 01:43:01 +00:00
Chris Tate
f053fc7133 Merge "Schedule agentDisconnected() in handler thread" am: c02a4a4613 am: 72a838e704
am: 18d0df806e

Change-Id: I04b3f4a130f611c917f478e7c31b857a413641b7
2016-11-18 01:42:39 +00:00
Chris Tate
18d0df806e Merge "Schedule agentDisconnected() in handler thread" am: c02a4a4613
am: 72a838e704

Change-Id: I2eda02ea14fb67b1a0192750ae3885ec89f14564
2016-11-18 01:38:05 +00:00
Ricky Wai
3b546019dc Catch KeyStoreException for setting profile lock
am: c8fa5ed8f2

Change-Id: I28777d9d80ba13df463e05b95dd2524633554c9d
2016-11-18 01:38:04 +00:00
Chris Tate
72a838e704 Merge "Schedule agentDisconnected() in handler thread"
am: c02a4a4613

Change-Id: I1e2da0be53678a791dd16be5d00caa5e712fa036
2016-11-18 01:33:29 +00:00
Jorim Jaggi
1b4b23e93e Fix camera not launching immediately from Keyguard
Seems like a line got lost in one of the many refactors :-)

Also adds debug statements for UnknownAppVisibilityController.

Test: Launch camera from lockscreen, make sure no delay.
Change-Id: Idb49b8dcfd2ce351a62d46d93a917a791d38caa1
2016-11-18 01:32:33 +00:00
Chris Tate
c02a4a4613 Merge "Schedule agentDisconnected() in handler thread" 2016-11-18 01:23:31 +00:00
Jeff Sharkey
43ca823f1a Merge "wtf() should not be fatal for core components." 2016-11-18 00:18:42 +00:00
TreeHugger Robot
d5d9469813 Merge "Correctly update database during account rename." 2016-11-18 00:18:11 +00:00
Jeff Sharkey
9ccb85d344 wtf() should not be fatal for core components.
Core system components (such as those marked as "persistent") are
aggressively restarted by the system, so crashing them as a side
effect of wtf() could easily cause system instability.

Instead, this change now treats persistent processes the same as the
system_server; we still log the wtf() event, but we don't crash
the app.

This change also causes wtf() events to be fatal on "eng" builds,
which will result in bugs being caught earlier during development
instead of later during QA testing.

Test: builds, boots, SystemUI no longer crashes
Bug: 32976626
Change-Id: Ib2d1a73379be40556f8dab5d1f15b9ed91ba7082
2016-11-17 17:15:48 -07:00
Ricky Wai
c8fa5ed8f2 Catch KeyStoreException for setting profile lock
When device upgrades from L->N, sid(in gatekeeper) could be 0
even primary profile screenlock is set.
We are now trying to catch the exception so when sid==0 happens,
it will try to tie profile lock again when primary profile is unlocked.

Bug: 32490092
Change-Id: I73011d872ac15e7e09be9bda0165cf7f6a75493a
2016-11-18 00:02:24 +00:00
Dmitry Dementyev
cf50dcf502 Correctly update database during account rename.
Bug: https://b.corp.google.com/issues/32907996

Test: Verified with CTS tests.
Change-Id: I3ef8890b9a68d17208a5681a39a0895feaff5fa1
2016-11-17 14:23:14 -08:00
TreeHugger Robot
29993074b0 Merge "Keep track of admin actions for DO disclosures" 2016-11-17 21:40:46 +00:00
TreeHugger Robot
5bec219934 Merge "Phase-2 API takes a hostname" 2016-11-17 20:39:54 +00:00
TreeHugger Robot
61e5f71292 Merge "Fixed NPE in ActivityStarter.updateTaskReturnToType()" 2016-11-17 20:31:53 +00:00
Bartosz Fabianowski
b21b241f0f Keep track of admin actions for DO disclosures
This CL adds bookkeeping to DPMS which will allow us to tell the user
in the Settings UI whether/when the admin requested a bug report or
retrieved logs from the device.

Bug: 32692748
Test: Full DevicePolicyManagerTest unit test coverage; end-to-end tests
        will follow as Settings CTS verifier tests

Change-Id: I89728fce4b7e0ff061b354c73caf3742e95a3a3e
2016-11-17 20:52:03 +01:00
Todd Kennedy
194e4eeb0e Phase-2 API takes a hostname
For phase-2, instead of taking a hash prefix, we will send the
hostname to the resolver.

Bug: 25119046
Test: build & install the sample resolver and run 'adb shell am start -a android.intent.action.VIEW -c android.intent.category.BROWSABLE -d "https://www.tripadvisor.com/Tourism-g33020-San_Jose_California-Vacations.html"'
Change-Id: I6e621139e182f9a9cfcf608c26d4763f1379bdb2
2016-11-17 10:56:37 -08:00
Wale Ogunwale
cdc0ddca91 Fixed NPE in ActivityStarter.updateTaskReturnToType()
Bug: 30834977
Test: Manual testing of condition in bug.
Change-Id: I4b46a380fa0b52d983965dfb056b461c53afcd05
2016-11-17 10:34:58 -08:00
Jerry Zhang
e05713d93b Merge "Merge commit '6bb98d85a0a0790ed2b600f4a165ab79ad536f04' into manual_merge_6bb98d8" 2016-11-17 18:30:16 +00:00
Nicolas Prévot
554140fc89 Merge "Check user restriction DISALLOW_REMOVE_USER in isProvisioningAllowed." 2016-11-17 11:35:42 +00:00
TreeHugger Robot
6bc6b6fe5a Merge "Report boot statistics" 2016-11-17 01:39:12 +00:00
Jerry Zhang
bb2965d239 Merge commit '6bb98d85a0a0790ed2b600f4a165ab79ad536f04' into manual_merge_6bb98d8
Change-Id: I43ad588644c03a2174146525ad62b3d512d66074
2016-11-16 17:37:54 -08:00
Jerry Zhang
54f33d9af2 Refactored setCurrentFunction and setUsbDataUnlocked into single method. am: 935372bfd6 am: 5cbd151d40
am: fb4a03c8f8

Change-Id: Ibdcd5074ceb48457227319f0869c6cbc62045954
2016-11-17 00:39:07 +00:00
Jerry Zhang
e35770642d Clean up persistent usb state on boot. am: dfacad026d am: b15490ac4d
am: 5d77efb3d9

Change-Id: I7e941f2d1491d4b0fa9b97577ac0e9cca3569673
2016-11-17 00:38:06 +00:00
Jerry Zhang
6bb98d85a0 Fixed handling of usb state during adb changes. am: 0269ebe0fe am: 4389cb6c9a
am: dbcbadbb99

Change-Id: Ia923cadf6131f4feeeff5b3d90ba0701c6ea8622
2016-11-17 00:37:01 +00:00
Jerry Zhang
fb4a03c8f8 Refactored setCurrentFunction and setUsbDataUnlocked into single method. am: 935372bfd6
am: 5cbd151d40

Change-Id: Ie2920ff5a89c5eee28a31803f9775920289e41c4
2016-11-17 00:24:41 +00:00
Jerry Zhang
5d77efb3d9 Clean up persistent usb state on boot. am: dfacad026d
am: b15490ac4d

Change-Id: I2fd38cd6b27685206f6aa5f11daecbc7654749d1
2016-11-17 00:23:47 +00:00
Jerry Zhang
dbcbadbb99 Fixed handling of usb state during adb changes. am: 0269ebe0fe
am: 4389cb6c9a

Change-Id: Ie93d9df3fad63ba937b3069695744d5cadd2796c
2016-11-17 00:22:53 +00:00
Jerry Zhang
5cbd151d40 Refactored setCurrentFunction and setUsbDataUnlocked into single method.
am: 935372bfd6

Change-Id: I5436278e092f691c9179f7cc3709c4578b544e74
2016-11-17 00:12:50 +00:00
Jerry Zhang
b15490ac4d Clean up persistent usb state on boot.
am: dfacad026d

Change-Id: I762306bc76e304c6491c8af18e82bf2e0c4b433e
2016-11-17 00:11:15 +00:00
Jerry Zhang
4389cb6c9a Fixed handling of usb state during adb changes.
am: 0269ebe0fe

Change-Id: I2fc3674c4d5cc63febe2ebf47576f3cf1bcd1da2
2016-11-17 00:10:25 +00:00
Jerry Zhang
b37d826204 Merge changes from topic 'usb_bugfixes-mirror-aosp-master'
* changes:
  Refactored setCurrentFunction and setUsbDataUnlocked into single method.
  Clean up persistent usb state on boot.
  Fixed handling of usb state during adb changes.
2016-11-16 23:59:33 +00:00
Todd Kennedy
3e12f413d4 Merge "Implement 2-phase resolution" 2016-11-16 23:05:34 +00:00
Wale Ogunwale
782b247fdb Merge "Fixed issue with IME displaying on-top of nav bar." 2016-11-16 21:58:07 +00:00
Wale Ogunwale
93726a41a0 Merge "Don't include sysUI insets on secondary displays" 2016-11-16 21:56:55 +00:00
Wale Ogunwale
44fbdf5b1e Fixed issue with IME displaying on-top of nav bar.
Caused by some recent refactoring. We now make sure the IME
has the higher animation layer in its base layer of the window
it is targeting.
Also, consolidated some of our test functions.

Bug: 32916670
Test: bit FrameworksServicesTests:com.android.server.wm.WindowLayersControllerTests
Change-Id: I0b1abd6fead981cfc810488cc785261abba5341d
2016-11-16 20:38:50 +00:00
Chad Brubaker
c41c889b3e Merge "Use a 16 byte random suffix for installed apk directory name" 2016-11-16 18:38:21 +00:00
Fyodor Kupolov
de4355dd59 Merge "Log when priv permission is not whitelisted" 2016-11-16 18:24:55 +00:00
Fyodor Kupolov
b633f9d01f Log when priv permission is not whitelisted
Log violations for now, we will start enforcing it later.

Test: Manual - device boots
Bug: 32935038
Bug: 32935364
Change-Id: I1957c334f98852a5a87e093e24c72dd2c223c08b
2016-11-16 18:22:36 +00:00
Chad Brubaker
5e10e8f1b2 Use a 16 byte random suffix for installed apk directory name
This prevents apps (both normal and ephemeral) from learning what
applications are installed by checking for the existence of
/data/app/com.example.package-1. /data/app and /data/ephemeral-app are
already 771 and so cannot be ls'd but because the directory names are
guessable it is still possible to learn if known packages are installed.

Apps can still learn if a package is installed and where via the
standard APIs but not by directly using the filesystem. This is
important for ephemeral apps since normal apps should not be aware of
installed ephemeral apps (unless needed) and ephemeral apps shouldn't be
aware of other ephemeral apps.

Test: adb install --ephemeral, verify the code directory has random
suffix
Test: runtest -c android.content.pm.PackageManagerTests frameworks-core
Test: cts-tradefed run commandAndExit cts -m CtsAppSecurityTestCases
Change-Id: Id4883f5cfb9664307cf8518e2db3fef0e2d632d0
2016-11-16 09:50:17 -08:00
Nicolas Prevot
56400a445f Check user restriction DISALLOW_REMOVE_USER in isProvisioningAllowed.
If DISALLOW_REMOVE_USER is set and there is already a managed profile:
isProvisioningAllowed() should return false

BUG:32629873
Test: adb shell am instrument -e class com.android.server.devicepolicy.DevicePolicyManagerTest -w
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I093bed0a4a54f83decf11716ebfd50dd4f17c089
2016-11-16 12:12:41 +00:00
Michal Karpinski
75ec5465f0 Merge "Fix disabling DO single user features when clearDeviceOwner() is called" 2016-11-16 11:46:18 +00:00
TreeHugger Robot
52f9473e57 Merge "Use StartFuseBridgeLoop function instead of FuseBridgeLoop class." 2016-11-16 05:30:09 +00:00
Andrii Kulian
db8e106fa3 Don't include sysUI insets on secondary displays
Currently there is a single instance of WindowManagerPolicy
used in Window Manager and it is configured according to
primary display settings. Because of that it reports display
size with navigation bar insets even for secondary displays.

This CL adds displayId param, so it can adjust reported metrics
correctly when requested.

Bug: 32910901
Test: android.display.cts.DisplayTest
Change-Id: I14967fc13907c4fde17aed6a769d03cbde3ec1be
2016-11-16 05:04:03 +00:00
longhai
1d687df2f7 Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA." am: 1813ae0159 am: 2be54fde72 am: 5c152a3d7f
am: d7e2ae5fc7

Change-Id: I9b24f761959dfe7a88509b65273e31916d9ddfc1
2016-11-16 03:28:17 +00:00
TreeHugger Robot
26c48fac73 Merge changes I99813278,I6285042b
* changes:
  Fix copypasta error.
  Aggressively clear cached data when forgetting.
2016-11-16 03:21:17 +00:00
longhai
d7e2ae5fc7 Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA." am: 1813ae0159 am: 2be54fde72
am: 5c152a3d7f

Change-Id: Ida06ea3d42d66cb2f1cc124fe3498e579141d16c
2016-11-16 03:18:08 +00:00