Dianne Hackborn
7c1de6c06e
am 24ecbc4f: am 0b1eb9d4: Merge "Work on issue #17656716 : Unhandled exception in Window Manager" into lmp-dev
...
* commit '24ecbc4fbe66b548a35617c03c7ac068b40b83de':
Work on issue #17656716 : Unhandled exception in Window Manager
2014-09-26 04:41:38 +00:00
Alan Viverette
91e18e538a
am 5a99c276: am a9ac89a3: Merge "Correctly advertise accessibility scrolling actions" into lmp-dev
...
* commit '5a99c276b329a7c828e65083da5d5df73e60915e':
Correctly advertise accessibility scrolling actions
2014-09-26 04:41:34 +00:00
Dianne Hackborn
0f129c7959
am 0b1eb9d4: Merge "Work on issue #17656716 : Unhandled exception in Window Manager" into lmp-dev
...
* commit '0b1eb9d4ae339629fbbf226160896a917cad4d0d':
Work on issue #17656716 : Unhandled exception in Window Manager
2014-09-26 01:30:47 +00:00
Alan Viverette
52128ecd61
am a9ac89a3: Merge "Correctly advertise accessibility scrolling actions" into lmp-dev
...
* commit 'a9ac89a3fa9291553edb72f4557dcff9e77863ae':
Correctly advertise accessibility scrolling actions
2014-09-26 01:30:43 +00:00
Dianne Hackborn
a7b1595c25
Merge "Work on issue #17656716 : Unhandled exception in Window Manager" into lmp-dev
2014-09-26 01:15:02 +00:00
Alan Viverette
80c0bbe82c
Merge "Correctly advertise accessibility scrolling actions" into lmp-dev
2014-09-26 01:13:13 +00:00
Dianne Hackborn
017c6a28be
Work on issue #17656716 : Unhandled exception in Window Manager
...
Create descriptive errors when sending unreasonably large
parcels through IPC.
Change-Id: Ie93b5372a8ed87541db282876c4eeeae69a1e8bd
2014-09-25 17:48:44 -07:00
Adam Powell
3f1ead4859
am 11133a78: am da7f9bab: Merge "Always show the name of the last used Home app in ResolverActivity" into lmp-dev
...
* commit '11133a783a0e7b0fc0d725f2d4cd858d2a51ab6e':
Always show the name of the last used Home app in ResolverActivity
2014-09-26 00:30:50 +00:00
Adam Powell
4967a73816
am da7f9bab: Merge "Always show the name of the last used Home app in ResolverActivity" into lmp-dev
...
* commit 'da7f9bab0206c237f3d70b3b23eeaab41f478eb1':
Always show the name of the last used Home app in ResolverActivity
2014-09-26 00:16:26 +00:00
Adam Powell
a35c77aea6
Always show the name of the last used Home app in ResolverActivity
...
Bug 17629220
Change-Id: Ia1d0a188f8c0911e5b74b18ba44508a6e2139d0c
2014-09-25 16:54:41 -07:00
Adrian Roos
f2be7170bf
am a2e1e2ca: am 05ade73e: Merge "Ensure that setting an empty password clears it" into lmp-dev
...
* commit 'a2e1e2ca20dba8d163223364b82861b84d180600':
Ensure that setting an empty password clears it
2014-09-25 22:56:39 +00:00
Eino-Ville Talvala
c043b87d48
am eeb44d4a: am 7b6a4acd: Merge "Camera2 Legacy: Clear JPEG ids when reconfiguring." into lmp-dev
...
* commit 'eeb44d4a77d5dd5050a25cc622bd5e6869e69e14':
Camera2 Legacy: Clear JPEG ids when reconfiguring.
2014-09-25 22:56:36 +00:00
Adrian Roos
dc1fc7fc77
am 05ade73e: Merge "Ensure that setting an empty password clears it" into lmp-dev
...
* commit '05ade73e580b826ead839d3c5db508a8ea25ad93':
Ensure that setting an empty password clears it
2014-09-25 22:47:25 +00:00
Eino-Ville Talvala
3517b1db4a
am 7b6a4acd: Merge "Camera2 Legacy: Clear JPEG ids when reconfiguring." into lmp-dev
...
* commit '7b6a4acdeb6bddbb6b058c227e037c714dd8f2b8':
Camera2 Legacy: Clear JPEG ids when reconfiguring.
2014-09-25 22:47:21 +00:00
Adrian Roos
625e8f5959
Merge "Ensure that setting an empty password clears it" into lmp-dev
2014-09-25 22:42:43 +00:00
Michael Wright
b17ff6777d
am 57bb094b: am 233bbabf: Merge "Specify a device identifier for keyboard layout notification." into lmp-dev
...
* commit '57bb094b818d0e215cd987738078e5c181c26fac':
Specify a device identifier for keyboard layout notification.
2014-09-25 22:38:38 +00:00
Eino-Ville Talvala
c2c520950a
Merge "Camera2 Legacy: Clear JPEG ids when reconfiguring." into lmp-dev
2014-09-25 22:36:59 +00:00
Michael Wright
e27380ac46
am 233bbabf: Merge "Specify a device identifier for keyboard layout notification." into lmp-dev
...
* commit '233bbabfe10bbf7190cdf3a6bb44f081a1fa91c7':
Specify a device identifier for keyboard layout notification.
2014-09-25 22:27:05 +00:00
Michael Wright
42dad80418
Merge "Specify a device identifier for keyboard layout notification." into lmp-dev
2014-09-25 22:18:20 +00:00
Eino-Ville Talvala
efdd0cc832
am 9ceeb831: am 93f0b612: Camera2 legacy: Improve robustness to camera service crashes
...
* commit '9ceeb831c412d80b0961bcf38d81c789aba1718b':
Camera2 legacy: Improve robustness to camera service crashes
2014-09-25 21:45:33 +00:00
Eino-Ville Talvala
845ea54c51
am 93f0b612: Camera2 legacy: Improve robustness to camera service crashes
...
* commit '93f0b612350e217b8434a0199ba4723c2cfe0e72':
Camera2 legacy: Improve robustness to camera service crashes
2014-09-25 21:34:40 +00:00
Eino-Ville Talvala
52571b9032
Camera2 Legacy: Clear JPEG ids when reconfiguring.
...
Otherwise, stale IDs for old streams will be left around, causing
JPEGs to be sent to the wrong consumers.
Bug: 17659125
Change-Id: I98e1a1d389147631bc80eaeb10d57f74a6256f32
2014-09-25 14:06:55 -07:00
Eino-Ville Talvala
eecc904f13
Camera2 legacy: Improve robustness to camera service crashes
...
When the camera service dies, the getParameters call is often the first
to fail, and on legacy mode, this frequently happens in a background thread.
Catch the runtime exceptions and convert to device errors, instead of killing
the process.
Bug: 17587496
Change-Id: I6757961e7c0387defd368a13cb7c343950602400
2014-09-25 14:06:55 -07:00
Alan Viverette
947a969560
Correctly advertise accessibility scrolling actions
...
Previously, we didn't take into account partially-visible views. This
extracts existing logic for determining whether the list can scroll
up or down and applies that when adding scrolling actions.
BUG: 17648502
Change-Id: I7ed9382e1645970ab098c210ad10f8a077da834b
2014-09-25 12:43:47 -07:00
Ruben Brunk
b4e87c1128
am 4754428d: am e76ce25f: Merge "camera2: Fix null check in PictureCallback." into lmp-dev
...
* commit '4754428da2cc3e1224fc6f227ac831fee90c8b96':
camera2: Fix null check in PictureCallback.
2014-09-25 19:40:58 +00:00
Ruben Brunk
4b6b2104ac
am e76ce25f: Merge "camera2: Fix null check in PictureCallback." into lmp-dev
...
* commit 'e76ce25ff342d393ffb79ef7e01b09cae5320a73':
camera2: Fix null check in PictureCallback.
2014-09-25 19:29:40 +00:00
Ruben Brunk
820a08a555
Merge "camera2: Fix null check in PictureCallback." into lmp-dev
2014-09-25 19:23:00 +00:00
Paul Lawrence
994ba63f89
am 7c4b9413: am 56a38862: Merge "Fix pause when setting pin/pattern/password" into lmp-dev
...
* commit '7c4b941336300efc04e8842dc21a24f1c17bf345':
Fix pause when setting pin/pattern/password
2014-09-25 18:57:20 +00:00
Ruben Brunk
2c3d7c5f68
camera2: Fix null check in PictureCallback.
...
Bug: 17636586
Change-Id: Ieddc106e14c97dc78405821e83e346d626127e2c
2014-09-25 11:48:27 -07:00
Paul Lawrence
809c1be06b
am 56a38862: Merge "Fix pause when setting pin/pattern/password" into lmp-dev
...
* commit '56a38862d68c3160ae9b049ca89422cc5834e8e3':
Fix pause when setting pin/pattern/password
2014-09-25 18:42:10 +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
Paul Lawrence
3a5a0be61e
Fix pause when setting pin/pattern/password
...
Move setting encryption pin/pattern/password into a separate thread
Bug: 17554587
Change-Id: Ifdf2ed5aa9ca08d68bb2ed08c8985203c24dcb9f
2014-09-25 17:32:19 +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
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
Adrian Roos
ab7dae58cc
Ensure that setting an empty password clears it
...
Bug: 17496766
Change-Id: I7c29b632519247bc5675a05ef6cc90902fec8527
2014-09-25 18:25:21 +02: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
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
Ruben Brunk
81ba98619b
Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev
2014-09-24 22:51:55 +00: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