122509 Commits

Author SHA1 Message Date
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
Doug Zongker
3b0218b0ae 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
2014-01-16 12:54:59 -08:00
Jeff Sharkey
6f3a38f3af 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
2014-01-16 12:46:43 -08:00
Andy Hung
83511d2f49 Add "throws IOException" to MediaCodec factory methods
android.media.MediaCodec
(createByCodecName|createDecoderByType|createEncoderByType)
now explicitly throws IOException.

Requires changes to existing code for declaration compatibility.

Bug: 11364276
Change-Id: I105ecb7c4bd49bf803111253cd23bab161c988f9
Signed-off-by: Andy Hung <hunga@google.com>
2014-01-16 12:35:15 -08:00
Jeff Brown
09d30981f8 resolved conflicts for merge of 6f357d32 to master
Change-Id: I1979e6ed1acddbe656f5010114fd900f10865e75
2014-01-16 11:44:20 -08:00
Jeff Brown
d3ee63b6c6 am 02cc684e: Delete unused power manager functionality.
* commit '02cc684e42b13454ba1a013340b41696323a4c2a':
  Delete unused power manager functionality.
2014-01-16 19:32:58 +00:00
Jeff Brown
6f357d3284 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
2014-01-16 11:24:58 -08:00
Jeff Brown
02cc684e42 Delete unused power manager functionality.
timeSinceScreenWasLastOn() was used by Watchdog previously but is no
longer so we can remove it.

Change-Id: I91c324b6c98c1aeb85f64b0296a41240e6c2ef4f
2014-01-16 11:24:58 -08:00
Alan Viverette
3abc47acf8 Merge "Update smoothScrollToPosition to move faster for large offsets" 2014-01-16 19:13:32 +00:00
Alan Viverette
2b61d5406b Merge "Revert changes to default styles and themes" 2014-01-16 19:13:15 +00:00
Selim Cinek
ed88cee15b 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
2014-01-16 11:03:20 -08:00
Alan Viverette
0269b70fae Revert changes to default styles and themes
Partial revert of commit 65f31d4104a0b667b635abc78406d5159341ad95.

BUG: 12571939
Change-Id: Ideea7b716d5a7b2082a244b9c5ffb02151ee8d67
2014-01-16 11:02:55 -08:00
Victoria Lease
3d4c3aca86 Merge "check for null mEditor in TextView.canCopy()" 2014-01-16 16:31:33 +00:00
quddusc
0574dc53b2 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
2014-01-16 16:17:57 +00:00
quddusc
7d86d6b5a7 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
2014-01-16 16:15:14 +00:00
John Spurlock
ac2c9bf4ce Merge "Defend against malformed broadcast in NotificationManager." 2014-01-16 16:14:09 +00:00
quddusc
aa141fb0d9 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
2014-01-16 16:11:25 +00:00
quddusc
c2cc299998 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
2014-01-16 08:08:24 -08:00
quddusc
7e8a997fdf 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
2014-01-16 16:05:54 +00:00
quddusc
62729b15a9 Merge "docs: Removed obsolete screenshot of Play Store purchase flow. Bug: 9846095" into klp-docs 2014-01-16 16:03:06 +00:00
Narayan Kamath
ab8643452a Track AArch64 changes from AOSP.
mPtr is now long, not int.

Change-Id: I75297cbef3571f8f0cc02a35a06c1bc1f4fbe416
2014-01-16 16:01:22 +00:00
Narayan Kamath
103d34d3bb 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
2014-01-16 15:58:10 +00:00
Narayan Kamath
5875c94c59 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
2014-01-16 15:58:04 +00:00
Narayan Kamath
4d7f945066 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
2014-01-16 15:57:58 +00:00
Narayan Kamath
f25afde8dd am 419267a1: am 213f243f: am 87a82800: am aef12450: am 1b0f0be0: Merge "Make YuvToJpegEncoder more JNI compliant"
* commit '419267a164ba586a81a8e669863a494d2a88a44c':
  Make YuvToJpegEncoder more JNI compliant
2014-01-16 15:57:53 +00:00
Narayan Kamath
6606d16e09 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
2014-01-16 15:57:47 +00:00
Narayan Kamath
a3340da7d4 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
2014-01-16 15:57:41 +00:00
Narayan Kamath
a98bf2017e 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
2014-01-16 15:57:36 +00:00
Narayan Kamath
1bf3ab08db 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
2014-01-16 15:57:29 +00:00
Narayan Kamath
d4513aea25 am a5a0d384: am 425b08f1: am c1abb5e3: am 53321d99: am f19c50d6: Merge "AArch64: Use long for pointers in KeyCharacterMap class"
* commit 'a5a0d384fce9e9475c1414f69cb47bf6b5259a4d':
  AArch64: Use long for pointers in KeyCharacterMap class
2014-01-16 15:57:23 +00:00