drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
199,621 Commits 1 Branch 0 Tags
Commit Graph

28087 Commits

Author SHA1 Message Date
Jeff Davidson
22d207747f am 20de377b: am 1d7c3254: Merge "Correctly propagate permissions when uninstalling updates." into mnc-dev 
* commit '20de377beb17273a2d2dcd5715c418eec1ac897e':
  Correctly propagate permissions when uninstalling updates.
 2015-08-07 01:55:07 +00:00
Jeff Davidson
20de377beb am 1d7c3254: Merge "Correctly propagate permissions when uninstalling updates." into mnc-dev 
* commit '1d7c32548c30c62a35c54a624f89d5f9db31b9d4':
  Correctly propagate permissions when uninstalling updates.
 2015-08-07 01:46:58 +00:00
Jeff Davidson
1d7c32548c Merge "Correctly propagate permissions when uninstalling updates." into mnc-dev 2015-08-07 01:39:14 +00:00
Wale Ogunwale
10068894a2 am 60f7eb38: am a0ef49c4: Look for recent tasks in live stacks. 
* commit '60f7eb38a9afdae504ce4412afe862e759fd8ff3':
  Look for recent tasks in live stacks.
 2015-08-07 01:23:01 +00:00
Wale Ogunwale
60f7eb38a9 am a0ef49c4: Look for recent tasks in live stacks. 
* commit 'a0ef49c44f7d845e3465591ea977d0c9996c4e5e':
  Look for recent tasks in live stacks.
 2015-08-07 01:13:35 +00:00
Wale Ogunwale
a0ef49c44f Look for recent tasks in live stacks. 
It is possible for a tasks not to have been saved to the
persisted recent list yet for various reasons. This causes
some external calls to fail when they are trying to do
an operation on a task with a given id. We now use the
stack supervisor look-up for a task id that checks
everywhere a task might be including live stack. It this
fails then the task truly doesn't exist.

Bug: 22924782
Change-Id: I57c3df41d0b4f3ee3c5ae9b7d01eeb2b352062b4
 2015-08-07 00:26:01 +00:00
Andres Morales
7ab11e45bd am 5fd47543: am 85c73c40: Merge "[UserManager] expose method to retrieve credential owner" into mnc-dev 
* commit '5fd4754310a9b19c7b880197e5bd237e2959c040':
  [UserManager] expose method to retrieve credential owner
 2015-08-06 22:36:08 +00:00
Andres Morales
5fd4754310 am 85c73c40: Merge "[UserManager] expose method to retrieve credential owner" into mnc-dev 
* commit '85c73c40d1fd76e8a7bbd90ab80458082764c1c3':
  [UserManager] expose method to retrieve credential owner
 2015-08-06 22:30:59 +00:00
Andres Morales
85c73c40d1 Merge "[UserManager] expose method to retrieve credential owner" into mnc-dev 2015-08-06 22:22:17 +00:00
Chris Wren
8a38babb50 am 062130d9: am 93f3fc87: Merge "add metrics to assistant" into mnc-dev 
* commit '062130d95d239d42a9ac3bd6211c70ca61cd3b89':
  add metrics to assistant
 2015-08-06 19:28:33 +00:00
Benjamin Franz
a17c5bac6e am dc89dafa: am 339a9bbf: Merge "Use realActivity as indicator for task locking" into mnc-dev 
* commit 'dc89dafaa3d95fe88eaa82b888098ffe9f07e4f5':
  Use realActivity as indicator for task locking
 2015-08-06 19:28:29 +00:00
Chris Wren
062130d95d am 93f3fc87: Merge "add metrics to assistant" into mnc-dev 
* commit '93f3fc876639cd23ff176cba2e1f8f08df6f3fb5':
  add metrics to assistant
 2015-08-06 19:25:08 +00:00
Svetoslav Ganov
cee6655097 am 8695ec34: am 38c0fbda: Merge "Pregrant unrevokable storage permission to the CertInstaller" into mnc-dev 
* commit '8695ec34cf0460ec7687b578475d71c4c09cb773':
  Pregrant unrevokable storage permission to the CertInstaller
 2015-08-06 19:23:08 +00:00
Benjamin Franz
dc89dafaa3 am 339a9bbf: Merge "Use realActivity as indicator for task locking" into mnc-dev 
* commit '339a9bbf6d6544b516d6dbbae874d02f3ef7a6a4':
  Use realActivity as indicator for task locking
 2015-08-06 19:20:38 +00:00
