Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
204,065 Commits 3 Branches 0 Tags
ee4e4e79f59a808c4c13db8281ac895047ea199a
Commit Graph

6148 Commits

Author SHA1 Message Date
Kenny Guy
516dfbe39f am 45dab52c: am 9aa0c481: am 43904fd5: Merge "Revert "Deprecate APIs for admin to create users."" into mnc-dev 
* commit '45dab52ce84b4ecc6461260a28f1a8f72158be9f':
  Revert "Deprecate APIs for admin to create users."
 2015-06-29 17:26:01 +00:00
Craig Lafayette
6cdad1244d am 8a42356c: am 5c708248: am bee7245c: Merge "Hide MIME_TYPE_PROVISIONING_NFC_V2" into mnc-dev 
* commit '8a42356c21435ee502efc925f70389a0c0024118':
  Hide MIME_TYPE_PROVISIONING_NFC_V2
 2015-06-29 17:25:53 +00:00
Kenny Guy
0c5877f07b am 24863e12: am 2c594b21: am 01056b36: Merge "Deprecate APIs for admin to create users." into mnc-dev 
* commit '24863e12e51ecf3acb395f0036bbed8b27e23978':
  Deprecate APIs for admin to create users.
 2015-06-29 17:25:46 +00:00
Benjamin Franz
94a20a2efd resolved conflicts for merge of 31706d99 to master 
Change-Id: Ic3acad0d2d82ff8f0e5d31d3490c009d242d860b
 2015-06-29 17:39:31 +01:00
Kenny Guy
45dab52ce8 am 9aa0c481: am 43904fd5: Merge "Revert "Deprecate APIs for admin to create users."" into mnc-dev 
* commit '9aa0c4811097e7754cde0340dfcc32044a7caf7d':
  Revert "Deprecate APIs for admin to create users."
 2015-06-29 13:58:13 +00:00
Craig Lafayette
8a42356c21 am 5c708248: am bee7245c: Merge "Hide MIME_TYPE_PROVISIONING_NFC_V2" into mnc-dev 
* commit '5c708248c32f1a667ea3d49cf6ace28b5d29afd1':
  Hide MIME_TYPE_PROVISIONING_NFC_V2
 2015-06-29 13:57:56 +00:00
Kenny Guy
24863e12e5 am 2c594b21: am 01056b36: Merge "Deprecate APIs for admin to create users." into mnc-dev 
* commit '2c594b214977221773b447bd4cfefb5187911f10':
  Deprecate APIs for admin to create users.
 2015-06-29 13:57:50 +00:00
Benjamin Franz
31706d9921 am 635e4ffc: am b6fb3fe8: Merge "Block assist when screenshots are disabled by policy" into mnc-dev 
* commit '635e4ffcf65bef9cde34a62583ee6dac49cb2592':
  Block assist when screenshots are disabled by policy
 2015-06-29 13:57:33 +00:00
Kenny Guy
43904fd5b7 Merge "Revert "Deprecate APIs for admin to create users."" into mnc-dev 2015-06-29 13:28:54 +00:00
Kenny Guy
2703a13f11 Revert "Deprecate APIs for admin to create users." 
This reverts commit ea864c4d4d.

Change-Id: I827e6364b61eeb9e1b2d3205b5e93e10b1df4bfe
 2015-06-29 13:24:24 +00:00
Craig Lafayette
bee7245c69 Merge "Hide MIME_TYPE_PROVISIONING_NFC_V2" into mnc-dev 2015-06-29 12:48:21 +00:00
Kenny Guy
01056b3662 Merge "Deprecate APIs for admin to create users." into mnc-dev 2015-06-29 12:42:21 +00:00
Benjamin Franz
b6fb3fe8f4 Merge "Block assist when screenshots are disabled by policy" into mnc-dev 2015-06-29 10:29:23 +00:00
Craig Lafayette
3cc72bab48 Hide MIME_TYPE_PROVISIONING_NFC_V2 
Bug: 21918725
Change-Id: I33d67ff8f7b47ab53cff8a2664d342caf9d6e03f
 2015-06-26 14:27:06 -04:00
