OSDN Git Service

android-x86/frameworks-base.git
10 years agoMerge "Camera2: Update shading mode spec"
Zhijun He [Sat, 18 Jan 2014 00:46:08 +0000 (00:46 +0000)]
Merge "Camera2: Update shading mode spec"

10 years agoMerge "camera3: Update availableEffects, effectMode tags in frameworks/base."
Ruben Brunk [Sat, 18 Jan 2014 00:44:46 +0000 (00:44 +0000)]
Merge "camera3: Update availableEffects, effectMode tags in frameworks/base."

10 years agoCamera2: Update shading mode spec
Zhijun He [Sat, 18 Jan 2014 00:43:05 +0000 (16:43 -0800)]
Camera2: Update shading mode spec

Change-Id: Id4dc8de6e66aa130677ecab700a982943fcd8e09

10 years agocamera3: Update availableEffects, effectMode tags in frameworks/base.
Ruben Brunk [Sat, 18 Jan 2014 00:42:51 +0000 (16:42 -0800)]
camera3: Update availableEffects, effectMode tags in frameworks/base.

Change-Id: I1edc89f7af9ef15894cfd398116730afa6b0053c

10 years agoMerge "Prevent RevealDrawable from drawing mask when layer is empty"
Alan Viverette [Fri, 17 Jan 2014 23:45:19 +0000 (23:45 +0000)]
Merge "Prevent RevealDrawable from drawing mask when layer is empty"

10 years agoPrevent RevealDrawable from drawing mask when layer is empty
Alan Viverette [Fri, 17 Jan 2014 23:38:20 +0000 (15:38 -0800)]
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

10 years agoMerge "camera3: Update availableSceneModes tag spec in frameworks/base."
Ruben Brunk [Fri, 17 Jan 2014 23:35:20 +0000 (23:35 +0000)]
Merge "camera3: Update availableSceneModes tag spec in frameworks/base."

10 years agocamera3: Update availableSceneModes tag spec in frameworks/base.
Ruben Brunk [Fri, 17 Jan 2014 23:33:02 +0000 (15:33 -0800)]
camera3: Update availableSceneModes tag spec in frameworks/base.

Change-Id: Ic12f131e438d1370c9db0027a4c54a540a5cb78f

10 years agoMerge "camera3: focalLength tag frameworks/base changes."
Ruben Brunk [Fri, 17 Jan 2014 23:24:00 +0000 (23:24 +0000)]
Merge "camera3: focalLength tag frameworks/base changes."

10 years agocamera3: focalLength tag frameworks/base changes.
Ruben Brunk [Fri, 17 Jan 2014 23:21:13 +0000 (15:21 -0800)]
camera3: focalLength tag frameworks/base changes.

Change-Id: I59614223ae65e602f3461029cb4b8848fb22950e

10 years agoMerge "camera2: Add missing javadoc images"
Igor Murashkin [Fri, 17 Jan 2014 23:20:49 +0000 (23:20 +0000)]
Merge "camera2: Add missing javadoc images"

10 years agocamera2: Add missing javadoc images
Igor Murashkin [Fri, 17 Jan 2014 23:19:54 +0000 (15:19 -0800)]
camera2: Add missing javadoc images

Change-Id: Icc662dd63ba0a3e48b5f94dfb65479abcfacd047

10 years agoMerge "camera2: Update spec for android.colorCorrection.* in metadata"
Igor Murashkin [Fri, 17 Jan 2014 23:08:38 +0000 (23:08 +0000)]
Merge "camera2: Update spec for android.colorCorrection.* in metadata"

10 years agocamera2: Update spec for android.colorCorrection.* in metadata
Igor Murashkin [Fri, 17 Jan 2014 23:07:52 +0000 (15:07 -0800)]
camera2: Update spec for android.colorCorrection.* in metadata

Change-Id: I02ba758f3da9e7c9e304591c410ca5385ebf4b4b

10 years agoMerge "camera3: Specify frame durations and minimum frame durations in metadata"
Igor Murashkin [Fri, 17 Jan 2014 23:03:30 +0000 (23:03 +0000)]
Merge "camera3: Specify frame durations and minimum frame durations in metadata"

