28027 Commits

Author SHA1 Message Date
Julia Reynolds
a3b5a61271 Merge "Store ringer mode on entering DND mode so it can be restored on exit." into mnc-dev 2015-08-06 13:41:01 +00:00
Svetoslav
0e62952aad Pregrant unrevokable storage permission to the CertInstaller
bug:22988119

Change-Id: I310aa7149f67a7918cecfda13c69ab91c7c6e1a8
2015-08-05 19:14:51 -07:00
Jim Miller
6fdb85d383 am 120fc2c7: Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev
* commit '120fc2c74eb290e06cddf1b52d363338f940c612':
  Disable fingerprint when remotely reset by DPM
2015-08-06 01:43:13 +00:00
Jeff Davidson
16ed6a45ae Correctly propagate permissions when uninstalling updates.
In ag/733689, which was intended to fix this bug, the following lines
were removed:

// Propagate the permissions state as we do want to drop on the floor
// runtime permissions. The update permissions method below will take
// care of removing obsolete permissions and grant install permissions.
ps.getPermissionsState().copyFrom(disabledPs.getPermissionsState());

The intent with these lines seemed to be that we needed to copy
permissions from the application on /data, which is being uninstalled,
over to the copy on /system, which was disabled but is being
reenabled. However, it wasn't functional, because it incorrectly
copied from the copy on /system, not the copy on /data.

Restore this code, copying from newPs (the copy on /data) rather than
disbledPs (the copy on /system), and clarify the comment because we do
*not* want to drop runtime permissions on the floor.

Bug: 22665508
Change-Id: I6bae37e70b6df1043c9a2b49255b985707ba151a
2015-08-05 14:33:17 -07:00
Jim Miller
8ae1be1208 Disable fingerprint when remotely reset by DPM
When the device is lost or stolen, it's safer to
fall back to strong authentication (pin, pattern or
password).  This disables fingerprint like we do with
trust agents.

Fixes bug 21620081

Change-Id: I7bbe54be3721b2f160b783daeb3acbe434705046
2015-08-05 20:06:37 +00:00
Yohei Yukawa
a512415e13 am db221acc: Merge "Reduce log spam for the ease of debugging Bug 22857361." into mnc-dev
* commit 'db221acce269245d630e8eb456501c5c6241447b':
  Reduce log spam for the ease of debugging Bug 22857361.
2015-08-05 18:07:16 +00:00
Yohei Yukawa
db221acce2 Merge "Reduce log spam for the ease of debugging Bug 22857361." into mnc-dev 2015-08-05 17:59:23 +00:00
Andres Morales
c5548c02fe [UserManager] expose method to retrieve credential owner
Certain operations (like ConfirmCredential) can be invoked
in the context of a profile, in which case the calling code
needs to know under what profile the credential is registered.

Expose a centralized location for this information for Settings
and GateKeeper to consume.

Bug: 22257554
Change-Id: Iffe4f6a254f52d1269b9287edabcf6efa515d9d2
2015-08-05 10:50:05 -07:00
Svetoslav Ganov
ef7deb90ac am e72377e1: Merge "Fix app ops regressions introduced by the per UID policy change" into mnc-dev
* commit 'e72377e17a837acbe1e537ac737731f6b869fe1e':
  Fix app ops regressions introduced by the per UID policy change
2015-08-05 17:38:31 +00:00
Svetoslav Ganov
e72377e17a Merge "Fix app ops regressions introduced by the per UID policy change" into mnc-dev 2015-08-05 17:22:42 +00:00
Ian Pedowitz
4d2eec1434 am df5a6611: Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""" into mnc-dev
* commit 'df5a66110777554d5b163693ac8395d7c21c328f':
  Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""
2015-08-05 16:48:18 +00:00
Ian Pedowitz
df5a661107 Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""" into mnc-dev 2015-08-05 14:34:13 +00:00
Ian Pedowitz
6cc066df7a Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""
This reverts commit 845d14db9066c3262f270237b52e315aa71508b2.

Bug: 22942480
Bug: 22902898
Change-Id: If2d0e11594284414953c3dd45475fc7ba3366295
2015-08-05 14:25:15 +00:00
Julia Reynolds
9b11fdb56d Store ringer mode on entering DND mode so it can be restored on exit.
Store the value in Settings now, so it's not lost on reboot.
Bug: 22338093

