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

49357 Commits

Author SHA1 Message Date
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
Zhijun He
220a3f8ab4 am 3ca7640a: am aeec90a0: Merge "Camera2: update high speed recording API java doc" into mnc-dev 
* commit '3ca7640abf75e62908e75087a7f98d914352def9':
  Camera2: update high speed recording API java doc
 2015-06-23 21:06:03 +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
Hiroshi Yamauchi
26898e575c am 189ebe5d: am a1ee09c8: Merge "Clarify art.gc.gc-count-rate-histogram runtime stat." into mnc-dev 
* commit '189ebe5d1a6529b93665a7a153c58188f71b62b9':
  Clarify art.gc.gc-count-rate-histogram runtime stat.
 2015-06-23 21:05:39 +00:00
George Mount
1d9783637c am 1d87cdec: am ff0924c7: Merge "Suppress Layout during Visibility transitions" into mnc-dev 
* commit '1d87cdecc370c60a27fe85907d528e62cfe34429':
  Suppress Layout during Visibility transitions
 2015-06-23 20:46:28 +00:00
Keisuke Kuroyanagi
da0b7033e6 am 30e7f79b: am 1384d1d9: Merge "Fix: TextView makes new layouts too frequently." into mnc-dev 
* commit '30e7f79bd0a5ab7cdf6c543668dfbda89c2b054e':
  Fix: TextView makes new layouts too frequently.
 2015-06-23 20:46:24 +00:00
Jeff Davidson
8d9ad19341 Merge "Default permissions for carrier apps." into mnc-dev 2015-06-23 20:43:06 +00:00
Alex Klyubin
90c9e4eb54 Merge "Keymaster key validity dates are optional." into mnc-dev 2015-06-23 20:35:30 +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
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
Paul Jensen
9065b81016 Merge "Disallow requesting networks with mutable NetworkCapabilities." into mnc-dev 2015-06-23 19:40:38 +00:00
Paul Jensen
dafd561298 Merge "Add NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL" into mnc-dev 2015-06-23 19:40:02 +00:00
Dianne Hackborn
a6fb1e70ff Merge "Fix issue #20654534: API Review: android.app.assist" into mnc-dev 2015-06-23 19:33:04 +00:00
Maxim Bogatov
e5a4a91c01 Merge "Transfer a11y node with a11y event" into mnc-dev 2015-06-23 19:26:58 +00:00
Alex Klyubin
d6c7799b9a Keymaster key validity dates are optional. 
This CL makes Android Keystore framework code add
KM_TAG_ACTIVE_DATETIME, KM_TAG_ORIGINATION_EXPIRE_DATETIME, and
KM_TAG_USAGE_EXPIRE_DATETIME tags to the authorizations set only
if the corresponding time instants were specified through the
framework-level API. This is fine because these tags are optional as
it turns out.

Bug: 18088752
Change-Id: I6a5ae4cadb441e61576231815e6bec6e9248bc72
 2015-06-23 12:06:27 -07:00
Amith Yamasani
0bf8f7cc39 Runtime permissions cannot be set on legacy apps by device policy 
Clarify docs that runtime permissions can be granted or revoked by
a profile owner/device owner only for MNC apps and not legacy apps.

Check the targetSdkVersion and return false if legacy app.

Remove all policy flags from permissions when cleaning up
a device or profile owner.

Bug: 21835304
Bug: 21889278
Change-Id: I4271394737990983449048d112a1830f9d0f2d78
 2015-06-23 12:01:36 -07:00
Zhijun He
aeec90a050 Merge "Camera2: update high speed recording API java doc" into mnc-dev 2015-06-23 18:52:17 +00:00
Xiaohui Chen
a2c159fede Merge "system_server: optimize app idle parole state change" into mnc-dev 2015-06-23 18:23:36 +00:00
Hiroshi Yamauchi
a1ee09c843 Merge "Clarify art.gc.gc-count-rate-histogram runtime stat." into mnc-dev 2015-06-23 18:14:50 +00:00
Paul Jensen
bb2e0e9816 Disallow requesting networks with mutable NetworkCapabilities. 
It's not clear what it means to request a network with a mutable
NetworkCapability like NET_CAPABILITY_VALIDATED or
NET_CAPABILITY_CAPTIVE_PORTAL.  Presently requesting such a network
would fail in a number of different ways:
1. The NetworkFactories would fail to match the request against their
   filter which doesn't include stateful NetworkCapabilities.
