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
Jeff Brown
4ccb823a9f
Refactor display manager service to new pattern.
...
Transform DisplayManagerService into a SystemService and start cleaning
up other local services that it uses from window manager and input manager.
Clean up service thread initialization.
Remove unnecessary static variables from ActivityManagerService.
It's starting to become clear that we really need a better way to manage
service dependencies. Boot phases don't quite cut it.
Change-Id: If319dbd7cbfbd4812fe55ece969e818d4b20755b
2014-01-16 22:16:42 -08: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
Dianne Hackborn
520e705bf8
Merge "Whoops, we were counting everything twice in the totals. :("
2014-01-17 00:21:22 +00:00
Chris Craik
7b3dfa4d13
Transform shadow casters correctly in 3d
...
Change-Id: I11067c5aa8c749089b6ee163ddafa91865cc0d9f
2014-01-16 16:21:10 -08:00
Dianne Hackborn
ae19a06e03
Whoops, we were counting everything twice in the totals. :(
...
Change-Id: Ia8a5adec4db7d692691b2d7e471c446f963a5c21
2014-01-16 16:18:23 -08:00
Alan Viverette
bdbb065a1d
Merge "Explicit documentation for View.getTag() return value when not set"
2014-01-17 00:06:16 +00:00
Alan Viverette
5bd2c855af
Explicit documentation for View.getTag() return value when not set
...
Change-Id: I143d445b0c801ffabe04f0042e559594e52d07ed
2014-01-16 15:55:25 -08:00
Marco Nelissen
a6a7f2ffc4
Update doc wrt to android:debuggable and CheckJNI
...
Change-Id: Id75642440c8bc86727655debf21c47a1c228bd28
2014-01-16 15:45:47 -08:00
Zhijun He
5f2a47f3de
Camera2: update metadata specs
...
Change-Id: I0f2db931f923af6de281f1404142301d9cfe18ea
2014-01-16 15:44:41 -08:00
Jeff Sharkey
a17059b787
Merge "Run finalizers before counting for StrictMode."
2014-01-16 23:15:17 +00:00
Selim Cinek
fed65a6b4a
Merge "Fixed issue on Keyguard camera icon, where dragging on it did not properly trigger abortion of the camera animation."
2014-01-16 23:00:49 +00:00
Joe Fernandez
2d7ca0c435
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 '6104a749b2d02a8961b694619aee59cd0795e976':
docs: Added note to Support Library Setup page: mediarouter to appcompat dependency
2014-01-16 22:59:33 +00:00
Joe Fernandez
0a53d549f3
am 102e382f: am 75a09a75: am 94149cfb: am acf2b906: Merge "Fixing bugs in MediaPlayer docs" into klp-docs
...
* commit '102e382f26bafe1839c977be6162ccaffc2af578':
Fixing bugs in MediaPlayer docs
2014-01-16 22:59:27 +00:00
Joe Fernandez
6104a749b2
am 12382d13: am fcab250d: am 16fe3737: Merge "docs: Added note to Support Library Setup page: mediarouter to appcompat dependency" into klp-docs
...
* commit '12382d13ff70c591ee31ed6b9004298a037b38e9':
docs: Added note to Support Library Setup page: mediarouter to appcompat dependency
2014-01-16 22:56:15 +00:00
Joe Fernandez
102e382f26
am 75a09a75: am 94149cfb: am acf2b906: Merge "Fixing bugs in MediaPlayer docs" into klp-docs
...
* commit '75a09a752aaf276cc3defee2874270cd20bd8a69':
Fixing bugs in MediaPlayer docs
2014-01-16 22:55:52 +00:00
Joe Fernandez
12382d13ff
am fcab250d: am 16fe3737: Merge "docs: Added note to Support Library Setup page: mediarouter to appcompat dependency" into klp-docs
...
* commit 'fcab250de89352613e3dd8fe6efa180c0a7df4d0':
docs: Added note to Support Library Setup page: mediarouter to appcompat dependency
2014-01-16 14:52:56 -08:00
Joe Fernandez
75a09a752a
am 94149cfb: am acf2b906: Merge "Fixing bugs in MediaPlayer docs" into klp-docs
...
* commit '94149cfb3409244fa2d91ee87c0b4d531447110a':
Fixing bugs in MediaPlayer docs
2014-01-16 14:52:51 -08:00
Joe Fernandez
fcab250de8
am 16fe3737: Merge "docs: Added note to Support Library Setup page: mediarouter to appcompat dependency" into klp-docs
...
* commit '16fe3737457ac844da09cd062e23abedbcc1f3e8':
docs: Added note to Support Library Setup page: mediarouter to appcompat dependency
2014-01-16 22:49:46 +00:00
Joe Fernandez
94149cfb34
am acf2b906: Merge "Fixing bugs in MediaPlayer docs" into klp-docs
...
* commit 'acf2b906b34d7c1d16ecb039390f656784c6d034':
Fixing bugs in MediaPlayer docs
2014-01-16 22:49:42 +00:00
Chris Craik
cf8d9d4af3
Fix view z translation with 3d projection disabled
...
The ortho projection can't handle 3d translation, so skip that step if
perspective projection isn't enabled.
Change-Id: I231e6bcecc82e876b697e098e034f0fd3b06efde
2014-01-16 14:48:54 -08:00
Joe Fernandez
16fe373745
Merge "docs: Added note to Support Library Setup page: mediarouter to appcompat dependency" into klp-docs
2014-01-16 22:46:56 +00:00
Joe Fernandez
acf2b906b3
Merge "Fixing bugs in MediaPlayer docs" into klp-docs
2014-01-16 22:46:17 +00:00
Doug Zongker
35974112ec
Merge "boot into recovery via the pre-recovery service"
2014-01-16 22:41:11 +00:00
Jeff Brown
265e87b408
Fix build.
...
Change-Id: I7e0000a5a98e443f27b90884a85bd6106c1f7b9b
2014-01-16 14:12:54 -08:00
Chris Craik
3197cded4e
Map shadow light position globally
...
Change-Id: Ic3201cecdf5d2a1dd628e7e40aee912ef516d3b2
2014-01-16 14:03:39 -08:00