Change-Id: Icc843ef2bf735c23aabf9ceddd82283d51424220
2015-08-05 09:27:23 -04:00
Paul Jensen
86e7d135ac resolved conflicts for merge of dbc4edcc to mnc-dr-dev
Change-Id: I3a8624b2b375e0d174983d7690082e0e6932c4de
2015-08-05 07:07:24 -04:00
Paul Jensen
dbc4edccfc Merge "Fix NOT_RESTRICTED network capability and enforce it." into mnc-dev 2015-08-05 10:03:47 +00:00
Yohei Yukawa
df5af484f8 Reduce log spam for the ease of debugging Bug 22857361.
Now InputMethodManagerService generates the following log
    Couldn't create dir.: /data/system/inputmethod
not only when it fails to create the directory but also when
/data/system/inputmethod already exists, which makes it
difficult for us to figure out the root cause of boot failure
on emulator environments (Bug 22857361).

With this CL, IMMS no longer shows the message when the
directory already exists.  Basically this is no risk change,
which changes only the condition to show the logging message.

Bug: 22857361
Change-Id: I09aaf501b19845c8309b09b57c23077f1757cd1a
2015-08-04 22:13:28 -07:00
Svetoslav
215b44a1c2 Fix app ops regressions introduced by the per UID policy change
1. Add a missing statement in the parsing code

2. Notify for all packages on UID ap op policy change

bug:22957162

Change-Id: Ic2bd5d07ef52be207e66b63ffe45fd8a456eb5a8
2015-08-04 19:06:41 -07:00
Jae Seo
c632313e72 am 2094a702: Merge "Unregister the existing callback when MediaProjection stops" into mnc-dev
* commit '2094a702b33f0bc4e1c22b85a8a6e8bc8988a079':
  Unregister the existing callback when MediaProjection stops
2015-08-05 00:14:13 +00:00
Jae Seo
2094a702b3 Merge "Unregister the existing callback when MediaProjection stops" into mnc-dev 2015-08-05 00:07:11 +00:00
Jeff Sharkey
64e26348bc am 0d616883: Merge "Fix moving of apps into legacy ASEC." into mnc-dev
* commit '0d6168835a6114a9e346278e4613e9175a907fd3':
  Fix moving of apps into legacy ASEC.
2015-08-04 23:38:27 +00:00
Jeff Sharkey
0d6168835a Merge "Fix moving of apps into legacy ASEC." into mnc-dev 2015-08-04 23:27:43 +00:00
Michael Wright
2ccf0c8e63 Don't dispatch when non-interactive and the display is off.
We generally dispatch while the display is off and we're dozing,
under the assumption that the dozing window is controlling the
display state and wants the events as they come in. Unfortunately,
it's possible that we're dozing but something other than the dozing
component has focus, which leads to dropped and cancelled events.
This was preventing media events from being propogated to the media
session under a number of scenarios, so for now we'll just prevent
dispatching entirely while the display is off and the device is in a
non-interactive state. Going forward we should figure out a better
solution so that doze components can continue to receiving input
events throughout their lifecycle, regardless of the display state.

Bug: 22422588
Change-Id: Ia38bd81245234743e84548841d6478f75a6b8775
2015-08-04 23:17:48 +01:00
Jean-Michel Trivi
4032c94d57 am fc5a4bf0: Merge "AudioService: check for audio device connection success" into mnc-dev
* commit 'fc5a4bf0e1520bf3acd75226d760b8e1d7cdd59f':
  AudioService: check for audio device connection success
2015-08-04 20:55:57 +00:00
Jean-Michel Trivi
fc5a4bf0e1 Merge "AudioService: check for audio device connection success" into mnc-dev 2015-08-04 20:45:18 +00:00
Svetoslav Ganov
073bfb9bec am ce68917c: Merge "Ensure per package and per UID state share same package settings." into mnc-dev
* commit 'ce68917c849548d80d9aca14f262d22d9c47c3dc':
  Ensure per package and per UID state share same package settings.
