Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
164,848 Commits 3 Branches 0 Tags
48ca9cd9f852fb38504bd045007ab88102d6fae2
Commit Graph

46132 Commits

Author SHA1 Message Date
Ruben Brunk
48ca9cd9f8 am 6c583ef7: am c6c331ee: am 174355d6: am d0f17b98: am 6f34ad71: Merge "camera2: Fix native ImageReader test segfaults." into lmp-dev 
* commit '6c583ef7ea34a2ac2eb490237908587bcbddb0e3':
  camera2: Fix native ImageReader test segfaults.
 2014-09-29 19:47:25 +00:00
Eino-Ville Talvala
274a9a57b7 am 7741a3b7: am fdc04cc2: am 03b3a63f: am 92a92a93: am 678e4328: Merge "Camera2: Fix parallel session and device close() exception" into lmp-dev 
* commit '7741a3b77b6918ea91b5e648992bfe72ff4de207':
  Camera2: Fix parallel session and device close() exception
 2014-09-29 19:46:47 +00:00
Alan Viverette
822c76b6cb am a3891440: am 143631f0: am d3957f25: am a6958574: am 63756956: Merge "Add callback to track and thumb drawables, propagate state in ASLD" into lmp-dev 
* commit 'a389144009a7a8d7fbc24c89c583385f59e74153':
  Add callback to track and thumb drawables, propagate state in ASLD
 2014-09-29 19:46:33 +00:00
Dianne Hackborn
c439d093ca am 09f14417: am 8776bd54: am cad60dc8: am 72bc7651: am cbb94a27: Merge "More debugging for issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '09f144176e32b2f352ca8a1bee93c26403c69408':
  More debugging for issue #17656716: Unhandled exception in Window Manager
 2014-09-29 19:46:24 +00:00
Svetoslav
4bf1fd39ea am bd8db7b1: am daeee005: am 16f3a714: am 5cdfd3ac: am 7c20fcc8: Merge "Accessibility node provider getting invalid virtual view id." into lmp-dev 
* commit 'bd8db7b1026542a7b53845b59ef302c95f4c6c24':
  Accessibility node provider getting invalid virtual view id.
 2014-09-29 19:46:17 +00:00
Elliott Hughes
b6af870bcd am 5d8bcd28: am 737b8cd2: am 7d614689: am 416de7fd: am 70c1f083: Merge "Set the system locale correctly even on an encrypted device." into lmp-dev 
* commit '5d8bcd285d190de924a47c39155530038799d148':
  Set the system locale correctly even on an encrypted device.
 2014-09-29 19:46:02 +00:00
Igor Murashkin
800d08591d am d1b710bc: am 04f07d28: am 2a555d0a: am d3edd1c2: am ba164dfb: Merge "camera2: Fix race conditions and deadlocks around configuration" into lmp-dev 
* commit 'd1b710bc82922c266836ecae42d7089e2b55caa7':
  camera2: Fix race conditions and deadlocks around configuration
 2014-09-29 19:45:41 +00:00
Fabrice Di Meglio
507aeb0972 am 1acd81fb: am 33512668: am 5861b628: am a2a5c97f: am 8420a924: Merge "Fix bug #17521147 Settings activity looks terrible on Volantis" into lmp-dev 
* commit '1acd81fbcc980ef17711a3472b7f0d0e3d5e34c4':
  Fix bug #17521147 Settings activity looks terrible on Volantis
 2014-09-29 19:45:33 +00:00
Ruben Brunk
6c583ef7ea am c6c331ee: am 174355d6: am d0f17b98: am 6f34ad71: Merge "camera2: Fix native ImageReader test segfaults." into lmp-dev 
* commit 'c6c331ee6ef9dbcd8e54a1a915d5932a6dda5405':
  camera2: Fix native ImageReader test segfaults.
 2014-09-27 06:17:06 +00:00
Ruben Brunk
30adb2ca22 am d0f17b98: am 6f34ad71: Merge "camera2: Fix native ImageReader test segfaults." into lmp-dev 
* commit 'd0f17b986c78f1915f6cf155858b6fd2a9927f23':
  camera2: Fix native ImageReader test segfaults.
 2014-09-27 05:51:59 +00:00
