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

6171 Commits

Author SHA1 Message Date
Svet Ganov
fc72ce8bbd am 49316d83: am ab4f6ff0: am 4a23ac45: Merge "Installer is a part of the system with unrevocable permissions" into mnc-dev 
* commit '49316d83d518110c64fab92c423ebd263ee3b7cf':
  Installer is a part of the system with unrevocable permissions
 2015-06-30 19:56:47 +00:00
Svet Ganov
49316d83d5 am ab4f6ff0: am 4a23ac45: Merge "Installer is a part of the system with unrevocable permissions" into mnc-dev 
* commit 'ab4f6ff013860e5fbb72542d9c47165a47244b0f':
  Installer is a part of the system with unrevocable permissions
 2015-06-30 19:44:27 +00:00
Svet Ganov
4a23ac4589 Merge "Installer is a part of the system with unrevocable permissions" into mnc-dev 2015-06-30 19:24:05 +00:00
Svet Ganov
3fc85e6f1a am fb498a31: am c5c89955: am b24ff7e0: Merge "Add read/write external storage app ops" into mnc-dev 
* commit 'fb498a311df525953900c0a186d3765e3a37ac56':
  Add read/write external storage app ops
 2015-06-30 17:37:04 +00:00
Svet Ganov
fb498a311d am c5c89955: am b24ff7e0: Merge "Add read/write external storage app ops" into mnc-dev 
* commit 'c5c8995510943527f99e51b04809dae090f0c2ab':
  Add read/write external storage app ops
 2015-06-30 17:23:30 +00:00
Svet Ganov
6a166af8fd Installer is a part of the system with unrevocable permissions 
1. Mark the installer permissions as not revocable.

2. Make the permission result dispatch more robust to handle installer death.

bug:22012614

Change-Id: Idee30ca884b87ccf97ba1bb878d4c49912e474b8
 2015-06-30 10:15:49 -07:00
Svet Ganov
b24ff7e03a Merge "Add read/write external storage app ops" into mnc-dev 2015-06-30 16:50:17 +00:00
George Mount
19accae7b3 am 7f8f9e5b: am aa315dbb: am 0303d9ce: Merge "Fix FragmentTransaction replace() behavior" into mnc-dev 
* commit '7f8f9e5b1372d44caf94186b4dfeaaa508a4b216':
  Fix FragmentTransaction replace() behavior
 2015-06-30 14:57:46 +00:00
George Mount
7f8f9e5b13 am aa315dbb: am 0303d9ce: Merge "Fix FragmentTransaction replace() behavior" into mnc-dev 
* commit 'aa315dbb361e447b6442efc562b41d9b6fedf4e4':
  Fix FragmentTransaction replace() behavior
 2015-06-30 14:45:46 +00:00
George Mount
0303d9ce70 Merge "Fix FragmentTransaction replace() behavior" into mnc-dev 2015-06-30 14:21:49 +00:00
Kenny Guy
679a5af472 am 2b3eccae: am d0418e8c: am 31659c25: Merge "Deprecate APIs for admin to create users." into mnc-dev 
* commit '2b3eccaec6eb43530d3a693ffe9310031e05e592':
  Deprecate APIs for admin to create users.
 2015-06-30 13:36:49 +00:00
Kenny Guy
2b3eccaec6 am d0418e8c: am 31659c25: Merge "Deprecate APIs for admin to create users." into mnc-dev 
* commit 'd0418e8cf9a250183a2fc3d7474f82dc9e2da734':
  Deprecate APIs for admin to create users.
 2015-06-30 13:25:21 +00:00
Kenny Guy
31659c253e Merge "Deprecate APIs for admin to create users." into mnc-dev 2015-06-30 13:03:32 +00:00
Esteban Talavera
c4bb8de0d2 am 283b7ace: am 37fd8bd1: am fef8cbd6: Merge "Marking some globals from setGlobalSetting as not supported" into mnc-dev 
* commit '283b7ace805d9afd972cccf906a241c34761c7af':
  Marking some globals from setGlobalSetting as not supported
 2015-06-30 10:12:40 +00:00
Esteban Talavera
283b7ace80 am 37fd8bd1: am fef8cbd6: Merge "Marking some globals from setGlobalSetting as not supported" into mnc-dev 
* commit '37fd8bd182c110b98772876f3fa47cc4d54042bc':
  Marking some globals from setGlobalSetting as not supported
 2015-06-30 09:56:10 +00:00
Esteban Talavera
fef8cbd6a6 Merge "Marking some globals from setGlobalSetting as not supported" into mnc-dev 2015-06-30 08:55:38 +00:00
Andreas Gampe
60b5cabb4c am 9958e75b: am 97378a62: am 6feb4301: Merge "Frameworks/base: Remove UsageEvents finalizer" into mnc-dev 
* commit '9958e75b51029fca7bd130e37c5d5b3ca24e2788':
  Frameworks/base: Remove UsageEvents finalizer
 2015-06-30 06:12:40 +00:00
Andreas Gampe
9958e75b51 am 97378a62: am 6feb4301: Merge "Frameworks/base: Remove UsageEvents finalizer" into mnc-dev 
* commit '97378a628bc7edeb109af2bae32ec920970158bb':
  Frameworks/base: Remove UsageEvents finalizer
 2015-06-30 05:58:53 +00:00
Andreas Gampe
373fb40947 Frameworks/base: Remove UsageEvents finalizer 
The order of finalization between the parcel and the UsageEvents
objects is not defined. In the bad case, the parcel will be
finalized first and destroy its native pointer, after which the
UsageEvents object will recycle it, putting it back into one of
the Parcel pools. This will violate the pool invariant.

Bug: 22088355
Change-Id: Ifbe7822990cdfc31855d6742dcdea9d9dd0daf1b
 2015-06-29 22:07:30 -07:00
Svet Ganov
921c7dfc80 Add read/write external storage app ops 
bug:22104418

Change-Id: Ic9088f95bc02622c1163c1393e44382df6597707
 2015-06-29 21:51:45 -07:00
Eddie Ringle
22369d519d Fix FragmentTransaction replace() behavior 
Bug 22174959

According to FragmentTransaction's reference, replace()
should be equivalent to remove()'ing every fragment in
a given container and then adding the specified fragment
to replace those that were removed.

Commit ee76efb74b broke
this intended behavior in the framework.

This patch makes it so that the removal loop doesn't
end prematurely. It also fixes an issue where the
replace operation would remove fragments regardless
of their container after encountering the first fragment
with a matching container ID.

Relevant issues:
http://b.android.com/43265
http://b.android.com/52112
http://b.android.com/53393
http://b.android.com/68856
http://b.android.com/70803

Change-Id: Ica4691746ab8979ed974a998e85324e4feacc5e3
Signed-off-by: Eddie Ringle <eddie.ringle@gmail.com>
 2015-06-29 13:13:01 -07:00
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
Esteban Talavera
656fa7f5d1 Marking some globals from setGlobalSetting as not supported 
Those globals don't have the intended behaviour any more.

Bug: 19967818
Change-Id: I8c7891e59280f9deb88b1f0ffead3de07f4eca56
 2015-06-29 17:41:39 +01: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
14f48e5a93 Deprecate APIs for admin to create users. 
Bug: 21921868
Change-Id: I0a59c85f6a87928de3df72278d4b65355ff7270f
 2015-06-29 15:11:25 +00: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