Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
160,578 Commits 3 Branches 0 Tags
237d87dc0ceead1b84a60a8adea5da4a3d691f87
Commit Graph

41591 Commits

Author SHA1 Message Date
Andres Morales
237d87dc0c am 7320b045: am c1278850: am 38c53ee8: am 858d04cb: Merge "Mark PDB identifier as SystemApi" into lmp-dev 
* commit '7320b04597c14d79ce874cc96199fc7232782e6d':
  Mark PDB identifier as SystemApi
 2014-09-27 06:17:11 +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
Andres Morales
3e616c1f6b am 38c53ee8: am 858d04cb: Merge "Mark PDB identifier as SystemApi" into lmp-dev 
* commit '38c53ee836c76b3aae4bb4815820a5401c017cc2':
  Mark PDB identifier as SystemApi
 2014-09-27 05:52:03 +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
Andres Morales
aa1bcd95cf am 858d04cb: Merge "Mark PDB identifier as SystemApi" into lmp-dev 
* commit '858d04cbf0962acba1ffc0e5df4113c01ed3abec':
  Mark PDB identifier as SystemApi
 2014-09-27 05:27:03 +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
Andres Morales
66b63cb825 Merge "Mark PDB identifier as SystemApi" into lmp-dev 2014-09-27 02:26:00 +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
Andres Morales
33df937f6f Mark PDB identifier as SystemApi 
Had already marked the API itself as system api, just not
the Context.BLAH id. Also update the javadoc as it doesn't
return an FD anymore.

Change-Id: Ic8a5b8c75b0ba0bdf4ad26cf33d5f87eea568376
 2014-09-26 17:08:59 -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
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
Martijn Coenen
96ea2977fe am 25161ca3: am 22fa2e82: am eaaa5adb: am d846490a: Merge "Add hidden API to disable NFC (optional persist)." into lmp-dev 
* commit '25161ca3a8cfa6210cf917ee7da85e82eec9feff':
  Add hidden API to disable NFC (optional persist).
 2014-09-26 20:52:53 +00:00
Jorim Jaggi
69c0943e43 am 50111539: am 5c75b9a7: am 5299d7e5: am 9b20e012: Merge "Don\'t preload task description icons when opening recents" into lmp-dev 
* commit '5011153937fdb0fbbb7d75e09204370c2aeed00a':
  Don't preload task description icons when opening recents
 2014-09-26 20:52:43 +00:00
Raph Levien
ec017cbbcb am cd66535e: am 8ece858f: am 02366924: am a3e8bd63: Merge "Defer spelling correction with apostrophe" into lmp-dev 
* commit 'cd66535e837e19bf2c6b177f8c1ff34c3446486e':
  Defer spelling correction with apostrophe
 2014-09-26 20:52:33 +00:00
Fabrice Di Meglio
6b0a880e13 Merge "Fix bug #17521147 Settings activity looks terrible on Volantis" into lmp-dev 2014-09-26 20:52:02 +00:00
Fabrice Di Meglio
b22be6fcf2 Fix bug #17521147 Settings activity looks terrible on Volantis 
- update layouts for PreferenceActivity and its headers
in two panes mode (per UX request)
- add theming where it was missing

Change-Id: I0c478c1a66b6de7e122b7ee73da24f3dd5a7bc28
 2014-09-26 13:38:12 -07:00
Martijn Coenen
e20f9aa316 am eaaa5adb: am d846490a: Merge "Add hidden API to disable NFC (optional persist)." into lmp-dev 
* commit 'eaaa5adb4e553ca2482eb57084d077e8847ffc3e':
  Add hidden API to disable NFC (optional persist).
 2014-09-26 19:53:03 +00:00
Jorim Jaggi
b56ec7fc26 am 5299d7e5: am 9b20e012: Merge "Don\'t preload task description icons when opening recents" into lmp-dev 
* commit '5299d7e5e88b0c2b91e9f8bac35b21487ac83d0f':
  Don't preload task description icons when opening recents
 2014-09-26 19:52:56 +00:00
Raph Levien
a4e3a616cd am 02366924: am a3e8bd63: Merge "Defer spelling correction with apostrophe" into lmp-dev 
* commit '02366924dfd8c0ae2c61f87a92c0b6a24a852f29':
  Defer spelling correction with apostrophe
 2014-09-26 19:52:48 +00:00