Ruben Brunk
1c2bb0c72e am 6f34ad71: Merge "camera2: Fix native ImageReader test segfaults." into lmp-dev 
* commit '6f34ad71cb00c7f4260dbf071422b334152a2cd1':
  camera2: Fix native ImageReader test segfaults.
 2014-09-27 05:26:58 +00:00
Ruben Brunk
7b28c66a6c Merge "camera2: Fix native ImageReader test segfaults." into lmp-dev 2014-09-27 02:16:30 +00:00
Ruben Brunk
31798f3318 camera2: Fix native ImageReader test segfaults. 
Bug: 17675571

- Check for JPEG footer in correct location from ImageReader
  when using the RGBA override.
- Add additional error checks in produceFrame method.
- Avoid allocating extra space for jpeg buffers due to
  incorrect width calculations.

Change-Id: I926f37e8b3e5c4bad24c16dcee48d52adb1706dd
 2014-09-26 18:00:21 -07:00
Eino-Ville Talvala
7741a3b77b am fdc04cc2: am 03b3a63f: am 92a92a93: am 678e4328: Merge "Camera2: Fix parallel session and device close() exception" into lmp-dev 
* commit 'fdc04cc29acdae5d3ab3cf3f45a9869fbd99cd9e':
  Camera2: Fix parallel session and device close() exception
 2014-09-27 00:02:50 +00:00
Eino-Ville Talvala
332b01e067 am 92a92a93: am 678e4328: Merge "Camera2: Fix parallel session and device close() exception" into lmp-dev 
* commit '92a92a93c09d0e1f405d292560f32b2f3a4dc62d':
  Camera2: Fix parallel session and device close() exception
 2014-09-26 23:53:12 +00:00
Eino-Ville Talvala
8883ada99b am 678e4328: Merge "Camera2: Fix parallel session and device close() exception" into lmp-dev 
* commit '678e432809fcde0d189f1130887bb201967eb342':
  Camera2: Fix parallel session and device close() exception
 2014-09-26 23:45:15 +00:00
Eino-Ville Talvala
ccc483696b Merge "Camera2: Fix parallel session and device close() exception" into lmp-dev 2014-09-26 23:42:30 +00:00
Alan Viverette
a389144009 am 143631f0: am d3957f25: am a6958574: am 63756956: Merge "Add callback to track and thumb drawables, propagate state in ASLD" into lmp-dev 
* commit '143631f0d4a5f69b73ae9019e6a1ccbc895dc12e':
  Add callback to track and thumb drawables, propagate state in ASLD
 2014-09-26 23:42:07 +00:00
Dianne Hackborn
09f144176e am 8776bd54: am cad60dc8: am 72bc7651: am cbb94a27: Merge "More debugging for issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '8776bd549ed4db7c5e2e5f487d043e8d1b53ff12':
  More debugging for issue #17656716: Unhandled exception in Window Manager
 2014-09-26 23:42:02 +00:00
Alan Viverette
dfb0b303de am a6958574: am 63756956: Merge "Add callback to track and thumb drawables, propagate state in ASLD" into lmp-dev 
* commit 'a69585749e38e5300162317e4f046dc66cdf1966':
  Add callback to track and thumb drawables, propagate state in ASLD
 2014-09-26 23:24:30 +00:00
Dianne Hackborn
08cb4ec7a7 am 72bc7651: am cbb94a27: Merge "More debugging for issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '72bc7651fb7b7fff7e3a0a4d0d61cada28278b2d':
  More debugging for issue #17656716: Unhandled exception in Window Manager
 2014-09-26 23:20:26 +00:00
Alan Viverette
72f1d94fed am 63756956: Merge "Add callback to track and thumb drawables, propagate state in ASLD" into lmp-dev 
* commit '637569566d2234b06e08d94acf4db1b0d3be6501':
  Add callback to track and thumb drawables, propagate state in ASLD
 2014-09-26 23:19:12 +00:00
Svetoslav
bd8db7b102 am daeee005: am 16f3a714: am 5cdfd3ac: am 7c20fcc8: Merge "Accessibility node provider getting invalid virtual view id." into lmp-dev 
* commit 'daeee0053554a7ce81e1586e52521d4ca13bbc94':
  Accessibility node provider getting invalid virtual view id.
 2014-09-26 23:18:06 +00:00
