Commit Graph

51828 Commits

Author SHA1 Message Date
Svetoslav Ganov
598b03d100 am 9bf912c1: am 5ed03384: am 1f514608: am 5a624aad: am 38d30dc5: Merge "Immediately kill a shared user process on a permission revocation." into mnc-dev
* commit '9bf912c1cf6941402dc0f8ef449f34787796875e':
  Immediately kill a shared user process on a permission revocation.
2015-08-07 16:02:04 +00:00
Svetoslav Ganov
9bf912c1cf am 5ed03384: am 1f514608: am 5a624aad: am 38d30dc5: Merge "Immediately kill a shared user process on a permission revocation." into mnc-dev
* commit '5ed0338499b4f6cb8fd9eeedae7c89133c02d247':
  Immediately kill a shared user process on a permission revocation.
2015-08-07 15:55:55 +00:00
Alan Viverette
42a5284cc8 Merge "Always set switch state following drag" 2015-08-07 15:45:37 +00:00
Svetoslav Ganov
1f51460887 am 5a624aad: am 38d30dc5: Merge "Immediately kill a shared user process on a permission revocation." into mnc-dev
* commit '5a624aad5faa0a71ce6495671caac1ccd90544ba':
  Immediately kill a shared user process on a permission revocation.
2015-08-07 15:40:35 +00:00
Alan Viverette
03306a0b27 Always set switch state following drag
Bug: 23029815
Change-Id: Ic291803f02cab2a9ccb96622ac0569e1c78c7291
2015-08-07 11:34:25 -04:00
Svetoslav Ganov
5a624aad5f am 38d30dc5: Merge "Immediately kill a shared user process on a permission revocation." into mnc-dev
* commit '38d30dc547825bdde2756f588692063a28749e8d':
  Immediately kill a shared user process on a permission revocation.
2015-08-07 15:33:48 +00:00
Svetoslav Ganov
38d30dc547 Merge "Immediately kill a shared user process on a permission revocation." into mnc-dev 2015-08-07 15:27:49 +00:00
Svetoslav
aa41add33b Immediately kill a shared user process on a permission revocation.
1. When a permission is revoked we kill the app immediately but do
   not do an immediate kill for shared uid processes. This fixes it.

2. Remove system APIs that are used only by the package installer.

bug:22984670

Change-Id: I3d4ae52ea8679f894aa7c5972941263903479183
2015-08-06 18:47:41 -07:00
Andres Morales
768352fdae am e0a7cfa0: am 981c4561: am 7ab11e45: am 5fd47543: am 85c73c40: Merge "[UserManager] expose method to retrieve credential owner" into mnc-dev
* commit 'e0a7cfa026da56f1197c1feea79f76153c5eddd5':
  [UserManager] expose method to retrieve credential owner
2015-08-06 22:54:53 +00:00
Andres Morales
e0a7cfa026 am 981c4561: am 7ab11e45: am 5fd47543: am 85c73c40: Merge "[UserManager] expose method to retrieve credential owner" into mnc-dev
* commit '981c456170cbe90a850ee21f3b3efd52de659ec4':
  [UserManager] expose method to retrieve credential owner
2015-08-06 22:49:39 +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
Doris Liu
1cbcbf3f4d Merge "Make sure the correct AnimatorListeners gets called" 2015-08-06 22:03:02 +00:00
Doris Liu
6f2276bf79 Make sure the correct AnimatorListeners gets called
This CL fixes the bug where when there're AnimatorSet inside of
AnimatorSet, incorrect AnimatorListeners get notified of the
Animator's lifecycle events.

Bug: 22940651
Bug: 22954352
Change-Id: I2bf66413d54dcfc75dc7fa779e723443763a30a5
2015-08-06 14:42:00 -07:00
Alan Viverette
400997be3c am 1da56c0b: am 3fd42737: am 8a782c9d: am db576e1d: am c7f8133f: Merge "Update anchor background on the correct view in PopupWindow" into mnc-dev
* commit '1da56c0bc9d30649e255d721428a95b79fa668b2':
  Update anchor background on the correct view in PopupWindow
2015-08-06 18:28:25 +00:00
Alan Viverette
1da56c0bc9 am 3fd42737: am 8a782c9d: am db576e1d: am c7f8133f: Merge "Update anchor background on the correct view in PopupWindow" into mnc-dev
* commit '3fd42737b77e499a0f8ed5ef8aa14ebdcf5f7767':
  Update anchor background on the correct view in PopupWindow
2015-08-06 18:19:40 +00:00
David Stevens
456c7a766c Merge "Add keycodes for diagonal dpad inputs" 2015-08-06 18:19:18 +00:00
Doris Liu
ff7913d481 Merge "Exclude delay animation from getChildAnimations() list" 2015-08-06 18:09:08 +00:00
Alan Viverette
8a782c9de4 am db576e1d: am c7f8133f: Merge "Update anchor background on the correct view in PopupWindow" into mnc-dev
* commit 'db576e1d0cead619164afacefdb6215194285a32':
  Update anchor background on the correct view in PopupWindow
