Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
200,734 Commits 3 Branches 0 Tags
b9d00da051cb647142b2f37bb1852a2d765ecdea
Commit Graph

49392 Commits

Author SHA1 Message Date
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
4d97dbba00 am bb9114ff: am 749d66b8: Merge "remove setLatestEventInfo" into mnc-dev 
* commit 'bb9114ff6dcef85f118afa350c33c2c35a68f41d':
  remove setLatestEventInfo
 2015-06-24 22:39:16 +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
b21a77fefc Merge "Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityManager#getPackageImportance()" into mnc-dev 2015-06-24 21:32:38 +00:00
Christopher Tate
425bd87661 am d1741ef9: am 1af5fe23: Merge "Require that verified intent filters only have http/https <data> decls" into mnc-dev 
* commit 'd1741ef961423db062053ffb0607cd5dd5b927e9':
  Require that verified intent filters only have http/https <data> decls
 2015-06-24 20:55:53 +00:00
Mathieu Chartier
9a65f9ddd0 Merge "Add an AM option to start with allocation tracking" 2015-06-24 20:55:38 +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
Alex Klyubin
47686420b2 am 0a6ac701: am d4e9e0e1: Merge "Keymaster INT, LONG and DATE tag values are unsigned." into mnc-dev 
* commit '0a6ac7013b9c42932b18a5a2e35cca9aac0f9337':
  Keymaster INT, LONG and DATE tag values are unsigned.
 2015-06-24 20:27:58 +00:00
Christopher Tate
413020a6ca Require that verified intent filters only have http/https <data> decls 
It is malformed to write a single intent filter like this:

  <intent-filter android:autoVerify="true">
    <data android:host="foo.example"
          android:path="/"
          android:scheme="http" />
    <data android:host="*"
          android:path="/custom"
          android:scheme="fooexamplecustomscheme" />
  </intent-filter>

In practice this app is accidentally defining a filter that will match
"http://*".  This is now detected, and will never be auto-verified for
any of the mentioned domains.

Verified intent filters must *only* handle the http & https schemes.

Bug 21920537

Change-Id: I933cddbea23185d242565cac940e1e7a7e4e289b
 2015-06-24 13:16:20 -07:00
Alex Klyubin
d4e9e0e1d6 Merge "Keymaster INT, LONG and DATE tag values are unsigned." into mnc-dev 2015-06-24 20:03:10 +00: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
Alan Viverette
ff9b80d3be am 44863749: am 9bf9a3a9: Merge "Constrain FastScroller max width to be >= 0" into mnc-dev 
* commit '448637498e66a8b5d2914ed0a99238c0a95c1133':
  Constrain FastScroller max width to be >= 0
 2015-06-24 18:49:35 +00:00
Alan Viverette
9bf9a3a99e Merge "Constrain FastScroller max width to be >= 0" into mnc-dev 2015-06-24 18:22:33 +00:00
Alan Viverette
c98922ba2f Constrain FastScroller max width to be >= 0 
Bug: 22055552
Change-Id: Ib0bba93e5490ad9d8668c9532f23654a8cb702d9
 2015-06-24 10:22:02 -07: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
e4ffec210e Merge "Reset permission policy to default when device owner goes away" into mnc-dev 2015-06-24 16:42:36 +00:00
Michael Wright
bc12a725e7 am 02791a78: am 5edd0e06: Merge "Add new SOURCE_BLUETOOTH_STYLUS." into mnc-dev 
* commit '02791a78f1673ff970446df7025edee19861cca1':
  Add new SOURCE_BLUETOOTH_STYLUS.
 2015-06-24 16:34:18 +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
Michael Wright
5edd0e06d5 Merge "Add new SOURCE_BLUETOOTH_STYLUS." into mnc-dev 2015-06-24 16:12:22 +00:00
Andrei Stingaceanu
6517e67c1b am f7ed99e6: am 2e561546: Merge "Floating toolbar shown after rotation in extract mode" into mnc-dev 
* commit 'f7ed99e6bc20f4692b0564b3eb18b1de2cd47129':
  Floating toolbar shown after rotation in extract mode
 2015-06-24 09:58:04 +00:00
Andrei Stingaceanu
2e5615467e Merge "Floating toolbar shown after rotation in extract mode" into mnc-dev 2015-06-24 09:16:36 +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
Alex Klyubin
ae6cb7aad5 Keymaster INT, LONG and DATE tag values are unsigned. 
This CL ensures that Android Keystore framework code complies with
signedness of keymaster tags. In particular:
* INT tags are unsigned 32-bit numbers, and
* LONG and DATE tags are unsigned 64-bit numbers.

The ensure compliance, KeymasterArguments and KeyCharacteristics
classes through which Android Keystore interacts with Keymaster tags
have been modified as follows:
* ENUM and INT tags which used to be conflated are now added/queried
  via separate methods, because ENUM can remain represented as an int
  data type whereas INT is now represented as a long data type with
  permitted range being [0; 2^32).
* Methods for adding/quering LONG tags have been switched from the long
  data type to the BigInteger data type and now ensure that the value
  is in the permitted [0; 2^63).
* Methods for adding/querying DATE tags now ensure the Date value is
  in the permitted range [0; 2^63) ms since Unix epoch.
* Methods for adding tags throw an IllegalArgumentException if the tag
  type is unsuitable for the method. This is to ensure that tags with
  invalid values cannot be added through similar methods (e.g., INT tag
  added via an ENUM tag addition method invoked with a negative value).

