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
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
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
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
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