drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
122,431 Commits 1 Branch 0 Tags
Commit Graph

122431 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
2ba4efff8b Hide AssetInputStream.getAssetInt (Take 2) 
This reverts commit b1bd1fe7fd9ed6b6e4518713ef5f5716a84d97e8.
 2014-01-20 10:18:44 +00:00
Elliott Hughes
39312ff423 am a850e5ac: am 8815d261: am 8da106eb: am aa80f1a3: am c9a60b0f: Merge "Don\'t confuse stat and stat64." 
* commit 'a850e5ac27662ff2030d6a3d3f1ce1f6cb7c2e44':
  Don't confuse stat and stat64.
 2014-01-18 02:47:20 +00:00
Igor Murashkin
b121ea542a Merge "camera2: Add android.request.partialResultCount" 2014-01-18 02:45:55 +00:00
Elliott Hughes
a850e5ac27 am 8815d261: am 8da106eb: am aa80f1a3: am c9a60b0f: Merge "Don\'t confuse stat and stat64." 
* commit '8815d261d9fefbac8f24936dc37a055ab9ced038':
  Don't confuse stat and stat64.
 2014-01-18 02:44:06 +00:00
Elliott Hughes
8815d261d9 am 8da106eb: am aa80f1a3: am c9a60b0f: Merge "Don\'t confuse stat and stat64." 
* commit '8da106ebf31d725c00c1910a51f6e1cfb0d8c052':
  Don't confuse stat and stat64.
 2014-01-18 02:42:01 +00:00
Elliott Hughes
8da106ebf3 am aa80f1a3: am c9a60b0f: Merge "Don\'t confuse stat and stat64." 
* commit 'aa80f1a3caf6271f1c48a779e260811f2802a9f0':
  Don't confuse stat and stat64.
 2014-01-17 18:38:17 -08:00
Igor Murashkin
2086b58880 camera2: Add android.request.partialResultCount 
Change-Id: Ie21010767ad1e58b3a46e977e7f9ee7f1951bad2
 2014-01-17 18:36:07 -08:00
Elliott Hughes
aa80f1a3ca am c9a60b0f: Merge "Don\'t confuse stat and stat64." 
* commit 'c9a60b0f77525244ac4f970258703b8dc62ee140':
  Don't confuse stat and stat64.
 2014-01-17 18:36:02 -08:00
Elliott Hughes
c9a60b0f77 Merge "Don't confuse stat and stat64." 2014-01-18 02:32:40 +00:00
Ruben Brunk
d928b8c9a0 Merge "camera3: Update optical stabilization tags." 2014-01-18 02:31:19 +00:00
Ruben Brunk
00849b3a43 camera3: Update optical stabilization tags. 
Change-Id: Ic2bdec216c1685f2ea3036f9d027ea24679a8bfe
 2014-01-17 18:30:23 -08:00
Igor Murashkin
ae7d2f19e4 Merge "camera2: Add synchronization definitions to enable LIMITED HAL3 devices" 2014-01-18 02:28:16 +00:00
Igor Murashkin
3865a84255 camera2: Add synchronization definitions to enable LIMITED HAL3 devices 
Change-Id: Ic5fda4bdc3dda0d21f4738c81b5742f86e4ef02c
 2014-01-17 18:27:35 -08:00
Elliott Hughes
ad076286c3 Don't confuse stat and stat64. 
Bug: 11865851
Change-Id: I45e65036d86c58943b9c273777f3f8be79a6966f
 2014-01-17 18:27:27 -08:00
Igor Murashkin
1e2d27a97f Merge "camera2: Add test patterns and pipeline depth information" 2014-01-18 02:15:25 +00:00
Igor Murashkin
c127f05292 camera2: Add test patterns and pipeline depth information 
Bug: 9625427
Change-Id: I11ff3a74f3a115ac9b699ce516400ed323c274f9
 2014-01-17 18:13:52 -08:00
