Elliott Hughes
a850e5ac27
am 8815d261: am 8da106eb: am aa80f1a3: am c9a60b0f: Merge "Don\'t confuse stat and stat64."
...
* commit '8815d261d9fefbac8f24936dc37a055ab9ced038':
Don't confuse stat and stat64.
2014-01-18 02:44:06 +00:00
Elliott Hughes
8815d261d9
am 8da106eb: am aa80f1a3: am c9a60b0f: Merge "Don\'t confuse stat and stat64."
...
* commit '8da106ebf31d725c00c1910a51f6e1cfb0d8c052':
Don't confuse stat and stat64.
2014-01-18 02:42:01 +00:00
Elliott Hughes
8da106ebf3
am aa80f1a3: am c9a60b0f: Merge "Don\'t confuse stat and stat64."
...
* commit 'aa80f1a3caf6271f1c48a779e260811f2802a9f0':
Don't confuse stat and stat64.
2014-01-17 18:38:17 -08:00
Elliott Hughes
ad076286c3
Don't confuse stat and stat64.
...
Bug: 11865851
Change-Id: I45e65036d86c58943b9c273777f3f8be79a6966f
2014-01-17 18:27:27 -08:00
Jeff Brown
e2c9cd583f
Merge "Refactor display manager service to new pattern." into klp-modular-dev
2014-01-18 01:44:08 +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
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
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
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
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
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
Narayan Kamath
6ffb091719
Fix error checking in MemoryFile.
...
mmap returns MAP_FAILED on failures, not 0 (NULL).
Also, convert some C style casts to C++ since they
make intent clearer.
Change-Id: I367993c73e9ee576f11ebe76e530d2c2f27c662d
2014-01-16 13:18:28 +00:00
Narayan Kamath
486544f763
Merge "AArch64: Use long for pointers in view/input classes"
2014-01-16 12:12:31 +00:00
Narayan Kamath
84ee7930bb
Merge "AArch64: Use long for pointers in android/os/MessageQueue"
2014-01-16 12:12:15 +00:00
Narayan Kamath
98002dfb60
Merge "AArch64: Use long for pointers in graphics/PathMeasure"
2014-01-16 12:12:11 +00:00
Narayan Kamath
1b0f0be097
Merge "Make YuvToJpegEncoder more JNI compliant"
2014-01-16 12:12:01 +00:00
Narayan Kamath
bb35356dc0
Merge changes Id54087dd,I946325e4,I2a2b2e68
...
* changes:
AArch64: Use long for pointers in BitmapRegionDecoder
AArch64: Use long for pointers in Movie class
AArch64: Add AssetInputStream.getNativeAsset
2014-01-16 12:11:58 +00:00
Narayan Kamath
138d67c847
Merge "AArch64: Use long for pointers in MotionEvent class"
2014-01-16 12:11:55 +00:00