Bug: 22008538
Change-Id: I6eefd5cbb561cc52d27de952691af4d9d5e1af1e
 2015-06-23 20:04:28 -07: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
Simranjit Singh Kohli
b36f5eea72 am 4ddc0add: am 29124960: Merge "[Modify LastAuthenticatedTimestamp behaviour]:" into mnc-dev 
* commit '4ddc0add7b91a1a7a65d303e7b3ab225bf02d206':
  [Modify LastAuthenticatedTimestamp behaviour]:
 2015-06-24 02:20:14 +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
Simranjit Singh Kohli
29124960c6 Merge "[Modify LastAuthenticatedTimestamp behaviour]:" into mnc-dev 2015-06-24 01:24:45 +00:00
Alan Viverette
33ec793e6a am 0ca02512: am b1825fea: Merge "Throw IAE on invalid measure spec size" into mnc-dev 
* commit '0ca0251263c6692de59445f3b2e0811fbcb7d7f9':
  Throw IAE on invalid measure spec size
 2015-06-23 23:59:46 +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
Ruben Brunk
b502be75bb am 5b9021f2: am a39fcc58: Merge "Update DngCreator to handle pre-correction dimens." into mnc-dev 
* commit '5b9021f2fadca22cd423fbe4965e5c9b94e4bb2a':
  Update DngCreator to handle pre-correction dimens.
 2015-06-23 23:59:31 +00:00
Alan Viverette
b1825feac0 Merge "Throw IAE on invalid measure spec size" into mnc-dev 2015-06-23 23:41:03 +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
Ruben Brunk
a39fcc5875 Merge "Update DngCreator to handle pre-correction dimens." into mnc-dev 2015-06-23 23:33:22 +00:00
Svetoslav Ganov
242c1f3334 am 4475dbca: am 2c99ea35: Merge "Remove not needed contacts related permissions." into mnc-dev 
* commit '4475dbcacba57702f0bc1d3e5722f3cac97bdb6a':
  Remove not needed contacts related permissions.
 2015-06-23 23:30:33 +00:00
Alan Viverette
ac6cfb32fe Throw IAE on invalid measure spec size 
Crash immediately so that we can track down the cause. If we let it
through, we'll hit an ISE later in dispatchVsync() and never know why.

Bug: 21948478
Change-Id: I84edf93cdf09d755419e18a7606b7b6cbd059956
 2015-06-23 16:23:49 -07:00
Ruben Brunk
b8f4c6ab1e Update DngCreator to handle pre-correction dimens. 
Bug: 20491394
Change-Id: I0cdf7cec104bcb5683139c81fc52c8a0a7d2365c
 2015-06-23 16:23:03 -07:00
Svetoslav Ganov
2c99ea3524 Merge "Remove not needed contacts related permissions." into mnc-dev 2015-06-23 23:04:20 +00:00
Svetoslav Ganov
6d2c0e5ee2 Remove not needed contacts related permissions. 
This reverts commit ed5ff51b2c.

Change-Id: If2407e4e474a438d95e1b7ad1aa6f441bb3ace08
 2015-06-23 23:03:55 +00:00
Zach Johnson
627c5e0a92 am 9a8f0138: am 12402daf: Merge "Update CarrierService long lived binding API" into mnc-dev 
* commit '9a8f0138c5d25cabb5386234363bc2a0be9878ca':
  Update CarrierService long lived binding API
 2015-06-23 22:43:36 +00:00
Zach Johnson
08a244cee8 Update CarrierService long lived binding API 
Should take a metadata approach instead of a separate
intent.

b/21080696

Change-Id: Ib6e2ec0d3258e419aa14ae9e598a8147505feb84
 2015-06-23 14:31:13 -07:00
Jeff Davidson
8685db8592 am 8f528531: am 8d9ad193: Merge "Default permissions for carrier apps." into mnc-dev 
* commit '8f528531e182cf841f070d73583969bc4ddd7070':
  Default permissions for carrier apps.
 2015-06-23 21:13:46 +00:00
Alex Klyubin
22d5ae5bab am 168af812: am 90c9e4eb: Merge "Keymaster key validity dates are optional." into mnc-dev 
* commit '168af812db385e104532ff8a6437abe94cf9f412':
  Keymaster key validity dates are optional.
 2015-06-23 21:07:44 +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
Paul Jensen
0a99ca6e3c am daf6b73b: am 9065b810: Merge "Disallow requesting networks with mutable NetworkCapabilities." into mnc-dev 
* commit 'daf6b73b9967161a5797348a6703e4e59e97390c':
  Disallow requesting networks with mutable NetworkCapabilities.
 2015-06-23 21:06:54 +00:00
Paul Jensen
d61c4289c9 am 6716e3db: am dafd5612: Merge "Add NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL" into mnc-dev 
* commit '6716e3dbb1f667da062054407ad16ae59c78810d':
  Add NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL
 2015-06-23 21:06:44 +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
Maxim Bogatov
d6bdd65aa4 am 9d919a23: am e5a4a91c: Merge "Transfer a11y node with a11y event" into mnc-dev 
* commit '9d919a23e6e6da7c3fd2cd10bfe991ddd6dbff64':
  Transfer a11y node with a11y event
 2015-06-23 21:06:35 +00:00