2015-08-06 18:02:47 +00:00
Doris Liu
dbf69e4652 Exclude delay animation from getChildAnimations() list
Bug: 22975427
Change-Id: I8bd9a51f0a886873346d77e9452662301a7c0363
2015-08-06 11:02:32 -07:00
Alan Viverette
db576e1d0c am c7f8133f: Merge "Update anchor background on the correct view in PopupWindow" into mnc-dev
* commit 'c7f8133fa1ff78fea5a54974b5987791cb012f84':
  Update anchor background on the correct view in PopupWindow
2015-08-06 17:55:38 +00:00
Alan Viverette
c7f8133fa1 Merge "Update anchor background on the correct view in PopupWindow" into mnc-dev 2015-08-06 17:48:22 +00:00
Wale Ogunwale
6e02fa01a0 Merge changes I4fc1b47e,Icc6d6b25,I8c6bb864
* changes:
  Support for an activity to change and/or query it's associated stack
  Support creating/launching a task with non-fullscreen bounds
  Support finishing a task with any finishing activity in the task.
2015-08-06 17:29:28 +00:00
Dianne Hackborn
a1a9644529 am 74423ccf: am aacc7978: am 41dfffb3: am db6a6a21: am 6b0f1e78: Merge "Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev
* commit '74423ccf95c9d09a52a6a6fbe8ccedb1be88eda9':
  Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult
2015-08-06 17:24:31 +00:00
Dianne Hackborn
74423ccf95 am aacc7978: am 41dfffb3: am db6a6a21: am 6b0f1e78: Merge "Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev
* commit 'aacc797809e5bf2c02735cb3a7d92c5ccefb5116':
  Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult
2015-08-06 17:19:53 +00:00
Dianne Hackborn
41dfffb357 am db6a6a21: am 6b0f1e78: Merge "Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev
* commit 'db6a6a215e9f55b9413e18ca9c67aa3ef31bbefb':
  Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult
2015-08-06 17:00:47 +00:00
Wale Ogunwale
868a5e16c3 Support for an activity to change and/or query it's associated stack
Change-Id: I4fc1b47e5d6196a56a6e40f10fae97219554722c
2015-08-06 09:59:32 -07:00
Wale Ogunwale
706ed79340 Support creating/launching a task with non-fullscreen bounds
Change-Id: Icc6d6b25b5f6f236030e654a3eb3ec7f00287d2f
2015-08-06 09:59:32 -07:00
Wale Ogunwale
ba7881c89e Support finishing a task with any finishing activity in the task.
Change-Id: I8c6bb864de6dc135e0fedb16ee424d7816ee3cfa
2015-08-06 09:59:32 -07:00
Chet Haase
950af418c3 am ddc15988: am f7d8577e: am 42c70645: am aed2e8ba: am da493aa6: Merge "Avoid changing internal state of shared drawable" into mnc-dev
* commit 'ddc1598871be09e132dc49dba011d38007c4335b':
  Avoid changing internal state of shared drawable
2015-08-06 16:56:52 +00:00
Dianne Hackborn
db6a6a215e am 6b0f1e78: Merge "Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev
* commit '6b0f1e78b841a32b45f513d283202e3af90c6a73':
  Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult
2015-08-06 16:53:56 +00:00
Chet Haase
ddc1598871 am f7d8577e: am 42c70645: am aed2e8ba: am da493aa6: Merge "Avoid changing internal state of shared drawable" into mnc-dev
* commit 'f7d8577ed048361ffac711a721acc69f83ab6e01':
  Avoid changing internal state of shared drawable
2015-08-06 16:50:40 +00:00
Dianne Hackborn
6b0f1e78b8 Merge "Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev 2015-08-06 16:48:34 +00:00
Chet Haase
42c70645d2 am aed2e8ba: am da493aa6: Merge "Avoid changing internal state of shared drawable" into mnc-dev
* commit 'aed2e8baedd9cf3fb4472d4215dc9b15da390a94':
  Avoid changing internal state of shared drawable
2015-08-06 16:38:02 +00:00
Alan Viverette
697804e8de Update anchor background on the correct view in PopupWindow
We were always setting the background of the decor view when the
"above anchor" state changed, rather than the background view.

Bug: 22970244
Change-Id: I3cd7202767ee47cb415736bb3c07369801abccd8
2015-08-06 12:36:47 -04:00
Chet Haase
aed2e8baed am da493aa6: Merge "Avoid changing internal state of shared drawable" into mnc-dev
* commit 'da493aa6eab24de98b63cc63c457f5b899da3ad2':
  Avoid changing internal state of shared drawable