Dianne Hackborn
d0393181f6 am 3850b7c2: am 8785d214: am ff81025a: Merge "Fix issue #22013372: Assist should take translationX and friends..." into mnc-dev 
* commit '3850b7c2e4ef841b154a3f1fe88493a663b550a5':
  Fix issue #22013372: Assist should take translationX and friends...
 2015-06-26 18:01:40 +00:00
Dianne Hackborn
3850b7c2e4 am 8785d214: am ff81025a: Merge "Fix issue #22013372: Assist should take translationX and friends..." into mnc-dev 
* commit '8785d21453b1928c0bc4e5b5ef1eba93378ea849':
  Fix issue #22013372: Assist should take translationX and friends...
 2015-06-26 17:46:56 +00:00
Kenny Guy
ea864c4d4d Deprecate APIs for admin to create users. 
Bug: 21921868
Change-Id: I956d24a8394d95bf975581a3451ceabe01708a10
 2015-06-26 16:46:01 +00:00
Benjamin Franz
c200f44c46 Block assist when screenshots are disabled by policy 
When a device or profile owner disables screen capture, we also want to
block context data being collected for the assist structure.

Bug: 21797707
Change-Id: Ib8716c6dd71d538a027c04e1e907c87e2afa0ac8
 2015-06-26 11:16:49 +01:00
Dianne Hackborn
70d8be7616 Fix issue #22013372: Assist should take translationX and friends... 
...into account when calculating the position information

Actually what we need here is the full transformation matrix, if it
is available.  And that means actually computing the location of
views on the screen requires doing this all through transformations,
so the AssistVisualizer has been changed to do this (while still
also keeping the old mechanism for comparison to verify that things
are working correctly).

Also added new properties for elevation and alpha.

And optimized the parcelling of AssistStructure to not write things
that aren't needed; this reduces the parcelled size by about half.

Change-Id: I50b0dd2e6599c74701a5d188617a3eff64b07d03
 2015-06-25 20:24:34 -07:00
Man Cao
80bea9cde1 resolved conflicts for merge of 8fb82074 to master 
Change-Id: I27c7ddeead5a589ae8824f87bf6b42998dc081eb
 2015-06-24 17:28:01 -07:00
Mathieu Chartier
8fb8207412 resolved conflicts for merge of 0f14548c to mnc-dev-plus-aosp 
Change-Id: I2f79840f82150eddebfbd549afd1eca28075eb43
 2015-06-24 15:59:18 -07:00
Chris Wren
bb385a7199 am 4d97dbba: am bb9114ff: am 749d66b8: Merge "remove setLatestEventInfo" into mnc-dev 
* commit '4d97dbba00d4f792c0236852d209071224e680ba':
  remove setLatestEventInfo
 2015-06-24 22:52:56 +00:00
Chris Wren
4d97dbba00 am bb9114ff: am 749d66b8: Merge "remove setLatestEventInfo" into mnc-dev 
* commit 'bb9114ff6dcef85f118afa350c33c2c35a68f41d':
  remove setLatestEventInfo
 2015-06-24 22:39:16 +00:00
Adam Lesinski
87344583e1 am 0ebba0e1: am 53d0d065: am b21a77fe: Merge "Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityManager#getPackageImportance()" into mnc-dev 
* commit '0ebba0e1a66ddf912b9fb7c43727054cb2d63556':
  Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityManager#getPackageImportance()
 2015-06-24 22:22:02 +00:00
Chris Wren
749d66b82f Merge "remove setLatestEventInfo" into mnc-dev 2015-06-24 22:17:45 +00:00
Adam Lesinski
0ebba0e1a6 am 53d0d065: am b21a77fe: Merge "Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityManager#getPackageImportance()" into mnc-dev 
* commit '53d0d0655ca33fbf6a1475a6b97f1a956e5c25f5':
  Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityManager#getPackageImportance()
 2015-06-24 22:11:45 +00:00