2015-08-04 20:40:45 +00:00
Nick Kralevich
b2c718146b am 97b68bbe: Merge "UsbDeviceManager: fix b/21429947 regression (try #2)" into mnc-dev
* commit '97b68bbe7180ca15ab10d6f65bbdac6c7e64885b':
  UsbDeviceManager: fix b/21429947 regression (try #2)
2015-08-04 20:40:35 +00:00
Jae Seo
ac3f8e5534 Unregister the existing callback when MediaProjection stops
Also removed the unnecessary lock in binderDied.

Bug: 22812934
Change-Id: Ief8856276dbd45a4afa632e51df18bd7d60e6bb1
2015-08-04 13:30:56 -07:00
Svetoslav Ganov
ce68917c84 Merge "Ensure per package and per UID state share same package settings." into mnc-dev 2015-08-04 20:21:44 +00:00
Nick Kralevich
97b68bbe71 Merge "UsbDeviceManager: fix b/21429947 regression (try #2)" into mnc-dev 2015-08-04 19:46:06 +00:00
Julia Reynolds
36fc79e2f8 am 35a1a209: Merge "Include dnd status in bugreports." into mnc-dev
* commit '35a1a2095cb6208a7614c35fe19fced6026d3db1':
  Include dnd status in bugreports.
2015-08-04 18:33:15 +00:00
Julia Reynolds
35a1a2095c Merge "Include dnd status in bugreports." into mnc-dev 2015-08-04 18:27:13 +00:00
Svet Ganov
e7af1942ba Ensure per package and per UID state share same package settings.
When renaming a package during an OTA we were getting in a state
where the package setting mapped to the package UID was not the
same instance as the one we create for the new package mapped.
This leads to a drift between the permissions state for the package
and that state for the UID, resulting in broken for UID permission
checks as granted permissions were never appearing in the per UID
package setting.

bug:22928831

Change-Id: Ib0372632ec84a917304561fd94032cd09bb4c12f
2015-08-04 11:13:47 -07:00
Matthew Williams
d5fe5a8fa1 am fad3c663: Merge "Remove spurious syncmanager wake-ups" into mnc-dev
* commit 'fad3c6638168ad65b4f4677a777b8f2dc7e5c9c9':
  Remove spurious syncmanager wake-ups
2015-08-04 17:46:11 +00:00
Nick Kralevich
1a008c1ca0 UsbDeviceManager: fix b/21429947 regression (try #2)
As discussed in b/21429947 (commit
674019065bceb4150190bfb1aa63cda9de0a8560), MTP must always be
enabled, even if access to the underlying MTP data is disabled.
Otherwise, Android will not enumerate on the USB bus, and won't
receive notifications from the kernel about USB state changes. This
effectively prevents using MTP functionality on user builds, or
on userdebug/eng builds with adb turned off.

Always ensure that MTP is the default driver mode.

Move the DISALLOW_USB_FILE_TRANSFER filtering of mUsbDataUnlocked from
setting time to the time we post the sticky broadcast.

Remove isUsbDataUnlocked(). It essentially duplicates data in the sticky
broadcast.

Bug: 22447614
Bug: 21429947
Change-Id: I9d0d94cadbf6db6281ebd77bfb7162f9d06520c2
2015-08-04 10:36:37 -07:00
Matthew Williams
fad3c66381 Merge "Remove spurious syncmanager wake-ups" into mnc-dev 2015-08-04 17:35:48 +00:00
Jason Monk
5a5e7d64bb Add setting to disable camera gesture
Bug: 22183841
Change-Id: Ibafc5b74cd5cc708e3f884a6d7b2b5c354e04d4a
2015-08-04 11:20:25 -04:00
Ian Pedowitz
682e0237ec am 845d14db: Revert "Permissions: GET_ACCOUNTS permission cleanup"
* commit '845d14db9066c3262f270237b52e315aa71508b2':
  Revert "Permissions: GET_ACCOUNTS permission cleanup"
2015-08-04 14:55:54 +00:00
Ian Pedowitz
845d14db90 Revert "Permissions: GET_ACCOUNTS permission cleanup"
Temporarily revert ag/735253 until b/22902898 can be resolved with a
proper DMAgent prebuilt drop.

This reverts commit e7ed827a104ba005b93faa2edb3bc77f72b240ec.

Bug: 22902898
2015-08-04 07:47:37 -07:00
Paul Jensen
487ffe7d3d Fix NOT_RESTRICTED network capability and enforce it.
With this change:
1. NOT_RESTRICTED should be removed from NetworkRequests that bring up
   special restricted carrier networks (e.g. IMS, FOTA).
2. NetworkRequests without NOT_RESTRICTED require CONNECTIVITY_INTERNAL
   permission to register
3. Binding sockets to networks without NOT_RESTRICTED requires
   CONNECTIVITY_INTERNAL permission

Bug:21637535
Change-Id: I5991d39facaa6b690e969fe15dcbeec52e918321
2015-08-04 07:24:24 -04:00
Pavlin Radoslavov
4e07468fce am 29b8c4ab: Reset the pointer to the Bluetooth GATT service
* commit '29b8c4ab8ac4942e46a9ad4ced795bf06b9f8481':
  Reset the pointer to the Bluetooth GATT service
2015-08-04 04:41:42 +00:00
Pavlin Radoslavov
29b8c4ab8a Reset the pointer to the Bluetooth GATT service
During error recovery, if the mBluetooth pointer is reset to null,
reset the mBluetoothGatt pointer as well.

Bug: 21756298
Change-Id: I26204ba47dd3c5465bb7de30cfa5dc0f07eee2fd
2015-08-04 04:31:12 +00:00
Jeff Sharkey
94dacb1218 Fix moving of apps into legacy ASEC.
Derive the correct current volume UUID for comparison, and only
check for cluster style installs when moving from internal storage.

Bug: 22616484
Change-Id: Idb6be2aa4aaa9b9f47ebbeeebd65c15a60d5d164
2015-08-03 18:28:06 -07:00
Matthew Williams
665d0140ef Remove spurious syncmanager wake-ups
BUG: 22287469
1) Fix SyncManager waking up every 2 hrs if there is nothing
to do.
2) Fix sync wake-up alarm not being properly updated if the new
alarm was in the future.
2a) Due to staus bar sync signal that were removed post-K
one of the wake-ups was for 30s in the future, removed this
@hide intent completely.
3) The SyncManager will still set a timeout alarm for 5mins after
the start of a sync. Leaving this in as to post to a handler is
less expensive but more complex, and the alarm update is
correctly working now.

