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
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
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
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
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
23b7e0a32b
am d8facb67: am d569e21d: am 48de490c: am 486544f7: Merge "AArch64: Use long for pointers in view/input classes"
...
* commit 'd8facb6763638178bd12f1010466e426c0754f49':
AArch64: Use long for pointers in view/input classes
2014-01-16 15:42:14 +00:00
Narayan Kamath
275586aa53
am 7471dfc4: am 42defa02: am faa62aac: am 84ee7930: Merge "AArch64: Use long for pointers in android/os/MessageQueue"
...
* commit '7471dfc4a894ade4cd83949d2b59b9b7e75bbf92':
AArch64: Use long for pointers in android/os/MessageQueue
2014-01-16 15:42:09 +00:00
Narayan Kamath
8492e88a23
am 077386db: am 6b81bfd1: am caea42fd: am 98002dfb: Merge "AArch64: Use long for pointers in graphics/PathMeasure"
...
* commit '077386dbda31bfef96acca3a1ba84fece67e391a':
AArch64: Use long for pointers in graphics/PathMeasure
2014-01-16 15:42:03 +00:00
Narayan Kamath
419267a164
am 213f243f: am 87a82800: am aef12450: am 1b0f0be0: Merge "Make YuvToJpegEncoder more JNI compliant"
...
* commit '213f243f35e8ad7b605c91c08ce6271302d211a7':
Make YuvToJpegEncoder more JNI compliant
2014-01-16 15:41:58 +00:00
Narayan Kamath
6706888e24
am 775667c0: am 03e8be75: am 8796ab7f: am bb35356d: Merge changes Id54087dd,I946325e4,I2a2b2e68
...
* commit '775667c070f6e0375e7a247d30a34b0073d7fd5b':
AArch64: Use long for pointers in BitmapRegionDecoder
AArch64: Use long for pointers in Movie class
AArch64: Add AssetInputStream.getNativeAsset
2014-01-16 15:41:52 +00:00
Narayan Kamath
e18f0e2a46
am 19bd2c28: am ab220dee: am 947d88a0: am 138d67c8: Merge "AArch64: Use long for pointers in MotionEvent class"
...
* commit '19bd2c28f9c3e4db12cad93ed2a69c17c95e42fd':
AArch64: Use long for pointers in MotionEvent class
2014-01-16 15:41:47 +00:00
Narayan Kamath
e413dae892
am 8e96d73a: am e488f2c1: am a0b25d41: am d85bba8e: Merge "AArch64: Use long for pointers in VelocityTracker class"
...
* commit '8e96d73a755348b25ceb80f907eae15be2da0d75':
AArch64: Use long for pointers in VelocityTracker class
2014-01-16 15:41:41 +00:00
Narayan Kamath
c45068e4a4
am d7a54c65: am 31f10bb2: am 80b3dd0d: am 27a647bf: Merge "AArch64: Use long for pointers in android/os/MemoryFile"
...
* commit 'd7a54c6574c3ca759e977f27912caecb6b40e827':
AArch64: Use long for pointers in android/os/MemoryFile
2014-01-16 15:41:35 +00:00
Narayan Kamath
a5a0d384fc
am 425b08f1: am c1abb5e3: am 53321d99: am f19c50d6: Merge "AArch64: Use long for pointers in KeyCharacterMap class"
...
* commit '425b08f14419a1e67a3d9d2c9b97ea61ecd4f5cb':
AArch64: Use long for pointers in KeyCharacterMap class
2014-01-16 15:41:30 +00:00
Narayan Kamath
28c6ec0215
am 1d78ae42: am 24d63a83: am bc0468e6: am 6f17adba: Merge "AArch64: Use long for pointers in media classes"
...
* commit '1d78ae42d0c5968bec0649784000063b689b2c51':
AArch64: Use long for pointers in media classes
2014-01-16 15:41:24 +00:00
Elliott Hughes
8bb8caa2b1
am c12410f1: am c3be4ba3: am 12377887: am 991e9818: Merge "AArch64: Use long for pointers in speech/srec classes"
...
* commit 'c12410f1a3b951126a02ad5fe4160bc830a860ec':
AArch64: Use long for pointers in speech/srec classes
2014-01-16 15:41:18 +00:00
Narayan Kamath
d8facb6763
am d569e21d: am 48de490c: am 486544f7: Merge "AArch64: Use long for pointers in view/input classes"
...
* commit 'd569e21dac38fffe0e6a7f935e9a6965495b87d4':
AArch64: Use long for pointers in view/input classes
2014-01-16 15:38:34 +00:00
Narayan Kamath
7471dfc4a8
am 42defa02: am faa62aac: am 84ee7930: Merge "AArch64: Use long for pointers in android/os/MessageQueue"
...
* commit '42defa02337b94d25714fe737f749f2c3300c790':
AArch64: Use long for pointers in android/os/MessageQueue
2014-01-16 15:38:29 +00:00
Narayan Kamath
077386dbda
am 6b81bfd1: am caea42fd: am 98002dfb: Merge "AArch64: Use long for pointers in graphics/PathMeasure"
...
* commit '6b81bfd10f63c166ff6e4afb0f267ce9e5275366':
AArch64: Use long for pointers in graphics/PathMeasure
2014-01-16 15:38:24 +00:00
Narayan Kamath
213f243f35
am 87a82800: am aef12450: am 1b0f0be0: Merge "Make YuvToJpegEncoder more JNI compliant"
...
* commit '87a82800658c9bcad75881d9761b412a024d7969':
Make YuvToJpegEncoder more JNI compliant
2014-01-16 15:38:19 +00:00
Narayan Kamath
775667c070
am 03e8be75: am 8796ab7f: am bb35356d: Merge changes Id54087dd,I946325e4,I2a2b2e68
...
* commit '03e8be757d2703d52fad3fd153c6bcf0b13ed1d1':
AArch64: Use long for pointers in BitmapRegionDecoder
AArch64: Use long for pointers in Movie class
AArch64: Add AssetInputStream.getNativeAsset
2014-01-16 15:38:15 +00:00
Narayan Kamath
19bd2c28f9
am ab220dee: am 947d88a0: am 138d67c8: Merge "AArch64: Use long for pointers in MotionEvent class"
...
* commit 'ab220deeb8a413649335d5ef47d974dfdc3ac5ec':
AArch64: Use long for pointers in MotionEvent class
2014-01-16 15:38:10 +00:00
Narayan Kamath
8e96d73a75
am e488f2c1: am a0b25d41: am d85bba8e: Merge "AArch64: Use long for pointers in VelocityTracker class"
...
* commit 'e488f2c154f089141709279dd93bcd641c85659b':
AArch64: Use long for pointers in VelocityTracker class
2014-01-16 15:38:05 +00:00
Narayan Kamath
d7a54c6574
am 31f10bb2: am 80b3dd0d: am 27a647bf: Merge "AArch64: Use long for pointers in android/os/MemoryFile"
...
* commit '31f10bb21b24824c5dbf60b420239513f02b9e55':
AArch64: Use long for pointers in android/os/MemoryFile
2014-01-16 15:38:00 +00:00
Narayan Kamath
425b08f144
am c1abb5e3: am 53321d99: am f19c50d6: Merge "AArch64: Use long for pointers in KeyCharacterMap class"
...
* commit 'c1abb5e3957f6abdd9cea8f2717290a3f130a216':
AArch64: Use long for pointers in KeyCharacterMap class
2014-01-16 15:37:55 +00:00
Narayan Kamath
1d78ae42d0
am 24d63a83: am bc0468e6: am 6f17adba: Merge "AArch64: Use long for pointers in media classes"
...
* commit '24d63a838211db019bf7ea970a0d844d8033b729':
AArch64: Use long for pointers in media classes
2014-01-16 15:37:50 +00:00
Elliott Hughes
c12410f1a3
am c3be4ba3: am 12377887: am 991e9818: Merge "AArch64: Use long for pointers in speech/srec classes"
...
* commit 'c3be4ba304196f1624818dce3da43492156b62fe':
AArch64: Use long for pointers in speech/srec classes
2014-01-16 15:37:45 +00:00
Narayan Kamath
d569e21dac
am 48de490c: am 486544f7: Merge "AArch64: Use long for pointers in view/input classes"
...
* commit '48de490c33cac16ed82d753799d7add804f72977':
AArch64: Use long for pointers in view/input classes
2014-01-16 07:35:25 -08:00
Narayan Kamath
42defa0233
am faa62aac: am 84ee7930: Merge "AArch64: Use long for pointers in android/os/MessageQueue"
...
* commit 'faa62aaca5f4a149f20487d42279fefc7d356428':
AArch64: Use long for pointers in android/os/MessageQueue
2014-01-16 07:35:20 -08:00
Narayan Kamath
6b81bfd10f
am caea42fd: am 98002dfb: Merge "AArch64: Use long for pointers in graphics/PathMeasure"
...
* commit 'caea42fd2daabedaed383105e10c11150f52b7df':
AArch64: Use long for pointers in graphics/PathMeasure
2014-01-16 07:35:16 -08:00
Narayan Kamath
87a8280065
am aef12450: am 1b0f0be0: Merge "Make YuvToJpegEncoder more JNI compliant"
...
* commit 'aef12450d2f863fe3ce82458e46f3778b791cc33':
Make YuvToJpegEncoder more JNI compliant
2014-01-16 07:35:10 -08:00
Narayan Kamath
03e8be757d
am 8796ab7f: am bb35356d: Merge changes Id54087dd,I946325e4,I2a2b2e68
...
* commit '8796ab7f22d3e9f5b85571e8851851c023416f96':
AArch64: Use long for pointers in BitmapRegionDecoder
AArch64: Use long for pointers in Movie class
AArch64: Add AssetInputStream.getNativeAsset
2014-01-16 07:35:06 -08:00
Narayan Kamath
ab220deeb8
am 947d88a0: am 138d67c8: Merge "AArch64: Use long for pointers in MotionEvent class"
...
* commit '947d88a0eacafb2e5ec5ce5eaaae8be32ecb9aa9':
AArch64: Use long for pointers in MotionEvent class
2014-01-16 07:35:02 -08:00
Narayan Kamath
e488f2c154
am a0b25d41: am d85bba8e: Merge "AArch64: Use long for pointers in VelocityTracker class"
...
* commit 'a0b25d41d556d2c37852b6036aaf6f33b0e8c5a8':
AArch64: Use long for pointers in VelocityTracker class
2014-01-16 07:34:57 -08:00
Narayan Kamath
31f10bb21b
am 80b3dd0d: am 27a647bf: Merge "AArch64: Use long for pointers in android/os/MemoryFile"
...
* commit '80b3dd0d8e333905e9f2a3a844bc524d41df7da2':
AArch64: Use long for pointers in android/os/MemoryFile
2014-01-16 07:34:53 -08:00
Narayan Kamath
c1abb5e395
am 53321d99: am f19c50d6: Merge "AArch64: Use long for pointers in KeyCharacterMap class"
...
* commit '53321d9990cae810da28b7ae9f6f9b3fe7455020':
AArch64: Use long for pointers in KeyCharacterMap class
2014-01-16 07:34:48 -08:00
Narayan Kamath
24d63a8382
am bc0468e6: am 6f17adba: Merge "AArch64: Use long for pointers in media classes"
...
* commit 'bc0468e67626937300e9afd182656469463d96a1':
AArch64: Use long for pointers in media classes
2014-01-16 07:34:43 -08:00
Elliott Hughes
c3be4ba304
am 12377887: am 991e9818: Merge "AArch64: Use long for pointers in speech/srec classes"
...
* commit '12377887e3a74a69100071e0a383f6d9a54046c9':
AArch64: Use long for pointers in speech/srec classes
2014-01-16 07:34:39 -08:00