10 years agocamera3: Specify frame durations and minimum frame durations in metadata
Igor Murashkin [Fri, 17 Jan 2014 23:02:34 +0000 (15:02 -0800)]
camera3: Specify frame durations and minimum frame durations in metadata

Change-Id: Ic52c54c3c26e3547a1064fc5afc8ebbac5b392ad

10 years agoMerge "Property support for light positioning."
ztenghui [Fri, 17 Jan 2014 22:09:05 +0000 (22:09 +0000)]
Merge "Property support for light positioning."

10 years agoMerge "Camera2: update metadata java doc"
Zhijun He [Fri, 17 Jan 2014 21:45:31 +0000 (21:45 +0000)]
Merge "Camera2: update metadata java doc"

10 years agoProperty support for light positioning.
ztenghui [Fri, 17 Jan 2014 18:34:10 +0000 (10:34 -0800)]
Property support for light positioning.

Tune up the light size to make it look better.

Change-Id: I139a05f3dd53dacbe55759b91188f0e1cc2c7f80

10 years agoMerge "Add --checkin to package manager dump."
Dianne Hackborn [Fri, 17 Jan 2014 21:38:22 +0000 (21:38 +0000)]
Merge "Add --checkin to package manager dump."

10 years agoCamera2: update metadata java doc
Zhijun He [Fri, 17 Jan 2014 21:37:59 +0000 (13:37 -0800)]
Camera2: update metadata java doc

Change-Id: Iafa14eeb7151cd7aada1fd09c1f02b5b36abfa54

10 years agoAdd --checkin to package manager dump.
Dianne Hackborn [Fri, 17 Jan 2014 21:29:21 +0000 (13:29 -0800)]
Add --checkin to package manager dump.

Change-Id: Ibafd82f40dd4fa6a5b700a8b6725b007a528a92f

10 years agoam ee846d3e: am 38cf0704: am e9a7d229: am 66b5a2b2: am 5150eb8f: Merge "Initialize...
Chris Craik [Fri, 17 Jan 2014 20:11:38 +0000 (20:11 +0000)]
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

10 years agoam 8582264d: am 766c95be: am e66fa5c1: am 251de854: am 53e9bfae: Merge "Fix error...
Narayan Kamath [Fri, 17 Jan 2014 20:11:29 +0000 (20:11 +0000)]
am 8582264d: am 766c95be: am e66fa5c1: am 251de854: am 53e9bfae: Merge "Fix error checking in MemoryFile."

* commit '8582264dbf84aabe18adb113807c1ae8b563b88f':
  Fix error checking in MemoryFile.

10 years agoam 38cf0704: am e9a7d229: am 66b5a2b2: am 5150eb8f: Merge "Initialize pointer members...
Chris Craik [Fri, 17 Jan 2014 19:30:31 +0000 (19:30 +0000)]
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

10 years agoam e9a7d229: am 66b5a2b2: am 5150eb8f: Merge "Initialize pointer members to NULL...
Chris Craik [Fri, 17 Jan 2014 19:27:34 +0000 (19:27 +0000)]
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

10 years agoam 766c95be: am e66fa5c1: am 251de854: am 53e9bfae: Merge "Fix error checking in...
Narayan Kamath [Fri, 17 Jan 2014 19:26:23 +0000 (19:26 +0000)]
am 766c95be: am e66fa5c1: am 251de854: am 53e9bfae: Merge "Fix error checking in MemoryFile."

* commit '766c95be6f3eb33f40241058c0503123e334050f':
  Fix error checking in MemoryFile.

10 years agoam 66b5a2b2: am 5150eb8f: Merge "Initialize pointer members to NULL to avoid illegal...
Chris Craik [Fri, 17 Jan 2014 19:24:02 +0000 (11:24 -0800)]
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

10 years agoam e66fa5c1: am 251de854: am 53e9bfae: Merge "Fix error checking in MemoryFile."
Narayan Kamath [Fri, 17 Jan 2014 19:23:12 +0000 (19:23 +0000)]
am e66fa5c1: am 251de854: am 53e9bfae: Merge "Fix error checking in MemoryFile."

* commit 'e66fa5c1851f48dce95364dc0acbde1b9f39f160':
  Fix error checking in MemoryFile.