Adam Lesinski
c30454c104 Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityManager#getPackageImportance() 
Bug:22055550
Change-Id: I1e732e95698daf44bcb223cafde3d3c22746d232
 2015-06-24 13:35:46 -07:00
Man Cao
cfa78b2080 Add an AM option to start with allocation tracking 
The new option "--track-allocation" is to work with the new
allocation tracker in ART.

Bug:20037135
Change-Id: Ic5f8945ab4c1f167c27b05ad0d11d04bac680c1f
 2015-06-24 13:29:29 -07:00
Chris Wren
a05db3816b remove setLatestEventInfo 
This has been deprecated since API 11.

Bug: 18510449
Change-Id: Ibd052572aa8c332daf5f6a604afe1925e8998a2b
 2015-06-24 15:18:34 -04:00
Esteban Talavera
bfd9fd604c am b8abc408: am 833af023: am e4ffec21: Merge "Reset permission policy to default when device owner goes away" into mnc-dev 
* commit 'b8abc408246dc1c5f25aa578015bab652b8b6101':
  Reset permission policy to default when device owner goes away
 2015-06-24 17:12:19 +00:00
Esteban Talavera
b8abc40824 am 833af023: am e4ffec21: Merge "Reset permission policy to default when device owner goes away" into mnc-dev 
* commit '833af023a1ffe0dfa40831c6f71af48e55cc29bb':
  Reset permission policy to default when device owner goes away
 2015-06-24 17:05:23 +00:00
Esteban Talavera
28b9570d02 Reset permission policy to default when device owner goes away 
Otherwise after the Device Owner is gone, runtime
permissions might still be auto granted/denied.
I understand that there are many other policies that
we don't reset after the device/profile owner goes
away (e.g. keyguard enabled/disabled). At least now
we have a single method when we could clear the
ones that we care about.

Bug: 21889278
Change-Id: I6997655e6ef6d474bd25ae1c323eca5b17944b16
 2015-06-24 17:19:19 +01:00
Daniel Sandler
738348d7e0 am 16b3e69f: am af2c0e1b: am 0ec46200: Fix build. 
* commit '16b3e69fd4423b83f984e7955faf1c05f9004c2d':
  Fix build.
 2015-06-24 06:11:49 +00:00
Daniel Sandler
16b3e69fd4 am af2c0e1b: am 0ec46200: Fix build. 
* commit 'af2c0e1b00d33ee0bef572cda267ffe141348ff2':
  Fix build.
 2015-06-24 05:59:13 +00:00
Daniel Sandler
0ec462005d Fix build. 
We don't need purgeResources public since it's part of the
ashmem internal optimization.

Change-Id: I65ba7545cf4801a8b97f3ece9b5ee5100c0f1c97
 2015-06-24 01:27:05 -04:00
Daniel Sandler
5f34ce520b am 46ec5147: am 0e33ef2c: am 25a5f301: Merge "Use ashmem backed bitmaps for passing around notifications" into mnc-dev 
* commit '46ec51475156428355d7510d8994ebbf3ff8aa69':
  Use ashmem backed bitmaps for passing around notifications
 2015-06-24 02:45:00 +00:00
Daniel Sandler
46ec514751 am 0e33ef2c: am 25a5f301: Merge "Use ashmem backed bitmaps for passing around notifications" into mnc-dev 
* commit '0e33ef2c50c886c441e394f6c3ab2b8915f5370a':
  Use ashmem backed bitmaps for passing around notifications
 2015-06-24 02:32:44 +00:00
