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

122409 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Chris Craik
66b5a2b25b am 5150eb8f: Merge "Initialize pointer members to NULL to avoid illegal reference" 
* commit '5150eb8f5f66104a8bc0884f9eb348e3f08ee6fb':
  Initialize pointer members to NULL to avoid illegal reference
 2014-01-17 11:20:38 -08:00
Narayan Kamath
e66fa5c185 am 251de854: am 53e9bfae: Merge "Fix error checking in MemoryFile." 
* commit '251de854f02a22ae613964de7ec96f2e0816e503':
  Fix error checking in MemoryFile.
 2014-01-17 11:19:57 -08:00
Chris Craik
5150eb8f5f Merge "Initialize pointer members to NULL to avoid illegal reference" 2014-01-17 18:41:15 +00:00
Ruben Brunk
855bae407d camera3: Update filterdensity tags. 
Change-Id: I4e73dcbcfb5a9230e8e2d187e47bc0f829ffc7f6
 2014-01-17 18:31:20 +00:00
Narayan Kamath
251de854f0 am 53e9bfae: Merge "Fix error checking in MemoryFile." 
* commit '53e9bfaee1064f1858c307409e51aa4566ae4b95':
  Fix error checking in MemoryFile.
 2014-01-17 09:36:23 -08:00
Mark Salyzyn
087f58dd80 jni: Resolve build warnings 
Change-Id: I3659193f1ba1ba94561e4684cdb6627880ffc2fa
Author:     Mark Salyzyn <salyzyn@google.com>
 2014-01-17 07:51:48 -08:00
Narayan Kamath
53e9bfaee1 Merge "Fix error checking in MemoryFile." 2014-01-17 10:25:27 +00:00
lina.x.pi
920287399a Initialize pointer members to NULL to avoid illegal reference 
mBitmap and mTexture is not initialized to NULL which causes
illegal address access when it fails to be created from
oversized bitmap.

Change-Id: Iea54bec8788bc5f3a10040fdb43f416c0d41a14c
 2014-01-17 13:49:26 +09:00
Zhijun He
a739445a63 Merge "Camera2: update captureIntent and flash mode tag spec" 2014-01-17 02:25:47 +00:00
Zhijun He
66d065a6d4 Camera2: update captureIntent and flash mode tag spec 
Change-Id: Icf32f8643f7dbe4da98bed2d5a22298af7b58d26
 2014-01-16 18:18:50 -08:00
Chris Craik
8191effc83 Merge "Map shadow light position globally" 2014-01-17 02:09:19 +00:00
Chris Craik
ed0f7cba53 Merge "Fix view z translation with 3d projection disabled" 2014-01-17 02:07:46 +00:00
Chris Craik
ca10d38aef Merge "Transform shadow casters correctly in 3d" 2014-01-17 02:07:32 +00:00
Yohei Yukawa
c4d0696dd3 Merge "Make the range checking of BaseInputConnection#setSelection stricter" 2014-01-17 01:57:52 +00:00
Zhijun He
228f4f92e7 Camera2: Update 3A state doc 
Change-Id: Id484bdff38af34ad2c8b64863d036ff81124401e
 2014-01-16 17:22:05 -08:00
Joe Fernandez
a7eda49a82 am 2d7ca0c4: am 6104a749: am 12382d13: am fcab250d: am 16fe3737: Merge "docs: Added note to Support Library Setup page: mediarouter to appcompat dependency" into klp-docs 
* commit '2d7ca0c435e9acdff274d2a7817879ec44f61b45':
  docs: Added note to Support Library Setup page: mediarouter to appcompat dependency
 2014-01-17 01:06:39 +00:00
Joe Fernandez
acc96b79e7 am 0a53d549: am 102e382f: am 75a09a75: am 94149cfb: am acf2b906: Merge "Fixing bugs in MediaPlayer docs" into klp-docs 
* commit '0a53d549f38c735cf3cc1eacf401bbf906785b26':
  Fixing bugs in MediaPlayer docs
 2014-01-17 01:06:34 +00:00
Yohei Yukawa
ef0904106d Make the range checking of BaseInputConnection#setSelection stricter 
With this change, setSelection will not cause java.lang.IndexOutOfBoundsException
even if a negative index is specified.

Bug: 8841916
Change-Id: Ib62a6ba235f80b7495fefb2e5cc2d5357d804310
 2014-01-17 09:59:25 +09:00
Marco Nelissen
77be6f9426 Merge "Update doc wrt to android:debuggable and CheckJNI" 2014-01-17 00:32:24 +00:00
Eino-Ville Talvala
77c3c99833 Merge "Camera2: Sort metadata @see to make it stable over time" 2014-01-17 00:29:04 +00:00
Eino-Ville Talvala
265b34ce33 Camera2: Sort metadata @see to make it stable over time 
Bug: 12591820
Change-Id: Idcfd7acd6f9426162ccf0e51fcfdba9f646d4cc0
 2014-01-17 00:24:14 +00:00