Dianne Hackborn
e4f529c7ba am cbb94a27: Merge "More debugging for issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit 'cbb94a27c1f0fa8c2b459ffe3206eb96006f92dc':
  More debugging for issue #17656716: Unhandled exception in Window Manager
 2014-09-26 23:15:04 +00:00
Alan Viverette
ab9f1bab6b Merge "Add callback to track and thumb drawables, propagate state in ASLD" into lmp-dev 2014-09-26 23:13:55 +00:00
Elliott Hughes
5d8bcd285d am 737b8cd2: am 7d614689: am 416de7fd: am 70c1f083: Merge "Set the system locale correctly even on an encrypted device." into lmp-dev 
* commit '737b8cd29ccc9799f8a309ca33c0ba4f4c0016d4':
  Set the system locale correctly even on an encrypted device.
 2014-09-26 23:13:49 +00:00
Alan Viverette
b067405bf4 Add callback to track and thumb drawables, propagate state in ASLD 
BUG: 17665424
Change-Id: I22da4530f3e2869d856102e804f020461a46fe49
 2014-09-26 16:12:16 -07:00
Dianne Hackborn
820eab3e75 Merge "More debugging for issue #17656716: Unhandled exception in Window Manager" into lmp-dev 2014-09-26 23:11:40 +00:00
Svetoslav
78efd1be8c am 5cdfd3ac: am 7c20fcc8: Merge "Accessibility node provider getting invalid virtual view id." into lmp-dev 
* commit '5cdfd3ac79d5e2bf23652a6fb52f95f1267ee9fe':
  Accessibility node provider getting invalid virtual view id.
 2014-09-26 23:08:13 +00:00
Elliott Hughes
3f1c8a08c1 am 416de7fd: am 70c1f083: Merge "Set the system locale correctly even on an encrypted device." into lmp-dev 
* commit '416de7fdbecc186c01db7266c659a0c7ad095eb6':
  Set the system locale correctly even on an encrypted device.
 2014-09-26 23:03:47 +00:00
Svetoslav
9743acd8b5 am 7c20fcc8: Merge "Accessibility node provider getting invalid virtual view id." into lmp-dev 
* commit '7c20fcc83a5216a993bb1b31ab9ed09e90457fc5':
  Accessibility node provider getting invalid virtual view id.
 2014-09-26 23:02:47 +00:00
Elliott Hughes
2d895e5b21 am 70c1f083: Merge "Set the system locale correctly even on an encrypted device." into lmp-dev 
* commit '70c1f083332729a586d670af7565732a2eb06ab4':
  Set the system locale correctly even on an encrypted device.
 2014-09-26 22:58:28 +00:00
Svetoslav
44389c5a3c Merge "Accessibility node provider getting invalid virtual view id." into lmp-dev 2014-09-26 22:56:28 +00:00
Elliott Hughes
39aa0d946b Merge "Set the system locale correctly even on an encrypted device." into lmp-dev 2014-09-26 22:52:31 +00:00
Dianne Hackborn
fad079dc5d More debugging for issue #17656716: Unhandled exception in Window Manager 
Change-Id: I81d3678e21d293d5896c467ae5c6739c82cfaa95
 2014-09-26 15:46:24 -07:00
Igor Murashkin
d1b710bc82 am 04f07d28: am 2a555d0a: am d3edd1c2: am ba164dfb: Merge "camera2: Fix race conditions and deadlocks around configuration" into lmp-dev 
* commit '04f07d2808c260db92324fe21338085a4dd9452a':
  camera2: Fix race conditions and deadlocks around configuration
 2014-09-26 22:41:15 +00:00
Eino-Ville Talvala
56fbbeab79 Camera2: Fix parallel session and device close() exception 
It's possible for the device to have close() called on it
during the session close sequence such that the session still
tries to do a stream reconfiguration on the closed device.

Handle the exception thrown by this attempt.

Bug: 17661765

Change-Id: Iee63c5c559405abe5c044ae251ad56edd1fb3e79
 2014-09-26 15:37:26 -07:00
Igor Murashkin
67e4da3f64 am d3edd1c2: am ba164dfb: Merge "camera2: Fix race conditions and deadlocks around configuration" into lmp-dev 
* commit 'd3edd1c2f2c6c4c78d515a8f70273b9bc7f27e68':
  camera2: Fix race conditions and deadlocks around configuration
 2014-09-26 22:31:18 +00:00