Change-Id: If51c9dd68391ccaeb480a17eb5a1364c4afe4c2a
2015-08-03 18:15:12 -07:00
Dianne Hackborn
b20a8ed952 am d9b0f843: Merge "Fix issue #22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev
* commit 'd9b0f8435ba9b099512288729af24858a95fd013':
  Fix issue #22860466: viapi security bug - rubber stamping in nested VIs
2015-08-04 01:12:33 +00:00
Dianne Hackborn
d9b0f8435b Merge "Fix issue #22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev 2015-08-04 01:07:36 +00:00
Wale Ogunwale
ce8921c3c0 am 911bd0d3: Merge "Set broadcast nextReceiver correctly when package is disabled" into mnc-dev
* commit '911bd0d3a587a9a58e2bc1cf59615b039ea0e5b2':
  Set broadcast nextReceiver correctly when package is disabled
2015-08-04 01:00:38 +00:00
Dianne Hackborn
b0bc8368f5 am 3011f645: Merge "Fix issue #22912704: "android.process.acore has stopped" dialog keeps popping up" into mnc-dev
* commit '3011f645abe8f976af6f876579a179d51c09bf30':
  Fix issue #22912704: "android.process.acore has stopped" dialog keeps popping up
2015-08-04 01:00:12 +00:00
Jeff Sharkey
d4842c374a am 0faca96f: Merge "Avoid deadlock by broadcasting outside lock." into mnc-dev
* commit '0faca96f939b8530e5387a30e317d852f39f689f':
  Avoid deadlock by broadcasting outside lock.
2015-08-04 00:59:58 +00:00
Wale Ogunwale
911bd0d3a5 Merge "Set broadcast nextReceiver correctly when package is disabled" into mnc-dev 2015-08-04 00:33:48 +00:00