10 years agoam 5150eb8f: Merge "Initialize pointer members to NULL to avoid illegal reference"
Chris Craik [Fri, 17 Jan 2014 19:20:38 +0000 (11:20 -0800)]
am 5150eb8f: Merge "Initialize pointer members to NULL to avoid illegal reference"

* commit '5150eb8f5f66104a8bc0884f9eb348e3f08ee6fb':
  Initialize pointer members to NULL to avoid illegal reference

10 years agoam 251de854: am 53e9bfae: Merge "Fix error checking in MemoryFile."
Narayan Kamath [Fri, 17 Jan 2014 19:19:57 +0000 (11:19 -0800)]
am 251de854: am 53e9bfae: Merge "Fix error checking in MemoryFile."

* commit '251de854f02a22ae613964de7ec96f2e0816e503':
  Fix error checking in MemoryFile.

10 years agoMerge "Initialize pointer members to NULL to avoid illegal reference"
Chris Craik [Fri, 17 Jan 2014 18:41:14 +0000 (18:41 +0000)]
Merge "Initialize pointer members to NULL to avoid illegal reference"

10 years agocamera3: Update filterdensity tags.
Ruben Brunk [Fri, 17 Jan 2014 18:30:32 +0000 (10:30 -0800)]
camera3: Update filterdensity tags.

Change-Id: I4e73dcbcfb5a9230e8e2d187e47bc0f829ffc7f6

10 years agoam 53e9bfae: Merge "Fix error checking in MemoryFile."
Narayan Kamath [Fri, 17 Jan 2014 17:36:23 +0000 (09:36 -0800)]
am 53e9bfae: Merge "Fix error checking in MemoryFile."

* commit '53e9bfaee1064f1858c307409e51aa4566ae4b95':
  Fix error checking in MemoryFile.

10 years agojni: Resolve build warnings
Mark Salyzyn [Thu, 7 Nov 2013 19:16:22 +0000 (11:16 -0800)]
jni: Resolve build warnings

Change-Id: I3659193f1ba1ba94561e4684cdb6627880ffc2fa
Author:     Mark Salyzyn <salyzyn@google.com>

10 years agoMerge "Fix error checking in MemoryFile."
Narayan Kamath [Fri, 17 Jan 2014 10:25:27 +0000 (10:25 +0000)]
Merge "Fix error checking in MemoryFile."

10 years agoInitialize pointer members to NULL to avoid illegal reference
lina.x.pi [Thu, 9 Jan 2014 10:17:03 +0000 (18:17 +0800)]
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

10 years agoMerge "Camera2: update captureIntent and flash mode tag spec"
Zhijun He [Fri, 17 Jan 2014 02:25:47 +0000 (02:25 +0000)]
Merge "Camera2: update captureIntent and flash mode tag spec"

10 years agoCamera2: update captureIntent and flash mode tag spec
Zhijun He [Fri, 17 Jan 2014 02:18:50 +0000 (18:18 -0800)]
Camera2: update captureIntent and flash mode tag spec

Change-Id: Icf32f8643f7dbe4da98bed2d5a22298af7b58d26

10 years agoMerge "Map shadow light position globally"
Chris Craik [Fri, 17 Jan 2014 02:09:18 +0000 (02:09 +0000)]
Merge "Map shadow light position globally"

10 years agoMerge "Fix view z translation with 3d projection disabled"
Chris Craik [Fri, 17 Jan 2014 02:07:45 +0000 (02:07 +0000)]
Merge "Fix view z translation with 3d projection disabled"

10 years agoMerge "Transform shadow casters correctly in 3d"
Chris Craik [Fri, 17 Jan 2014 02:07:32 +0000 (02:07 +0000)]
Merge "Transform shadow casters correctly in 3d"

10 years agoMerge "Make the range checking of BaseInputConnection#setSelection stricter"
Yohei Yukawa [Fri, 17 Jan 2014 01:57:52 +0000 (01:57 +0000)]
Merge "Make the range checking of BaseInputConnection#setSelection stricter"

10 years agoCamera2: Update 3A state doc
Zhijun He [Fri, 17 Jan 2014 01:22:05 +0000 (17:22 -0800)]
Camera2: Update 3A state doc