Daniel Sandler
25a5f30128 Merge "Use ashmem backed bitmaps for passing around notifications" into mnc-dev 2015-06-24 02:09:58 +00:00
Dianne Hackborn
f81d956aa6 am 16649d96: am 1e7b818d: am fcaed606: Merge "Fix issue #20654534: API Review: android.app.assist" into mnc-dev 
* commit '16649d96cbc65b6e8198f1ab12ef09d7d7ed52e5':
  Fix issue #20654534: API Review: android.app.assist
 2015-06-24 00:12:50 +00:00
Dianne Hackborn
16649d96cb am 1e7b818d: am fcaed606: Merge "Fix issue #20654534: API Review: android.app.assist" into mnc-dev 
* commit '1e7b818d86bed180ed9a5ff08f5cbc8e37f21ba5':
  Fix issue #20654534: API Review: android.app.assist
 2015-06-23 23:59:38 +00:00
Dianne Hackborn
fcaed60650 Merge "Fix issue #20654534: API Review: android.app.assist" into mnc-dev 2015-06-23 23:34:22 +00:00
Amith Yamasani
1d69d48596 am ab8d7e31: am af259ee4: am 862ab87b: Merge "Runtime permissions cannot be set on legacy apps by device policy" into mnc-dev 
* commit 'ab8d7e31fb1b6526479844111b177be81a54a31c':
  Runtime permissions cannot be set on legacy apps by device policy
 2015-06-23 21:31:05 +00:00
Dianne Hackborn
2d021f8abf am 3eb5480b: am 4401943e: am a6fb1e70: Merge "Fix issue #20654534: API Review: android.app.assist" into mnc-dev 
* commit '3eb5480b3464e7a29c0940a07cb094d24bc923f7':
  Fix issue #20654534: API Review: android.app.assist
 2015-06-23 21:30:40 +00:00
Xiaohui Chen
2dcc25070e am 5693debd: am b5148fd6: am a2c159fe: Merge "system_server: optimize app idle parole state change" into mnc-dev 
* commit '5693debd7a4c1a95693d91f932af7d43722d8be5':
  system_server: optimize app idle parole state change
 2015-06-23 21:30:02 +00:00
Amith Yamasani
ab8d7e31fb am af259ee4: am 862ab87b: Merge "Runtime permissions cannot be set on legacy apps by device policy" into mnc-dev 
* commit 'af259ee4e4db82f5f5b0d0d4ad03c5f3270d3e45':
  Runtime permissions cannot be set on legacy apps by device policy
 2015-06-23 21:06:59 +00:00
Dianne Hackborn
3eb5480b34 am 4401943e: am a6fb1e70: Merge "Fix issue #20654534: API Review: android.app.assist" into mnc-dev 
* commit '4401943e7723e1ba09469df72db1f4e5b0306016':
  Fix issue #20654534: API Review: android.app.assist
 2015-06-23 21:06:39 +00:00
Xiaohui Chen
5693debd7a am b5148fd6: am a2c159fe: Merge "system_server: optimize app idle parole state change" into mnc-dev 
* commit 'b5148fd6099ae0d6a1979dc98a3ff6ac96558b1e':
  system_server: optimize app idle parole state change
 2015-06-23 21:05:44 +00:00
Dianne Hackborn
8ecf16d186 Fix issue #20654534: API Review: android.app.assist 
Remove the old ViewAssistStructure class.

Change-Id: I5eca7bc7af93cda5f654c9094a3aa07fe4958da2
 2015-06-23 13:09:21 -07:00
Jorim Jaggi
a0d58ae574 Use ashmem backed bitmaps for passing around notifications 
Avoids many copies during IPC and duplicate Java heap consumption in
system_server, SystemUI, etc.

Bug: 18386420
Change-Id: Id5ac9406062d472f7848009d65f12131f5f4dac9
 2015-06-23 19:55:41 +00:00
Amith Yamasani
862ab87bda Merge "Runtime permissions cannot be set on legacy apps by device policy" into mnc-dev 2015-06-23 19:43:41 +00:00