Chris Wren
ae208ba9ce
am 969cb2db: am cad81c3e: am 3c7f1aac: am 15653a91: Merge "getCurrentInterruptionFilter should return the filter value, not the hints." into lmp-dev
...
* commit '969cb2db770a44f1265dc57910edc3f58ae0fbbe':
getCurrentInterruptionFilter should return the filter value, not the hints.
2014-09-26 00:22:56 +00:00
Chris Wren
fa3f1232dd
am 3c7f1aac: am 15653a91: Merge "getCurrentInterruptionFilter should return the filter value, not the hints." into lmp-dev
...
* commit '3c7f1aacb544db6984a19c933bf9a5975b6c0bf4':
getCurrentInterruptionFilter should return the filter value, not the hints.
2014-09-25 17:41:24 +00:00
Chris Wren
0a94bebf2e
am 15653a91: Merge "getCurrentInterruptionFilter should return the filter value, not the hints." into lmp-dev
...
* commit '15653a918f6c1747d08f03e8241368bbbcc38fe6':
getCurrentInterruptionFilter should return the filter value, not the hints.
2014-09-25 17:29:25 +00:00
Chris Wren
b698185929
Merge "getCurrentInterruptionFilter should return the filter value, not the hints." into lmp-dev
2014-09-25 17:21:32 +00:00
John Reck
9bb49fe22d
am 4f6fa843: am 4dd90969: am 2994cc57: am e5831979: Missing null check
...
* commit '4f6fa8433493221fc55a25aa9e958f4b188fe5a5':
Missing null check
2014-09-25 17:06:22 +00:00
Andre Eisenbach
114e82321b
am 05d80488: am c9e7505a: am 630f9671: am fe99f9f4: Merge "Remove remanents of onConnectionCongested in framwork" into lmp-dev
...
* commit '05d8048883b25f0f65e689880221c7b5af9f7c52':
Remove remanents of onConnectionCongested in framwork
2014-09-25 17:05:59 +00:00
Jeff Sharkey
52e40aaa8a
am 1eb1a4fa: am b47a75f2: am b8bbeff0: am 45ef18b6: Merge "Include reason when wiping data." into lmp-dev
...
* commit '1eb1a4fa28d74312b329daaecd8a81fcf367eea4':
Include reason when wiping data.
2014-09-25 17:05:42 +00:00
John Reck
ca915dd6aa
am 2994cc57: am e5831979: Missing null check
...
* commit '2994cc57444cc0ae83081f2324a5ce94ab58965a':
Missing null check
2014-09-25 16:38:37 +00:00
Andre Eisenbach
b3e68eb21c
am 630f9671: am fe99f9f4: Merge "Remove remanents of onConnectionCongested in framwork" into lmp-dev
...
* commit '630f9671beae6a09e8a1fa315b632d292a83c4f0':
Remove remanents of onConnectionCongested in framwork
2014-09-25 16:38:19 +00:00
Jeff Sharkey
c1411a4253
am b8bbeff0: am 45ef18b6: Merge "Include reason when wiping data." into lmp-dev
...
* commit 'b8bbeff0796847bbe98deb2d84989b656356873c':
Include reason when wiping data.
2014-09-25 16:38:08 +00:00
John Reck
07b3c7428a
am e5831979: Missing null check
...
* commit 'e58319791de1e47db1d6d3c6565f03a5f775a9cb':
Missing null check
2014-09-25 16:24:33 +00:00
Andre Eisenbach
9bb34605ce
am fe99f9f4: Merge "Remove remanents of onConnectionCongested in framwork" into lmp-dev
...
* commit 'fe99f9f42ad1a45922c906bacd5ea56d58667245':
Remove remanents of onConnectionCongested in framwork
2014-09-25 16:22:45 +00:00
Jeff Sharkey
2649756975
am 45ef18b6: Merge "Include reason when wiping data." into lmp-dev
...
* commit '45ef18b63e78fd853865f42d9369a5c9b4dd4ba0':
Include reason when wiping data.
2014-09-25 16:22:22 +00:00
John Reck
ccf2fa0031
Missing null check
...
Bug: 17642023
Change-Id: I874b76e1e184a59dec714191d759c1045b7b9814
2014-09-25 08:33:05 -07:00
Ruben Brunk
ea06d48527
am 01105fee: am ae7ff48d: am 6a7dcedf: am 8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev
...
* commit '01105feea74a4d0a063774509efa21ae95d50a3a':
camera2: Hide JPEGs in RGBA gralloc buffers.
2014-09-25 10:24:12 +00:00
Ruben Brunk
fb444ce6f8
am 6a7dcedf: am 8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev
...
* commit '6a7dcedf4f3a3af8ccbaebc9ec9dd02796d4e93e':
camera2: Hide JPEGs in RGBA gralloc buffers.
2014-09-25 10:03:40 +00:00
Ruben Brunk
1ac7646e8b
am 8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev
...
* commit '8acfdc7bf6b8ee5250351723ab2eef28f2b71e51':
camera2: Hide JPEGs in RGBA gralloc buffers.
2014-09-25 09:51:33 +00:00
Andre Eisenbach
77e7054176
Merge "Remove remanents of onConnectionCongested in framwork" into lmp-dev
2014-09-24 23:57:02 +00:00
Jeff Sharkey
0a285b4462
Merge "Include reason when wiping data." into lmp-dev
2014-09-24 23:27:25 +00:00
Igor Murashkin
41882cd269
am c819ec1b: am e6339fe4: am ee0b9782: am 7ddc2313: Merge "camera2: Increase preview frame timeout" into lmp-dev
...
* commit 'c819ec1beee0d69ee956e77a57523596d17e3eb3':
camera2: Increase preview frame timeout
2014-09-24 22:54:24 +00:00
Ruben Brunk
81ba98619b
Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev
2014-09-24 22:51:55 +00:00
Andreas Gampe
a2945aabd9
resolved conflicts for merge of dfdabe37 to lmp-mr1-dev-plus-aosp
...
Change-Id: I3e9adb5fa67f8ca7ce8151c2dbf5c8fe5b40cb86
2014-09-24 15:47:36 -07:00
Igor Murashkin
fc4cba3619
am ee0b9782: am 7ddc2313: Merge "camera2: Increase preview frame timeout" into lmp-dev
...
* commit 'ee0b9782a7ac2844f2942ba44bad4c36f235169c':
camera2: Increase preview frame timeout
2014-09-24 22:27:36 +00:00
Chris Wren
957ed70273
getCurrentInterruptionFilter should return the filter value, not the hints.
...
Bug: 17641218
Change-Id: I4a6ff073c04a3d3624916293824faba40f6226aa
2014-09-24 18:17:36 -04:00
Prerepa Viswanadham
f0b56a5a7f
Remove remanents of onConnectionCongested in framwork
...
Bug:17289507
Change-Id: Ia28c39822141edd0e4dc3f623b8c2f280fc5f943
2014-09-24 22:15:08 +00:00
Andreas Gampe
dfdabe3728
am 6f954cf2: Merge "Frameworks/base: Early init native bridge"
...
* commit '6f954cf2eb2baadf26bc0aba6272ef19b5dd45a0':
Frameworks/base: Early init native bridge
2014-09-24 22:10:15 +00:00
Andreas Gampe
6f954cf2eb
Merge "Frameworks/base: Early init native bridge"
2014-09-24 21:59:51 +00:00
Igor Murashkin
c4b7919882
am 7ddc2313: Merge "camera2: Increase preview frame timeout" into lmp-dev
...
* commit '7ddc2313a35637f087b68fea385df9d56b7f3f6d':
camera2: Increase preview frame timeout
2014-09-24 21:07:24 +00:00
Igor Murashkin
1dbf7248ea
Merge "camera2: Increase preview frame timeout" into lmp-dev
2014-09-24 20:58:18 +00:00
Jeff Sharkey
004a4b20f8
Include reason when wiping data.
...
This will help us track down who requested a data wipe.
Bug: 17412160
Change-Id: If8413e5d6377773f37e8b34ae3d26347226a027c
2014-09-24 13:58:09 -07:00
Igor Murashkin
3e2c14f3d6
camera2: Increase preview frame timeout
...
Some devices, especially those with HAL2/HAL3 frames will have a large
delay between the first preview frame and and the camera open. This is
because the streams are configured lazily so it adds extra latency.
Increase the timeout to make it significantly less likely to get frame drops.
Bug: 17628866
Change-Id: I48dcda8507fb7eb31c3f426f833418126171c204
2014-09-24 13:53:40 -07:00
George Mount
da083bfd03
am 028332e9: am 5506d92e: Fix NPE when detached View is added as a shared element.
...
* commit '028332e93e885d260c6214ca14e02035242c8dfe':
Fix NPE when detached View is added as a shared element.
2014-09-24 20:49:33 +00:00
George Mount
c9a5227292
Fix NPE when detached View is added as a shared element.
...
Bug 17632940
This won't solve all problems in which the parent becomes null,
but it will protect against shared elements being added that aren't
attached when mapped.
Change-Id: I991722c671c57048aea84b59a3c187c77c93450f
2014-09-24 12:39:08 -07:00
Ruben Brunk
0fd198ad89
camera2: Hide JPEGs in RGBA gralloc buffers.
...
Bug: 17379185
- WAR for SW Write usage flags being unavailable on
certain devices for JPEG (blob) format buffers.
Change-Id: Ic7299785b743f35dd47264b9d1cea01a88b71d91
2014-09-24 10:43:12 -07:00
Svetoslav
5948a3c967
am 0444464b: am 8b5f8df1: am 3ee4d02c: am 176b1955: Merge "Ignore not visible views computing click point for accessibility." into lmp-dev
...
* commit '0444464b18cd9dcb070e5a5e12192a000b07b0a4':
Ignore not visible views computing click point for accessibility.
2014-09-24 16:20:45 +00:00
Zoltan Szatmary-Ban
f168023d82
am 5ba8cb8a: am 209c42d1: am eae7e276: am 7602bc54: Merge "Register ActivityManagerService.PackageMonitor for all users." into lmp-dev
...
* commit '5ba8cb8aaafd3ffc8686687eee411f5f7b4e377f':
Register ActivityManagerService.PackageMonitor for all users.
2014-09-24 16:20:17 +00:00
Svetoslav
a9f6486c92
am 176b1955: Merge "Ignore not visible views computing click point for accessibility." into lmp-dev
...
* commit '176b19559e3775e59ce852fa54343bea5663ee17':
Ignore not visible views computing click point for accessibility.
2014-09-24 15:33:51 +00:00
Svetoslav
856fcb6284
Merge "Ignore not visible views computing click point for accessibility." into lmp-dev
2014-09-24 15:24:00 +00:00
Zoltan Szatmary-Ban
d2a77c2453
am 7602bc54: Merge "Register ActivityManagerService.PackageMonitor for all users." into lmp-dev
...
* commit '7602bc548c3c85e8958e899593cc1757d849d532':
Register ActivityManagerService.PackageMonitor for all users.
2014-09-24 09:52:22 +00:00
Zoltan Szatmary-Ban
bdc07b6986
Merge "Register ActivityManagerService.PackageMonitor for all users." into lmp-dev
2014-09-24 09:41:19 +00:00
Lorenzo Colitti
542fc7be49
am 19733a32: am c17062e5: am 71915080: am 6974f6a9: Merge "Block address families with routes, not NetworkAgent side channel" into lmp-dev
...
* commit '19733a32c87d0597448318ac1665450aed03ba69':
Block address families with routes, not NetworkAgent side channel
2014-09-24 04:13:50 +00:00
Jeff Sharkey
93b178d90e
am bb44d63b: am 7526e81c: am ff48f1b3: am e50b0a6c: Merge "More ACTION_CHOOSER ClipData migration." into lmp-dev
...
* commit 'bb44d63be156a24cad4e3ed81500efdc7fe4ca31':
More ACTION_CHOOSER ClipData migration.
2014-09-24 04:13:32 +00:00
Svetoslav
e7482460af
Ignore not visible views computing click point for accessibility.
...
In accessibility mode we compute a location to where to send down and up
events to click a view (triggered by a double tap). This solves the problem
of interacting with views that are partially covered by other interactive
views. The logic that computes the click point was not ignoring siblings
that are not visible. As a result a blind user cannot interact with some
views.
bug:17632224
Change-Id: I93e637ee6702e4ba3e79faa736205430e2196d01
2014-09-23 18:48:28 -07:00
Lorenzo Colitti
34feaa0947
am 6974f6a9: Merge "Block address families with routes, not NetworkAgent side channel" into lmp-dev
...
* commit '6974f6a97028a42ce79b8e9e1869af0ebf5624f4':
Block address families with routes, not NetworkAgent side channel
2014-09-24 01:29:36 +00:00
Lorenzo Colitti
e034716628
Merge "Block address families with routes, not NetworkAgent side channel" into lmp-dev
2014-09-24 01:21:06 +00:00
Jeff Sharkey
5c1ac3d443
am e50b0a6c: Merge "More ACTION_CHOOSER ClipData migration." into lmp-dev
...
* commit 'e50b0a6c86c70f5ddcb69984cb99337ce1d96032':
More ACTION_CHOOSER ClipData migration.
2014-09-24 00:05:53 +00:00
Jeff Sharkey
fb488eb2a2
Merge "More ACTION_CHOOSER ClipData migration." into lmp-dev
2014-09-23 23:58:51 +00:00
Jeff Sharkey
c004eef7bb
More ACTION_CHOOSER ClipData migration.
...
Traverse into both EXTRA_INTENT and any EXTRA_INITIAL_INTENTS when
migrating extras to ClipData. Also, we don't need to promote these
ClipData into the parent, since the platform ChooserActivity will
issue any required permission grants for the final user-selected
Intent. Even if we wanted to, we can't combine the various child
Intent flags into anything meaningful at the ACTION_CHOOSER level.
Bug: 17580604
Change-Id: I6b5a1f572a7edf8135e059c67a2643d3736e40ab
2014-09-23 16:40:53 -07:00
Igor Murashkin
00282c876e
am 900d0072: am bda40b57: am e3ad6ff8: am c79b145f: Merge "camera2-legacy: Workaround max jpeg/preview size AR mismatch" into lmp-dev
...
* commit '900d0072197ece4375f86e2e49d86b7e1c0821d2':
camera2-legacy: Workaround max jpeg/preview size AR mismatch
2014-09-23 23:29:59 +00:00
Igor Murashkin
a040e44417
am c79b145f: Merge "camera2-legacy: Workaround max jpeg/preview size AR mismatch" into lmp-dev
...
* commit 'c79b145f0216d2f9b099a409fee2c154de1f7019':
camera2-legacy: Workaround max jpeg/preview size AR mismatch
2014-09-23 22:59:56 +00:00