Change-Id: Id484bdff38af34ad2c8b64863d036ff81124401e

10 years agoam 2d7ca0c4: am 6104a749: am 12382d13: am fcab250d: am 16fe3737: Merge "docs: Added...
Joe Fernandez [Fri, 17 Jan 2014 01:06:39 +0000 (01:06 +0000)]
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

10 years agoam 0a53d549: am 102e382f: am 75a09a75: am 94149cfb: am acf2b906: Merge "Fixing bugs...
Joe Fernandez [Fri, 17 Jan 2014 01:06:34 +0000 (01:06 +0000)]
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

10 years agoMake the range checking of BaseInputConnection#setSelection stricter
Yohei Yukawa [Thu, 16 Jan 2014 23:59:07 +0000 (08:59 +0900)]
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

10 years agoMerge "Update doc wrt to android:debuggable and CheckJNI"
Marco Nelissen [Fri, 17 Jan 2014 00:32:24 +0000 (00:32 +0000)]
Merge "Update doc wrt to android:debuggable and CheckJNI"

10 years agoMerge "Camera2: Sort metadata @see to make it stable over time"
Eino-Ville Talvala [Fri, 17 Jan 2014 00:29:03 +0000 (00:29 +0000)]
Merge "Camera2: Sort metadata @see to make it stable over time"

10 years agoCamera2: Sort metadata @see to make it stable over time
Eino-Ville Talvala [Fri, 17 Jan 2014 00:18:52 +0000 (16:18 -0800)]
Camera2: Sort metadata @see to make it stable over time

Bug: 12591820
Change-Id: Idcfd7acd6f9426162ccf0e51fcfdba9f646d4cc0

10 years agoMerge "Whoops, we were counting everything twice in the totals. :("
Dianne Hackborn [Fri, 17 Jan 2014 00:21:21 +0000 (00:21 +0000)]
Merge "Whoops, we were counting everything twice in the totals. :("

10 years agoTransform shadow casters correctly in 3d
Chris Craik [Fri, 17 Jan 2014 00:21:10 +0000 (16:21 -0800)]
Transform shadow casters correctly in 3d

Change-Id: I11067c5aa8c749089b6ee163ddafa91865cc0d9f

