Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
203,141 Commits 3 Branches 0 Tags
5f34ce520beef1634fcdb3d5dd22981aa0013bfb
Commit Graph

50105 Commits

Author SHA1 Message Date
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
Simranjit Singh Kohli
beeef6bc60 am b36f5eea: am 4ddc0add: am 29124960: Merge "[Modify LastAuthenticatedTimestamp behaviour]:" into mnc-dev 
* commit 'b36f5eea72ea02ef9466b0d599a95c903bb398c8':
  [Modify LastAuthenticatedTimestamp behaviour]:
 2015-06-24 02:33:45 +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
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
2ad250c405 am 33ec793e: am 0ca02512: am b1825fea: Merge "Throw IAE on invalid measure spec size" into mnc-dev 
* commit '33ec793e6aceadb5f5a5f507b84b9c8568dbc2a4':
  Throw IAE on invalid measure spec size
 2015-06-24 00:12: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
Ruben Brunk
8db1e80ba6 am b502be75: am 5b9021f2: am a39fcc58: Merge "Update DngCreator to handle pre-correction dimens." into mnc-dev 
* commit 'b502be75bb7a702b444c570d07df55ca7ec419c4':
  Update DngCreator to handle pre-correction dimens.
 2015-06-24 00:12:42 +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
Svetoslav Ganov
b96d1f1e69 am 242c1f33: am 4475dbca: am 2c99ea35: Merge "Remove not needed contacts related permissions." into mnc-dev 
* commit '242c1f333431b32445336faed18feb1a90ebd6e4':
  Remove not needed contacts related permissions.
 2015-06-23 23:42:34 +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
Zach Johnson
8fea419415 am 627c5e0a: am 9a8f0138: am 12402daf: Merge "Update CarrierService long lived binding API" into mnc-dev 
* commit '627c5e0a9234a0e94170590cfd6ee558fec4c394':
  Update CarrierService long lived binding API
 2015-06-23 23:18:07 +00: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
Xiaohui Chen
b1cc316dce Merge "Introduce system user and primary user." 2015-06-23 22:44:03 +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
Xiaohui Chen
70f6c38644 Introduce system user and primary user. 
Bug: 19913735
Change-Id: I2c7855915d778cf80a7154314321ddd90e2eaaac
 2015-06-23 15:25:37 -07:00
Jeff Davidson
43469fd4a4 resolved conflicts for merge of 8685db85 to master 
Change-Id: I8fbf397082ac90d6a173785538fd6eeb8e4976f7
 2015-06-23 15:11:37 -07:00
Alex Klyubin
b9630d4386 am 22d5ae5b: am 168af812: am 90c9e4eb: Merge "Keymaster key validity dates are optional." into mnc-dev 
* commit '22d5ae5bab2585cf2c8f78bc516ac950ecebaf48':
  Keymaster key validity dates are optional.
 2015-06-23 21:31:37 +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
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
Paul Jensen
45895c802b am 0a99ca6e: am daf6b73b: am 9065b810: Merge "Disallow requesting networks with mutable NetworkCapabilities." into mnc-dev 
* commit '0a99ca6e3c15983e91273fbc1c109f84f25ea982':
  Disallow requesting networks with mutable NetworkCapabilities.
 2015-06-23 21:31:00 +00:00
Paul Jensen
da65bb8678 am d61c4289: am 6716e3db: am dafd5612: Merge "Add NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL" into mnc-dev 
* commit 'd61c4289c964e78ec166d485cddbed06841ad33c':
  Add NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL
 2015-06-23 21:30:47 +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
Maxim Bogatov
af87c70547 am d6bdd65a: am 9d919a23: am e5a4a91c: Merge "Transfer a11y node with a11y event" into mnc-dev 
* commit 'd6bdd65aa47457740cbaeba162c864e48c14f83d':
  Transfer a11y node with a11y event
 2015-06-23 21:30:33 +00:00
Zhijun He
4503165fbf am 220a3f8a: am 3ca7640a: am aeec90a0: Merge "Camera2: update high speed recording API java doc" into mnc-dev 
* commit '220a3f8ab4e6dd71ed53550dcbbd13f2100c012c':
  Camera2: update high speed recording API java doc
 2015-06-23 21:30:08 +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
Hiroshi Yamauchi
ac4d8aab79 am 26898e57: am 189ebe5d: am a1ee09c8: Merge "Clarify art.gc.gc-count-rate-histogram runtime stat." into mnc-dev 
* commit '26898e575ca3d977a643657f125b254aed9e0211':
  Clarify art.gc.gc-count-rate-histogram runtime stat.
 2015-06-23 21:29:56 +00: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
2253360924 am 1d978363: am 1d87cdec: am ff0924c7: Merge "Suppress Layout during Visibility transitions" into mnc-dev 
* commit '1d9783637ca664593394989b3b5f5f66b405d446':
  Suppress Layout during Visibility transitions
 2015-06-23 20:55:13 +00:00
Keisuke Kuroyanagi
a3422ee070 am da0b7033: am 30e7f79b: am 1384d1d9: Merge "Fix: TextView makes new layouts too frequently." into mnc-dev 
* commit 'da0b7033e6e51045a14bb81772dca6dc1dae710f':
  Fix: TextView makes new layouts too frequently.
 2015-06-23 20:55:07 +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