Jeff Brown
509cc13b70 am e2c9cd58: Merge "Refactor display manager service to new pattern." into klp-modular-dev 
* commit 'e2c9cd583f4f706b48270b8cbe84df627c69af24':
  Refactor display manager service to new pattern.
 2014-01-18 01:53:32 +00:00
Jeff Brown
e2c9cd583f Merge "Refactor display manager service to new pattern." into klp-modular-dev 2014-01-18 01:44:08 +00:00
Ruben Brunk
ce29f43845 Merge "camera3: Update sceneMode tag spec." 2014-01-18 01:43:58 +00:00
Ruben Brunk
e667936693 camera3: Update sceneMode tag spec. 
Change-Id: I495435397086a295280c556d94fe8efd442a12c3
 2014-01-17 17:34:32 -08:00
Igor Murashkin
e0060930cb camera_metadata: Update android.tonemap.* definitions 
Change-Id: Icdabd02d892018b104955146a4d94b5042ea59d8
 2014-01-17 17:24:11 -08:00
Zhijun He
b8fb80dd0c Merge "Camera2: Update shading mode spec" 2014-01-18 00:46:08 +00:00
Ruben Brunk
c759efb9f3 Merge "camera3: Update availableEffects, effectMode tags in frameworks/base." 2014-01-18 00:44:46 +00:00
Zhijun He
ba93fe6468 Camera2: Update shading mode spec 
Change-Id: Id4dc8de6e66aa130677ecab700a982943fcd8e09
 2014-01-17 16:43:05 -08:00
Ruben Brunk
5f1dcfe49d camera3: Update availableEffects, effectMode tags in frameworks/base. 
Change-Id: I1edc89f7af9ef15894cfd398116730afa6b0053c
 2014-01-17 16:42:51 -08:00
Alan Viverette
f9e039dd03 Merge "Prevent RevealDrawable from drawing mask when layer is empty" 2014-01-17 23:45:19 +00:00
Alan Viverette
12b61f20a4 Prevent RevealDrawable from drawing mask when layer is empty 
Compositing the mask layer into an empty layer using SRC_IN will
actually composite into the layer UNDER the empty layer.

Change-Id: I5ba434b0d7e6a5bc707fe842a5db82ae33066912
 2014-01-17 15:38:20 -08:00
Ruben Brunk
aca1c6850d Merge "camera3: Update availableSceneModes tag spec in frameworks/base." 2014-01-17 23:35:21 +00:00
Ruben Brunk
8237d34398 camera3: Update availableSceneModes tag spec in frameworks/base. 
Change-Id: Ic12f131e438d1370c9db0027a4c54a540a5cb78f
 2014-01-17 15:33:02 -08:00
Ruben Brunk
08dd8c49bc Merge "camera3: focalLength tag frameworks/base changes." 2014-01-17 23:24:00 +00:00
Ruben Brunk
a20f4c2648 camera3: focalLength tag frameworks/base changes. 
Change-Id: I59614223ae65e602f3461029cb4b8848fb22950e
 2014-01-17 15:21:13 -08:00
Igor Murashkin
ed9f0ac867 Merge "camera2: Add missing javadoc images" 2014-01-17 23:20:50 +00:00
Igor Murashkin
51522d907d camera2: Add missing javadoc images 
Change-Id: Icc662dd63ba0a3e48b5f94dfb65479abcfacd047
 2014-01-17 15:19:54 -08:00
Igor Murashkin
589b749d47 Merge "camera2: Update spec for android.colorCorrection.* in metadata" 2014-01-17 23:08:39 +00:00
Igor Murashkin
7d2a5c5e73 camera2: Update spec for android.colorCorrection.* in metadata 
Change-Id: I02ba758f3da9e7c9e304591c410ca5385ebf4b4b
 2014-01-17 15:07:52 -08:00