2. If the NetworkFactories did match, they'd bring up networks to try
   and satisfy the requests, but the networks would not have any
   mutable NetworkCapabilities initially so they'd be reaped.
Because of these problems it's safest to simply disallow these
requests.

Bug: 21343774
Change-Id: I56303242b81d39b370b8d5d1e32059bfcfc25949
 2015-06-23 14:13:10 -04:00
Paul Jensen
3d194eae6f Add NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL 
Bug: 21343774
Bug: 20898908
Change-Id: I23069a6cba346999d1b2eeaa445023bd6bf4ef94
 2015-06-23 14:09:01 -04:00
Yin-Chia Yeh
361ef3d239 am e966f01d: am d772b5e3: Merge "Camera: document expected thumbnail size in capture result" into mnc-dev 
* commit 'e966f01d0d6b22fbf0e492cfa5df119394c9e50c':
  Camera: document expected thumbnail size in capture result
 2015-06-23 18:08:15 +00:00
Wale Ogunwale
59ab4b336e am 90cee497: am dd7705bb: Merge "Update surfaces secure flag on screen capture setting change" into mnc-dev 
* commit '90cee497c0803861b8a779ca5cd87f4f8c4fde72':
  Update surfaces secure flag on screen capture setting change
 2015-06-23 18:07:54 +00:00
Dianne Hackborn
9a5ea4e9ca am 67e2aab1: am b7412897: Merge "Fix issue #21254610: StrictMode uses Log.wtf which crashes apps on L+" into mnc-dev 
* commit '67e2aab109366fbb146d499f26c1d76c5c45bc52':
  Fix issue #21254610: StrictMode uses Log.wtf which crashes apps on L+
 2015-06-23 18:07:49 +00:00
Dianne Hackborn
80e364a71a am 11ef84c8: am 6af40c83: Merge "Fix issue #21799741: AbstractThreadedSyncAdapter crashes..." into mnc-dev 
* commit '11ef84c8db8c31afd91b90ac4091e64ad5e7c3ca':
  Fix issue #21799741: AbstractThreadedSyncAdapter crashes...
 2015-06-23 18:07:44 +00:00
Lorenzo Colitti
ba7ee88cb7 am acf761eb: am e2d921da: Merge "Re-hide onPreCheck and unhide NET_CAPABILITY_VALIDATED." into mnc-dev 
* commit 'acf761ebde2a551d8da98c3770668547148e6ec0':
  Re-hide onPreCheck and unhide NET_CAPABILITY_VALIDATED.
 2015-06-23 18:07:10 +00:00
Zhijun He
3c1ff68d69 Camera2: update high speed recording API java doc 
Bug: 21442271
Change-Id: Iff5889394f7723eb0fd7319b9513cd0dca04b927
 2015-06-23 11:06:01 -07:00
George Mount
ff0924c72d Merge "Suppress Layout during Visibility transitions" into mnc-dev 2015-06-23 17:56:48 +00:00
Keisuke Kuroyanagi
1384d1d900 Merge "Fix: TextView makes new layouts too frequently." into mnc-dev 2015-06-23 17:56:48 +00:00
Wale Ogunwale
ca1ce9382b am 781ec7e9: am e6734b6b: Merge "Fix javadoc for Adapter.getViewTypeCount()" 
* commit '781ec7e9d408dacfab761c02d6e4b1345c5dfd87':
  Fix javadoc for Adapter.getViewTypeCount()
 2015-06-23 17:28:30 +00:00
Maxim Bogatov
2f55a3f0b8 Transfer a11y node with a11y event 
b/19870218

Change-Id: I29519d029cb7a154de09627afab7a0307abe85bd
 2015-06-23 10:23:43 -07:00