Chris Wren
93f3fc8766 Merge "add metrics to assistant" into mnc-dev 2015-08-06 19:18:17 +00:00
Benjamin Franz
339a9bbf6d Merge "Use realActivity as indicator for task locking" into mnc-dev 2015-08-06 19:15:29 +00:00
Svetoslav Ganov
8695ec34cf am 38c0fbda: Merge "Pregrant unrevokable storage permission to the CertInstaller" into mnc-dev 
* commit '38c0fbda53399ac888e112d235e217fea220c2b7':
  Pregrant unrevokable storage permission to the CertInstaller
 2015-08-06 19:12:25 +00:00
Chris Wren
a35c96eb90 add metrics to assistant 
long press
  screenshot enabled
  context enabled

Bug: 22949579
Change-Id: Iac178207fa7149cda03c9a817a0d1450e46e1c59
 2015-08-06 15:11:42 -04:00
Svetoslav Ganov
38c0fbda53 Merge "Pregrant unrevokable storage permission to the CertInstaller" into mnc-dev 2015-08-06 19:08:33 +00:00
Benjamin Franz
6fd84cc878 Use realActivity as indicator for task locking 
When lock task mode is started, we verify that the package is
whitelisted and currently use mCallingPackage as indicator. However,
the calling package is not necessarily identical to the package trying
to lock itself, so lock task mode sometimes fails. Switching over to
using realActivity as package marker.

Bug: 22916291
Change-Id: Ifd4df2d634842c8106b0b0f690bcf1faba0ed5fa
 2015-08-06 18:09:03 +01:00
Michael Wright
43a95cf1cd am 44a14ef7: am eb7e3d7e: Merge "Don\'t dispatch when non-interactive and the display is off." into mnc-dev 
* commit '44a14ef7b4b5e85bb79c954f99929ec309c42c2e':
  Don't dispatch when non-interactive and the display is off.
 2015-08-06 14:05:17 +00:00
Michael Wright
44a14ef7b4 am eb7e3d7e: Merge "Don\'t dispatch when non-interactive and the display is off." into mnc-dev 
* commit 'eb7e3d7e456177f7848834759b9a7f6f78a05f7a':
  Don't dispatch when non-interactive and the display is off.
 2015-08-06 13:58:01 +00:00
Julia Reynolds
48d146c9d6 am c694ab32: am a3b5a612: Merge "Store ringer mode on entering DND mode so it can be restored on exit." into mnc-dev 
* commit 'c694ab32846da54f7fc00dea42ded9b98c6f148f':
  Store ringer mode on entering DND mode so it can be restored on exit.
 2015-08-06 13:54:43 +00:00
Michael Wright
eb7e3d7e45 Merge "Don't dispatch when non-interactive and the display is off." into mnc-dev 2015-08-06 13:50:37 +00:00
Julia Reynolds
c694ab3284 am a3b5a612: Merge "Store ringer mode on entering DND mode so it can be restored on exit." into mnc-dev 
* commit 'a3b5a61271bde79ef1072b13ed14525ce53bf62b':
  Store ringer mode on entering DND mode so it can be restored on exit.
 2015-08-06 13:48:41 +00:00
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
5f96eb0caf am 6fdb85d3: am 120fc2c7: Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev 
* commit '6fdb85d383007e7d68895195d6347840276abeab':
  Disable fingerprint when remotely reset by DPM
 2015-08-06 01:57:54 +00: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
721a1fcd88 am a512415e: am db221acc: Merge "Reduce log spam for the ease of debugging Bug 22857361." into mnc-dev 
* commit 'a512415e13def82532e89fa763f3c8b5ce8bcc7c':
  Reduce log spam for the ease of debugging Bug 22857361.
 2015-08-05 18:16:33 +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
e7359b09c7 am ef7deb90: am e72377e1: Merge "Fix app ops regressions introduced by the per UID policy change" into mnc-dev 
* commit 'ef7deb90ac000b5977208e965e0bd84e247140e9':
  Fix app ops regressions introduced by the per UID policy change
 2015-08-05 17:43:36 +00: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
76b0770558 am 4d2eec14: am df5a6611: Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""" into mnc-dev 
* commit '4d2eec1434f08667999b9cc51e6cf6f7146003e5':
  Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""
 2015-08-05 16:55:22 +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
9529773222 am 86e7d135: resolved conflicts for merge of dbc4edcc to mnc-dr-dev 
* commit '86e7d135acbdb0055de6a687817d44ac60603c9f':
  Fix NOT_RESTRICTED network capability and enforce it.
 2015-08-05 11:24:18 +00: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
229347ec31 am c632313e: am 2094a702: Merge "Unregister the existing callback when MediaProjection stops" into mnc-dev 
* commit 'c632313e7294d191fb616bf53b1b9d99ef1ed24a':
  Unregister the existing callback when MediaProjection stops
 2015-08-05 00:21:53 +00: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