Igor Murashkin
cea3e94388 Merge "camera3: Specify frame durations and minimum frame durations in metadata" 2014-01-17 23:03:31 +00:00
Igor Murashkin
143aa0b891 camera3: Specify frame durations and minimum frame durations in metadata 
Change-Id: Ic52c54c3c26e3547a1064fc5afc8ebbac5b392ad
 2014-01-17 15:02:34 -08:00
ztenghui
0719eb9668 Merge "Property support for light positioning." 2014-01-17 22:09:06 +00:00
Zhijun He
45c4470223 Merge "Camera2: update metadata java doc" 2014-01-17 21:45:31 +00:00
ztenghui
cc3c25622c Property support for light positioning. 
Tune up the light size to make it look better.

Change-Id: I139a05f3dd53dacbe55759b91188f0e1cc2c7f80
 2014-01-17 13:42:09 -08:00
Dianne Hackborn
84aa8ab3c6 Merge "Add --checkin to package manager dump." 2014-01-17 21:38:22 +00:00
Zhijun He
f3b16df380 Camera2: update metadata java doc 
Change-Id: Iafa14eeb7151cd7aada1fd09c1f02b5b36abfa54
 2014-01-17 13:37:59 -08:00
Dianne Hackborn
60dc0d97fc Add --checkin to package manager dump. 
Change-Id: Ibafd82f40dd4fa6a5b700a8b6725b007a528a92f
 2014-01-17 13:29:21 -08:00
Chris Craik
3a3bdd042d am ee846d3e: am 38cf0704: am e9a7d229: am 66b5a2b2: am 5150eb8f: Merge "Initialize pointer members to NULL to avoid illegal reference" 
* commit 'ee846d3e74eda006f4bbf17cb4844b4d8f9c5cb0':
  Initialize pointer members to NULL to avoid illegal reference
 2014-01-17 20:11:38 +00:00
Narayan Kamath
aa27b97f0b am 8582264d: am 766c95be: am e66fa5c1: am 251de854: am 53e9bfae: Merge "Fix error checking in MemoryFile." 
* commit '8582264dbf84aabe18adb113807c1ae8b563b88f':
  Fix error checking in MemoryFile.
 2014-01-17 20:11:29 +00:00
Chris Craik
ee846d3e74 am 38cf0704: am e9a7d229: am 66b5a2b2: am 5150eb8f: Merge "Initialize pointer members to NULL to avoid illegal reference" 
* commit '38cf0704f6fbfa6d41d5d10488ce25e645adb835':
  Initialize pointer members to NULL to avoid illegal reference
 2014-01-17 19:30:31 +00:00
Chris Craik
38cf0704f6 am e9a7d229: am 66b5a2b2: am 5150eb8f: Merge "Initialize pointer members to NULL to avoid illegal reference" 
* commit 'e9a7d22963739bfdace392b9a1707cb0936d25b3':
  Initialize pointer members to NULL to avoid illegal reference
 2014-01-17 19:27:34 +00:00
Narayan Kamath
8582264dbf am 766c95be: am e66fa5c1: am 251de854: am 53e9bfae: Merge "Fix error checking in MemoryFile." 
* commit '766c95be6f3eb33f40241058c0503123e334050f':
  Fix error checking in MemoryFile.
 2014-01-17 19:26:23 +00:00
Chris Craik
e9a7d22963 am 66b5a2b2: am 5150eb8f: Merge "Initialize pointer members to NULL to avoid illegal reference" 
* commit '66b5a2b25bbe9844fc538e383922a0866c0baec0':
  Initialize pointer members to NULL to avoid illegal reference
 2014-01-17 11:24:02 -08:00
Narayan Kamath
766c95be6f am e66fa5c1: am 251de854: am 53e9bfae: Merge "Fix error checking in MemoryFile." 
* commit 'e66fa5c1851f48dce95364dc0acbde1b9f39f160':
  Fix error checking in MemoryFile.
 2014-01-17 19:23:12 +00:00