10 years agoWhoops, we were counting everything twice in the totals. :(
Dianne Hackborn [Fri, 17 Jan 2014 00:18:23 +0000 (16:18 -0800)]
Whoops, we were counting everything twice in the totals. :(

Change-Id: Ia8a5adec4db7d692691b2d7e471c446f963a5c21

10 years agoMerge "Explicit documentation for View.getTag() return value when not set"
Alan Viverette [Fri, 17 Jan 2014 00:06:16 +0000 (00:06 +0000)]
Merge "Explicit documentation for View.getTag() return value when not set"

10 years agoExplicit documentation for View.getTag() return value when not set
Alan Viverette [Thu, 16 Jan 2014 23:55:25 +0000 (15:55 -0800)]
Explicit documentation for View.getTag() return value when not set

Change-Id: I143d445b0c801ffabe04f0042e559594e52d07ed

10 years agoUpdate doc wrt to android:debuggable and CheckJNI
Marco Nelissen [Thu, 16 Jan 2014 23:21:44 +0000 (15:21 -0800)]
Update doc wrt to android:debuggable and CheckJNI

Change-Id: Id75642440c8bc86727655debf21c47a1c228bd28

10 years agoCamera2: update metadata specs
Zhijun He [Thu, 16 Jan 2014 23:44:41 +0000 (15:44 -0800)]
Camera2: update metadata specs

Change-Id: I0f2db931f923af6de281f1404142301d9cfe18ea

10 years agoMerge "Run finalizers before counting for StrictMode."
Jeff Sharkey [Thu, 16 Jan 2014 23:15:17 +0000 (23:15 +0000)]
Merge "Run finalizers before counting for StrictMode."

10 years agoMerge "Fixed issue on Keyguard camera icon, where dragging on it did not properly...
Selim Cinek [Thu, 16 Jan 2014 23:00:48 +0000 (23:00 +0000)]
Merge "Fixed issue on Keyguard camera icon, where dragging on it did not properly trigger abortion of the camera animation."

10 years agoam 6104a749: am 12382d13: am fcab250d: am 16fe3737: Merge "docs: Added note to Suppor...
Joe Fernandez [Thu, 16 Jan 2014 22:59:33 +0000 (22:59 +0000)]
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

10 years agoam 102e382f: am 75a09a75: am 94149cfb: am acf2b906: Merge "Fixing bugs in MediaPlayer...
Joe Fernandez [Thu, 16 Jan 2014 22:59:27 +0000 (22:59 +0000)]
am 102e382f: am 75a09a75: am 94149cfb: am acf2b906: Merge "Fixing bugs in MediaPlayer docs" into klp-docs

* commit '102e382f26bafe1839c977be6162ccaffc2af578':
  Fixing bugs in MediaPlayer docs

10 years agoam 12382d13: am fcab250d: am 16fe3737: Merge "docs: Added note to Support Library...
Joe Fernandez [Thu, 16 Jan 2014 22:56:15 +0000 (22:56 +0000)]
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

10 years agoam 75a09a75: am 94149cfb: am acf2b906: Merge "Fixing bugs in MediaPlayer docs" into...
Joe Fernandez [Thu, 16 Jan 2014 22:55:52 +0000 (22:55 +0000)]
am 75a09a75: am 94149cfb: am acf2b906: Merge "Fixing bugs in MediaPlayer docs" into klp-docs

* commit '75a09a752aaf276cc3defee2874270cd20bd8a69':
  Fixing bugs in MediaPlayer docs

10 years agoam fcab250d: am 16fe3737: Merge "docs: Added note to Support Library Setup page:...
Joe Fernandez [Thu, 16 Jan 2014 22:52:56 +0000 (14:52 -0800)]
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

10 years agoam 94149cfb: am acf2b906: Merge "Fixing bugs in MediaPlayer docs" into klp-docs
Joe Fernandez [Thu, 16 Jan 2014 22:52:51 +0000 (14:52 -0800)]
am 94149cfb: am acf2b906: Merge "Fixing bugs in MediaPlayer docs" into klp-docs

* commit '94149cfb3409244fa2d91ee87c0b4d531447110a':
  Fixing bugs in MediaPlayer docs

10 years agoam 16fe3737: Merge "docs: Added note to Support Library Setup page: mediarouter to...
Joe Fernandez [Thu, 16 Jan 2014 22:49:46 +0000 (22:49 +0000)]
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

10 years agoam acf2b906: Merge "Fixing bugs in MediaPlayer docs" into klp-docs
Joe Fernandez [Thu, 16 Jan 2014 22:49:42 +0000 (22:49 +0000)]
am acf2b906: Merge "Fixing bugs in MediaPlayer docs" into klp-docs

* commit 'acf2b906b34d7c1d16ecb039390f656784c6d034':
  Fixing bugs in MediaPlayer docs

10 years agoFix view z translation with 3d projection disabled
Chris Craik [Thu, 16 Jan 2014 22:48:54 +0000 (14:48 -0800)]
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

10 years agoMerge "docs: Added note to Support Library Setup page: mediarouter to appcompat depen...
Joe Fernandez [Thu, 16 Jan 2014 22:46:56 +0000 (22:46 +0000)]
Merge "docs: Added note to Support Library Setup page: mediarouter to appcompat dependency" into klp-docs

10 years agoMerge "Fixing bugs in MediaPlayer docs" into klp-docs
Joe Fernandez [Thu, 16 Jan 2014 22:46:17 +0000 (22:46 +0000)]
Merge "Fixing bugs in MediaPlayer docs" into klp-docs

10 years agoMerge "boot into recovery via the pre-recovery service"
Doug Zongker [Thu, 16 Jan 2014 22:41:10 +0000 (22:41 +0000)]
Merge "boot into recovery via the pre-recovery service"

10 years agoFix build.
Jeff Brown [Thu, 16 Jan 2014 22:12:54 +0000 (14:12 -0800)]
Fix build.

Change-Id: I7e0000a5a98e443f27b90884a85bd6106c1f7b9b

10 years agoMap shadow light position globally
Chris Craik [Thu, 16 Jan 2014 22:03:39 +0000 (14:03 -0800)]
Map shadow light position globally

Change-Id: Ic3201cecdf5d2a1dd628e7e40aee912ef516d3b2

10 years agoboot into recovery via the pre-recovery service
Doug Zongker [Tue, 14 Jan 2014 20:29:06 +0000 (12:29 -0800)]
boot into recovery via the pre-recovery service

Change PowerManagerService to start the pre-recovery service rather
than rebooting directly, when requested to reboot into recovery.  Add
a new RECOVERY permission which a caller needs (in addition to REBOOT)
in order to go to recovery.

Bug: 12188746
Change-Id: I39121b701c4724558fe751adfbad79f8567faa43

10 years agoRun finalizers before counting for StrictMode.
Jeff Sharkey [Thu, 16 Jan 2014 20:46:37 +0000 (12:46 -0800)]
Run finalizers before counting for StrictMode.

Otherwise we sometimes end up counting objects strongly referenced
by the finalizer queue, and falsely detecting an instance leak.

Bug: 12533002
Change-Id: I144c941a3dfb0cbb837b98e80d2f49ffc9ca13c7

10 years agoresolved conflicts for merge of 6f357d32 to master
Jeff Brown [Thu, 16 Jan 2014 19:44:20 +0000 (11:44 -0800)]
resolved conflicts for merge of 6f357d32 to master

Change-Id: I1979e6ed1acddbe656f5010114fd900f10865e75

10 years agoam 02cc684e: Delete unused power manager functionality.
Jeff Brown [Thu, 16 Jan 2014 19:32:58 +0000 (19:32 +0000)]
am 02cc684e: Delete unused power manager functionality.

* commit '02cc684e42b13454ba1a013340b41696323a4c2a':
  Delete unused power manager functionality.

10 years agoStart untangling system server early bootstrapping.
Jeff Brown [Thu, 16 Jan 2014 04:40:55 +0000 (20:40 -0800)]
Start untangling system server early bootstrapping.

Refactored SystemServer to get rid of a bunch of legacy cruft related
to how the ServerThread used to be started up.

Create system context first when system server starts.  This removes
the tangled initialization order dependency that forced us to start
the activity manager service before most anything else.

Moved factory test related constants into the FactoryTest class.

Partially migrated Installer, ActivityManagerService, and
PowerManagerService to the new SystemService pattern.  There's more
work to be done here, particularly around the lifecycle of the
power manager.

Bug: 12172368
Change-Id: Ia527dd56e3b3fd90f9eeb41289dbe044921230d4

10 years agoDelete unused power manager functionality.
Jeff Brown [Thu, 16 Jan 2014 04:41:26 +0000 (20:41 -0800)]
Delete unused power manager functionality.

timeSinceScreenWasLastOn() was used by Watchdog previously but is no
longer so we can remove it.

Change-Id: I91c324b6c98c1aeb85f64b0296a41240e6c2ef4f

10 years agoMerge "Update smoothScrollToPosition to move faster for large offsets"
Alan Viverette [Thu, 16 Jan 2014 19:13:32 +0000 (19:13 +0000)]
Merge "Update smoothScrollToPosition to move faster for large offsets"

10 years agoMerge "Revert changes to default styles and themes"
Alan Viverette [Thu, 16 Jan 2014 19:13:15 +0000 (19:13 +0000)]
Merge "Revert changes to default styles and themes"

10 years agoFixed issue on Keyguard camera icon, where dragging on it
Selim Cinek [Sat, 11 Jan 2014 01:28:15 +0000 (17:28 -0800)]
Fixed issue on Keyguard camera icon, where dragging on it
did not properly trigger abortion of the camera animation.

Also minorly simplified the touch slop calculation

BUG: 12036618
Change-Id: If01b48c815200066b32a37ffc44949edde1376f9

10 years agoRevert changes to default styles and themes
Alan Viverette [Thu, 16 Jan 2014 19:02:55 +0000 (11:02 -0800)]
Revert changes to default styles and themes

Partial revert of commit 65f31d4104a0b667b635abc78406d5159341ad95.

BUG: 12571939
Change-Id: Ideea7b716d5a7b2082a244b9c5ffb02151ee8d67

10 years agoMerge "check for null mEditor in TextView.canCopy()"
Victoria Lease [Thu, 16 Jan 2014 16:31:33 +0000 (16:31 +0000)]
Merge "check for null mEditor in TextView.canCopy()"

10 years agoam 7d86d6b5: am aa141fb0: am c2cc2999: am 7e8a997f: am 62729b15: Merge "docs: Removed...
quddusc [Thu, 16 Jan 2014 16:17:57 +0000 (16:17 +0000)]
am 7d86d6b5: am aa141fb0: am c2cc2999: am 7e8a997f: am 62729b15: Merge "docs: Removed obsolete screenshot of Play Store purchase flow. Bug: 9846095" into klp-docs

* commit '7d86d6b5a7a680b243fb99aadf338a0e55ddbdd8':
  docs: Removed obsolete screenshot of Play Store purchase flow. Bug: 9846095

10 years agoam aa141fb0: am c2cc2999: am 7e8a997f: am 62729b15: Merge "docs: Removed obsolete...
quddusc [Thu, 16 Jan 2014 16:15:14 +0000 (16:15 +0000)]
am aa141fb0: am c2cc2999: am 7e8a997f: am 62729b15: Merge "docs: Removed obsolete screenshot of Play Store purchase flow. Bug: 9846095" into klp-docs

* commit 'aa141fb0d9c7938df317954054ba87e16595e4e7':
  docs: Removed obsolete screenshot of Play Store purchase flow. Bug: 9846095

10 years agoMerge "Defend against malformed broadcast in NotificationManager."
John Spurlock [Thu, 16 Jan 2014 16:14:09 +0000 (16:14 +0000)]
Merge "Defend against malformed broadcast in NotificationManager."

10 years agoam c2cc2999: am 7e8a997f: am 62729b15: Merge "docs: Removed obsolete screenshot of...
quddusc [Thu, 16 Jan 2014 16:11:25 +0000 (16:11 +0000)]
am c2cc2999: am 7e8a997f: am 62729b15: Merge "docs: Removed obsolete screenshot of Play Store purchase flow. Bug: 9846095" into klp-docs

* commit 'c2cc2999983d221b293d561dd6af8ac0820266c4':
  docs: Removed obsolete screenshot of Play Store purchase flow. Bug: 9846095

10 years agoam 7e8a997f: am 62729b15: Merge "docs: Removed obsolete screenshot of Play Store...
quddusc [Thu, 16 Jan 2014 16:08:24 +0000 (08:08 -0800)]
am 7e8a997f: am 62729b15: Merge "docs: Removed obsolete screenshot of Play Store purchase flow. Bug: 9846095" into klp-docs

* commit '7e8a997fdf8acb90d81d57e1563a8d9f858464bd':
  docs: Removed obsolete screenshot of Play Store purchase flow. Bug: 9846095

10 years agoam 62729b15: Merge "docs: Removed obsolete screenshot of Play Store purchase flow...
quddusc [Thu, 16 Jan 2014 16:05:54 +0000 (16:05 +0000)]
am 62729b15: Merge "docs: Removed obsolete screenshot of Play Store purchase flow. Bug: 9846095" into klp-docs

* commit '62729b15a91525cef4dd27226099c245d38e6495':
  docs: Removed obsolete screenshot of Play Store purchase flow. Bug: 9846095

10 years agoMerge "docs: Removed obsolete screenshot of Play Store purchase flow. Bug: 9846095...
quddusc [Thu, 16 Jan 2014 16:03:06 +0000 (16:03 +0000)]
Merge "docs: Removed obsolete screenshot of Play Store purchase flow. Bug: 9846095" into klp-docs

10 years agoTrack AArch64 changes from AOSP.
Narayan Kamath [Thu, 16 Jan 2014 11:22:52 +0000 (11:22 +0000)]
Track AArch64 changes from AOSP.

mPtr is now long, not int.

Change-Id: I75297cbef3571f8f0cc02a35a06c1bc1f4fbe416

10 years agoam 23b7e0a3: am d8facb67: am d569e21d: am 48de490c: am 486544f7: Merge "AArch64:...
Narayan Kamath [Thu, 16 Jan 2014 15:58:10 +0000 (15:58 +0000)]
am 23b7e0a3: am d8facb67: am d569e21d: am 48de490c: am 486544f7: Merge "AArch64: Use long for pointers in view/input classes"

* commit '23b7e0a32bee5234ef65fccfef1596659a08b630':
  AArch64: Use long for pointers in view/input classes

10 years agoam 275586aa: am 7471dfc4: am 42defa02: am faa62aac: am 84ee7930: Merge "AArch64:...
Narayan Kamath [Thu, 16 Jan 2014 15:58:04 +0000 (15:58 +0000)]
am 275586aa: am 7471dfc4: am 42defa02: am faa62aac: am 84ee7930: Merge "AArch64: Use long for pointers in android/os/MessageQueue"

* commit '275586aa53889a851e0b739e408896861d76e3a8':
  AArch64: Use long for pointers in android/os/MessageQueue

10 years agoam 8492e88a: am 077386db: am 6b81bfd1: am caea42fd: am 98002dfb: Merge "AArch64:...
Narayan Kamath [Thu, 16 Jan 2014 15:57:58 +0000 (15:57 +0000)]
am 8492e88a: am 077386db: am 6b81bfd1: am caea42fd: am 98002dfb: Merge "AArch64: Use long for pointers in graphics/PathMeasure"

* commit '8492e88a23ee4ac32f05b277654e0f9455fefa9b':
  AArch64: Use long for pointers in graphics/PathMeasure

10 years agoam 419267a1: am 213f243f: am 87a82800: am aef12450: am 1b0f0be0: Merge "Make YuvToJpe...
Narayan Kamath [Thu, 16 Jan 2014 15:57:53 +0000 (15:57 +0000)]
am 419267a1: am 213f243f: am 87a82800: am aef12450: am 1b0f0be0: Merge "Make YuvToJpegEncoder more JNI compliant"

* commit '419267a164ba586a81a8e669863a494d2a88a44c':
  Make YuvToJpegEncoder more JNI compliant

10 years agoam 6706888e: am 775667c0: am 03e8be75: am 8796ab7f: am bb35356d: Merge changes Id5408...
Narayan Kamath [Thu, 16 Jan 2014 15:57:47 +0000 (15:57 +0000)]
am 6706888e: am 775667c0: am 03e8be75: am 8796ab7f: am bb35356d: Merge changes Id54087dd,I946325e4,I2a2b2e68

* commit '6706888e24aee04c2c914c44e5ef5b1510cf8013':
  AArch64: Use long for pointers in BitmapRegionDecoder
  AArch64: Use long for pointers in Movie class
  AArch64: Add AssetInputStream.getNativeAsset

10 years agoam e18f0e2a: am 19bd2c28: am ab220dee: am 947d88a0: am 138d67c8: Merge "AArch64:...
Narayan Kamath [Thu, 16 Jan 2014 15:57:41 +0000 (15:57 +0000)]
am e18f0e2a: am 19bd2c28: am ab220dee: am 947d88a0: am 138d67c8: Merge "AArch64: Use long for pointers in MotionEvent class"

* commit 'e18f0e2a463374502c0236a0d54909d980bf1043':
  AArch64: Use long for pointers in MotionEvent class

10 years agoam e413dae8: am 8e96d73a: am e488f2c1: am a0b25d41: am d85bba8e: Merge "AArch64:...
Narayan Kamath [Thu, 16 Jan 2014 15:57:36 +0000 (15:57 +0000)]
am e413dae8: am 8e96d73a: am e488f2c1: am a0b25d41: am d85bba8e: Merge "AArch64: Use long for pointers in VelocityTracker class"

* commit 'e413dae8926f45e08e93dd9454f3b683514f3106':
  AArch64: Use long for pointers in VelocityTracker class

10 years agoam c45068e4: am d7a54c65: am 31f10bb2: am 80b3dd0d: am 27a647bf: Merge "AArch64:...
Narayan Kamath [Thu, 16 Jan 2014 15:57:29 +0000 (15:57 +0000)]
am c45068e4: am d7a54c65: am 31f10bb2: am 80b3dd0d: am 27a647bf: Merge "AArch64: Use long for pointers in android/os/MemoryFile"

* commit 'c45068e4a48053447413783e549be7273e38ea97':
  AArch64: Use long for pointers in android/os/MemoryFile