Igor Murashkin
e014f23e92 am ba164dfb: Merge "camera2: Fix race conditions and deadlocks around configuration" into lmp-dev 
* commit 'ba164dfbcab8d1358075e18199b3ef55f85c8b88':
  camera2: Fix race conditions and deadlocks around configuration
 2014-09-26 22:26:00 +00:00
Svetoslav
b3ba1d4e71 Accessibility node provider getting invalid virtual view id. 
If the virtual child id is not specified we should ask the node
provider to create a node info for the hosting view bu passing
the special host node id.

bug:17664111

Change-Id: I9c2d3195ad813eed7ea4108fe0d7ccb9cc32a1a0
 2014-09-26 15:23:36 -07:00
Igor Murashkin
381d22f706 Merge "camera2: Fix race conditions and deadlocks around configuration" into lmp-dev 2014-09-26 22:20:12 +00:00
Elliott Hughes
f839b4fcb6 Set the system locale correctly even on an encrypted device. 
Bug: 17659622
Change-Id: Ibbbd5b959bfab5345f20b556c4720d0910b50084
 2014-09-26 15:18:20 -07:00
Fabrice Di Meglio
1acd81fbcc am 33512668: am 5861b628: am a2a5c97f: am 8420a924: Merge "Fix bug #17521147 Settings activity looks terrible on Volantis" into lmp-dev 
* commit '33512668429e480f0c80b3e60adae43230065184':
  Fix bug #17521147 Settings activity looks terrible on Volantis
 2014-09-26 21:53:00 +00:00
Dianne Hackborn
dd5d208856 am a3ae140a: am cf2b850d: am dd5ebb6a: am 298b3d23: am 45245d61: Merge "Fix issue #17671802: "content" command always prints..." into lmp-dev 
* commit 'a3ae140afb6044adb904b35994a48dc2395bf7dd':
  Fix issue #17671802: "content" command always prints...
 2014-09-26 21:04:42 +00:00
Martijn Coenen
f69c8a7ed6 am 931b106e: am 25161ca3: am 22fa2e82: am eaaa5adb: am d846490a: Merge "Add hidden API to disable NFC (optional persist)." into lmp-dev 
* commit '931b106e78c2ddec4f750075857a1153819d3c08':
  Add hidden API to disable NFC (optional persist).
 2014-09-26 21:04:06 +00:00
Jorim Jaggi
9984c1b45c am eddc4b18: am 50111539: am 5c75b9a7: am 5299d7e5: am 9b20e012: Merge "Don\'t preload task description icons when opening recents" into lmp-dev 
* commit 'eddc4b18899498c3cf6d535c79020e030f7f7eb6':
  Don't preload task description icons when opening recents
 2014-09-26 21:03:56 +00:00
Raph Levien
de61fe05bd am e63943cd: am cd66535e: am 8ece858f: am 02366924: am a3e8bd63: Merge "Defer spelling correction with apostrophe" into lmp-dev 
* commit 'e63943cdb556354603166ce20a286f26c2e25a46':
  Defer spelling correction with apostrophe
 2014-09-26 21:03:32 +00:00
Fabrice Di Meglio
a552e9846a am a2a5c97f: am 8420a924: Merge "Fix bug #17521147 Settings activity looks terrible on Volantis" into lmp-dev 
* commit 'a2a5c97fe32f60a7b62899d23feb5392f11406b4':
  Fix bug #17521147 Settings activity looks terrible on Volantis
 2014-09-26 21:01:47 +00:00
Fabrice Di Meglio
c410968871 am 8420a924: Merge "Fix bug #17521147 Settings activity looks terrible on Volantis" into lmp-dev 
* commit '8420a924e038948e5df6ab41b4fbc73ae16c67b4':
  Fix bug #17521147 Settings activity looks terrible on Volantis
 2014-09-26 20:56:54 +00:00
Dianne Hackborn
8810e902be am cf2b850d: am dd5ebb6a: am 298b3d23: am 45245d61: Merge "Fix issue #17671802: "content" command always prints..." into lmp-dev 
* commit 'cf2b850d851396510b235b556adf96710904548d':
  Fix issue #17671802: "content" command always prints...
 2014-09-26 20:53:25 +00:00