2015-08-06 16:29:33 +00:00
Chet Haase
da493aa6ea Merge "Avoid changing internal state of shared drawable" into mnc-dev 2015-08-06 16:23:20 +00:00
Alan Treadway
f67dcd9526 am a544ea9b: am 351c3bd1: am 54f1ffcd: am 2d1cf627: am 190a88d2: Merge "Update documentation of DevicePolicyManager intents." into mnc-dev
* commit 'a544ea9b97342e2cc872f9a527de5960814349ef':
  Update documentation of DevicePolicyManager intents.
2015-08-06 16:20:09 +00:00
Alan Treadway
a544ea9b97 am 351c3bd1: am 54f1ffcd: am 2d1cf627: am 190a88d2: Merge "Update documentation of DevicePolicyManager intents." into mnc-dev
* commit '351c3bd16b4c23d267f3dc2c00a555a82fd7e77e':
  Update documentation of DevicePolicyManager intents.
2015-08-06 16:14:42 +00:00
Alan Treadway
54f1ffcdd6 am 2d1cf627: am 190a88d2: Merge "Update documentation of DevicePolicyManager intents." into mnc-dev
* commit '2d1cf6278587224125da298aba42044aff1d5d8c':
  Update documentation of DevicePolicyManager intents.
2015-08-06 15:59:43 +00:00
Alan Treadway
2d1cf62785 am 190a88d2: Merge "Update documentation of DevicePolicyManager intents." into mnc-dev
* commit '190a88d2ce6a08d0eb98d774b81e5ca6b82b45f8':
  Update documentation of DevicePolicyManager intents.
2015-08-06 15:51:04 +00:00
Alan Treadway
190a88d2ce Merge "Update documentation of DevicePolicyManager intents." into mnc-dev 2015-08-06 15:47:34 +00:00
Alan Treadway
4582f8113d Update documentation of DevicePolicyManager intents.
Add additional information about the intentions of result codes in
device-owner and profile-owner launch intents, in alignment with
changes made in http://ag/732321.

Bug: 21063241
Change-Id: I0e0a931739cee5f46e8fc7622fe1de49e26dcb0a
2015-08-06 16:44:52 +01:00
Chet Haase
bfa11e4ab8 Avoid changing internal state of shared drawable
An optimization in ImageView nulled out the internal bitmap of a cached
internal BitmapDrawable object created to wrap a bitmap set on the ImageView.
However, apps can get ahold of that cached object via Drawable.getBitmap(),
resulting in having the state of that object they may be using changing out
from under them.

The change is to null out the cached object when getDrawable() is called, to avoid
leaking internal state that we may change.
That way, the app can continue to use that object if they want to, but we are no longer
relying on it internally, and will create a new one when needed.

Issue #22930646  [1P Regression from L] ImageView is blanked out in Activity in Google Express

Change-Id: Ic86cb93be4897b6ba247c1fabcda507e4ba01300
2015-08-06 07:55:24 -07:00
Michael Wright
fd650fec6b am d239bb5e: am a7b3694c: am b9bdde13: am 1663c75f: am d5a6df6d: Merge "Make the NullVibrator really null." into mnc-dev
* commit 'd239bb5ebd80a3a4336759c35388772e9bf1c1dc':
  Make the NullVibrator really null.
2015-08-06 14:25:53 +00:00
Michael Wright
d239bb5ebd am a7b3694c: am b9bdde13: am 1663c75f: am d5a6df6d: Merge "Make the NullVibrator really null." into mnc-dev
* commit 'a7b3694c56dfc85a4edbb868815ee3dd0998a5b9':
  Make the NullVibrator really null.
2015-08-06 14:18:50 +00:00
Julia Reynolds
de28e2c455 am 5452a0df: am 4b74d669: am 48d146c9: am c694ab32: am a3b5a612: Merge "Store ringer mode on entering DND mode so it can be restored on exit." into mnc-dev
* commit '5452a0df668dc48a1170dcfcb55e069c246bb5d1':
  Store ringer mode on entering DND mode so it can be restored on exit.
2015-08-06 14:13:52 +00:00
Julia Reynolds
5452a0df66 am 4b74d669: am 48d146c9: am c694ab32: am a3b5a612: Merge "Store ringer mode on entering DND mode so it can be restored on exit." into mnc-dev
* commit '4b74d6693e2ea7248de79332a020672ece19b100':
  Store ringer mode on entering DND mode so it can be restored on exit.
2015-08-06 14:06:19 +00:00
Michael Wright
b9bdde13f5 am 1663c75f: am d5a6df6d: Merge "Make the NullVibrator really null." into mnc-dev
* commit '1663c75fa7e83547f3aefc6128f2b90776de5639':
  Make the NullVibrator really null.
2015-08-06 14:05:21 +00:00