OSDN Git Service
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
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
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
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
Joe Fernandez [Thu, 16 Jan 2014 22:46:17 +0000 (22:46 +0000)]
Merge "Fixing bugs in MediaPlayer docs" into klp-docs
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
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
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
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
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
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
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
Narayan Kamath [Thu, 16 Jan 2014 15:42:14 +0000 (15:42 +0000)]
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
Narayan Kamath [Thu, 16 Jan 2014 15:42:09 +0000 (15:42 +0000)]
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
Narayan Kamath [Thu, 16 Jan 2014 15:42:03 +0000 (15:42 +0000)]
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
Narayan Kamath [Thu, 16 Jan 2014 15:41:58 +0000 (15:41 +0000)]
am
213f243f: am
87a82800: am
aef12450: am
1b0f0be0: Merge "Make YuvToJpegEncoder more JNI compliant"
* commit '
213f243f35e8ad7b605c91c08ce6271302d211a7':
Make YuvToJpegEncoder more JNI compliant
Narayan Kamath [Thu, 16 Jan 2014 15:41:52 +0000 (15:41 +0000)]
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
Narayan Kamath [Thu, 16 Jan 2014 15:41:47 +0000 (15:41 +0000)]
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
Narayan Kamath [Thu, 16 Jan 2014 15:41:41 +0000 (15:41 +0000)]
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
Narayan Kamath [Thu, 16 Jan 2014 15:41:35 +0000 (15:41 +0000)]
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
Narayan Kamath [Thu, 16 Jan 2014 15:41:30 +0000 (15:41 +0000)]
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
Narayan Kamath [Thu, 16 Jan 2014 15:41:24 +0000 (15:41 +0000)]
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
Elliott Hughes [Thu, 16 Jan 2014 15:41:18 +0000 (15:41 +0000)]
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
Narayan Kamath [Thu, 16 Jan 2014 15:38:34 +0000 (15:38 +0000)]
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
Narayan Kamath [Thu, 16 Jan 2014 15:38:29 +0000 (15:38 +0000)]
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
Narayan Kamath [Thu, 16 Jan 2014 15:38:24 +0000 (15:38 +0000)]
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
Narayan Kamath [Thu, 16 Jan 2014 15:38:19 +0000 (15:38 +0000)]
am
87a82800: am
aef12450: am
1b0f0be0: Merge "Make YuvToJpegEncoder more JNI compliant"
* commit '
87a82800658c9bcad75881d9761b412a024d7969':
Make YuvToJpegEncoder more JNI compliant
Narayan Kamath [Thu, 16 Jan 2014 15:38:15 +0000 (15:38 +0000)]
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
Narayan Kamath [Thu, 16 Jan 2014 15:38:10 +0000 (15:38 +0000)]
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
Narayan Kamath [Thu, 16 Jan 2014 15:38:05 +0000 (15:38 +0000)]
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
Narayan Kamath [Thu, 16 Jan 2014 15:38:00 +0000 (15:38 +0000)]
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
Narayan Kamath [Thu, 16 Jan 2014 15:37:55 +0000 (15:37 +0000)]
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
Narayan Kamath [Thu, 16 Jan 2014 15:37:50 +0000 (15:37 +0000)]
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
Elliott Hughes [Thu, 16 Jan 2014 15:37:45 +0000 (15:37 +0000)]
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
Narayan Kamath [Thu, 16 Jan 2014 15:35:25 +0000 (07:35 -0800)]
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
Narayan Kamath [Thu, 16 Jan 2014 15:35:20 +0000 (07:35 -0800)]
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
Narayan Kamath [Thu, 16 Jan 2014 15:35:16 +0000 (07:35 -0800)]
am
caea42fd: am
98002dfb: Merge "AArch64: Use long for pointers in graphics/PathMeasure"
* commit '
caea42fd2daabedaed383105e10c11150f52b7df':
AArch64: Use long for pointers in graphics/PathMeasure
Narayan Kamath [Thu, 16 Jan 2014 15:35:10 +0000 (07:35 -0800)]
am
aef12450: am
1b0f0be0: Merge "Make YuvToJpegEncoder more JNI compliant"
* commit '
aef12450d2f863fe3ce82458e46f3778b791cc33':
Make YuvToJpegEncoder more JNI compliant
Narayan Kamath [Thu, 16 Jan 2014 15:35:06 +0000 (07:35 -0800)]
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
Narayan Kamath [Thu, 16 Jan 2014 15:35:02 +0000 (07:35 -0800)]
am
947d88a0: am
138d67c8: Merge "AArch64: Use long for pointers in MotionEvent class"
* commit '
947d88a0eacafb2e5ec5ce5eaaae8be32ecb9aa9':
AArch64: Use long for pointers in MotionEvent class
Narayan Kamath [Thu, 16 Jan 2014 15:34:57 +0000 (07:34 -0800)]
am
a0b25d41: am
d85bba8e: Merge "AArch64: Use long for pointers in VelocityTracker class"
* commit '
a0b25d41d556d2c37852b6036aaf6f33b0e8c5a8':
AArch64: Use long for pointers in VelocityTracker class
Narayan Kamath [Thu, 16 Jan 2014 15:34:53 +0000 (07:34 -0800)]
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
Narayan Kamath [Thu, 16 Jan 2014 15:34:48 +0000 (07:34 -0800)]
am
53321d99: am
f19c50d6: Merge "AArch64: Use long for pointers in KeyCharacterMap class"
* commit '
53321d9990cae810da28b7ae9f6f9b3fe7455020':
AArch64: Use long for pointers in KeyCharacterMap class
Narayan Kamath [Thu, 16 Jan 2014 15:34:43 +0000 (07:34 -0800)]
am
bc0468e6: am
6f17adba: Merge "AArch64: Use long for pointers in media classes"
* commit '
bc0468e67626937300e9afd182656469463d96a1':
AArch64: Use long for pointers in media classes
Elliott Hughes [Thu, 16 Jan 2014 15:34:39 +0000 (07:34 -0800)]
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
Narayan Kamath [Thu, 16 Jan 2014 15:32:03 +0000 (07:32 -0800)]
am
486544f7: Merge "AArch64: Use long for pointers in view/input classes"
* commit '
486544f763bd27eb92c95101e23f939c79c9890e':
AArch64: Use long for pointers in view/input classes
Narayan Kamath [Thu, 16 Jan 2014 15:32:01 +0000 (07:32 -0800)]
am
84ee7930: Merge "AArch64: Use long for pointers in android/os/MessageQueue"
* commit '
84ee7930bb0f91f6a19662efa4c3f7c7044be426':
AArch64: Use long for pointers in android/os/MessageQueue
Narayan Kamath [Thu, 16 Jan 2014 15:31:58 +0000 (07:31 -0800)]
am
98002dfb: Merge "AArch64: Use long for pointers in graphics/PathMeasure"
* commit '
98002dfb60a20caf62d6682659547c042a4a3342':
AArch64: Use long for pointers in graphics/PathMeasure
Narayan Kamath [Thu, 16 Jan 2014 15:31:56 +0000 (07:31 -0800)]
am
1b0f0be0: Merge "Make YuvToJpegEncoder more JNI compliant"
* commit '
1b0f0be0979cbe00641d5d386691e87d668a2aa8':
Make YuvToJpegEncoder more JNI compliant
Narayan Kamath [Thu, 16 Jan 2014 15:31:53 +0000 (07:31 -0800)]
am
bb35356d: Merge changes Id54087dd,I946325e4,I2a2b2e68
* commit '
bb35356dc05632664e1d65588c9d0570c185280b':
AArch64: Use long for pointers in BitmapRegionDecoder
AArch64: Use long for pointers in Movie class
AArch64: Add AssetInputStream.getNativeAsset
Narayan Kamath [Thu, 16 Jan 2014 15:31:50 +0000 (07:31 -0800)]
am
138d67c8: Merge "AArch64: Use long for pointers in MotionEvent class"
* commit '
138d67c8476a846030be74ced1b1990d497402e0':
AArch64: Use long for pointers in MotionEvent class
Narayan Kamath [Thu, 16 Jan 2014 15:31:48 +0000 (07:31 -0800)]
am
d85bba8e: Merge "AArch64: Use long for pointers in VelocityTracker class"
* commit '
d85bba8ebd24257cb52867b6a082350746e97ad2':
AArch64: Use long for pointers in VelocityTracker class
Narayan Kamath [Thu, 16 Jan 2014 15:31:45 +0000 (07:31 -0800)]
am
27a647bf: Merge "AArch64: Use long for pointers in android/os/MemoryFile"
* commit '
27a647bf382f12aea6d0c9584302423e1c44fbb0':
AArch64: Use long for pointers in android/os/MemoryFile
Narayan Kamath [Thu, 16 Jan 2014 15:31:42 +0000 (07:31 -0800)]
am
f19c50d6: Merge "AArch64: Use long for pointers in KeyCharacterMap class"
* commit '
f19c50d6577b09ddabb5fa8c166b56c35ce2a66d':
AArch64: Use long for pointers in KeyCharacterMap class
Narayan Kamath [Thu, 16 Jan 2014 15:31:39 +0000 (07:31 -0800)]
am
6f17adba: Merge "AArch64: Use long for pointers in media classes"
* commit '
6f17adbabc329db1671c2fa6fd9e25cbf6a3fa8e':
AArch64: Use long for pointers in media classes
Elliott Hughes [Thu, 16 Jan 2014 15:31:36 +0000 (07:31 -0800)]
am
991e9818: Merge "AArch64: Use long for pointers in speech/srec classes"
* commit '
991e9818c69443fac927970c4c3521adaf687a44':
AArch64: Use long for pointers in speech/srec classes
Ricardo Cervera [Thu, 16 Jan 2014 15:29:55 +0000 (15:29 +0000)]
am
bb6c94f9: am
8f8a6145: am
294d5f79: am
1d2a4e7b: Merge "docs: Fixed typos in audio-focus.jd. Bug:
12528498 HTML: quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html" into klp-docs
* commit '
bb6c94f96767ad9f97d35763ef97b8aa17b32c9c':
docs: Fixed typos in audio-focus.jd. Bug:
12528498 HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html
Ricardo Cervera [Thu, 16 Jan 2014 15:27:25 +0000 (15:27 +0000)]
am
8f8a6145: am
294d5f79: am
1d2a4e7b: Merge "docs: Fixed typos in audio-focus.jd. Bug:
12528498 HTML: quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html" into klp-docs
* commit '
8f8a614534bf9de38b214b74d28a7aea69959f18':
docs: Fixed typos in audio-focus.jd. Bug:
12528498 HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html
Ricardo Cervera [Thu, 16 Jan 2014 15:25:04 +0000 (07:25 -0800)]
am
294d5f79: am
1d2a4e7b: Merge "docs: Fixed typos in audio-focus.jd. Bug:
12528498 HTML: quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html" into klp-docs
* commit '
294d5f790a564ac5f21d3dcfd1054abe544505a5':
docs: Fixed typos in audio-focus.jd. Bug:
12528498 HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html
Ricardo Cervera [Thu, 16 Jan 2014 15:19:30 +0000 (15:19 +0000)]
am
1d2a4e7b: Merge "docs: Fixed typos in audio-focus.jd. Bug:
12528498 HTML: quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html" into klp-docs
* commit '
1d2a4e7b9fddf57e2d8e562ad691653332ea0a4c':
docs: Fixed typos in audio-focus.jd. Bug:
12528498 HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html
Narayan Kamath [Thu, 16 Jan 2014 12:12:15 +0000 (12:12 +0000)]
Merge "AArch64: Use long for pointers in view/input classes"
Narayan Kamath [Thu, 16 Jan 2014 12:11:39 +0000 (12:11 +0000)]
Merge "AArch64: Use long for pointers in android/os/MessageQueue"
Narayan Kamath [Thu, 16 Jan 2014 12:12:11 +0000 (12:12 +0000)]
Merge "AArch64: Use long for pointers in graphics/PathMeasure"
Narayan Kamath [Thu, 16 Jan 2014 12:12:00 +0000 (12:12 +0000)]
Merge "Make YuvToJpegEncoder more JNI compliant"
Narayan Kamath [Thu, 16 Jan 2014 12:11:58 +0000 (12:11 +0000)]
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
Narayan Kamath [Thu, 16 Jan 2014 12:11:53 +0000 (12:11 +0000)]
Merge "AArch64: Use long for pointers in MotionEvent class"
Narayan Kamath [Thu, 16 Jan 2014 12:11:50 +0000 (12:11 +0000)]
Merge "AArch64: Use long for pointers in VelocityTracker class"
Narayan Kamath [Thu, 16 Jan 2014 12:11:45 +0000 (12:11 +0000)]
Merge "AArch64: Use long for pointers in android/os/MemoryFile"
Narayan Kamath [Thu, 16 Jan 2014 12:11:42 +0000 (12:11 +0000)]
Merge "AArch64: Use long for pointers in KeyCharacterMap class"
Narayan Kamath [Thu, 16 Jan 2014 12:11:37 +0000 (12:11 +0000)]
Merge "AArch64: Use long for pointers in media classes"
Craig Mautner [Thu, 16 Jan 2014 01:55:51 +0000 (17:55 -0800)]
Fix NPE when destroyActivity occurs after detach.
*** FATAL EXCEPTION IN SYSTEM PROCESS: ActivityManager
java.lang.NullPointerException
at com.android.server.am.ActivityStack.removeTask(ActivityStack.java:3627)
at com.android.server.am.ActivityStack.removeActivityFromHistoryLocked(ActivityStack.java:2693)
at com.android.server.am.ActivityStack.activityDestroyedLocked(ActivityStack.java:2878)
at com.android.server.am.ActivityStack$ActivityStackHandler.handleMessage(ActivityStack.java:296)
at android.os.Handler.dispatchMessage(Handler.java:102)
at android.os.Looper.loop(Looper.java:136)
at com.android.server.am.ActivityManagerService$AThread.run(ActivityManagerService.java:1868)
Change-Id: Ifaf0fe6c62d1f63897d57dc96b4d86d8111b45db
Craig Mautner [Thu, 16 Jan 2014 01:49:23 +0000 (01:49 +0000)]
Merge "Cleanup after ActivityView" into klp-modular-dev
Craig Mautner [Mon, 13 Jan 2014 05:11:08 +0000 (21:11 -0800)]
Cleanup after ActivityView
- Release Surface and VirtualDisplay when shutting down ActivityView.
- Shut down child stacks when relaunching parent activity.
Change-Id: I60314b2b43bd2da5406cf6ec871293b5baca157c
Elliott Hughes [Thu, 16 Jan 2014 01:38:51 +0000 (01:38 +0000)]
Merge "AArch64: Use long for pointers in speech/srec classes"
Ashok Bhat [Mon, 6 Jan 2014 11:35:32 +0000 (11:35 +0000)]
AArch64: Use long for pointers in speech/srec classes
For storing pointers, long is used in speech/srec classes,
as native pointers can be 64-bit.
Note corresponding JNI files are in the external/srec project
under srec_jni directory.
Change-Id: Iacd10840e81f5acc3eb202424f83b49ae4eb23ab
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Ricardo Cervera [Thu, 16 Jan 2014 01:26:13 +0000 (01:26 +0000)]
Merge "docs: Fixed typos in audio-focus.jd. Bug:
12528498 HTML: quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html" into klp-docs
quddusc [Thu, 16 Jan 2014 00:44:54 +0000 (00:44 +0000)]
am
fc6b772f: am
bf6d0797: am
2f1c2e32: am
3126ce6e: Merge "docs: Fixed typo in InstrumentationTestRunner page. Bug:
11386360" into klp-docs
* commit '
fc6b772f788e578ad84f21229120a6fe103d7282':
docs: Fixed typo in InstrumentationTestRunner page. Bug:
11386360
quddusc [Thu, 16 Jan 2014 00:41:59 +0000 (00:41 +0000)]
am
bf6d0797: am
2f1c2e32: am
3126ce6e: Merge "docs: Fixed typo in InstrumentationTestRunner page. Bug:
11386360" into klp-docs
* commit '
bf6d079783a48b9e0a05d9fc650d04c324c431a7':
docs: Fixed typo in InstrumentationTestRunner page. Bug:
11386360
quddusc [Thu, 16 Jan 2014 00:38:46 +0000 (16:38 -0800)]
am
2f1c2e32: am
3126ce6e: Merge "docs: Fixed typo in InstrumentationTestRunner page. Bug:
11386360" into klp-docs
* commit '
2f1c2e32301018f800e0200c2d7ec01f990e0050':
docs: Fixed typo in InstrumentationTestRunner page. Bug:
11386360
quddusc [Thu, 16 Jan 2014 00:36:27 +0000 (00:36 +0000)]
am
3126ce6e: Merge "docs: Fixed typo in InstrumentationTestRunner page. Bug:
11386360" into klp-docs
* commit '
3126ce6e096bebf4e21aea73d2bb872dcedb0d16':
docs: Fixed typo in InstrumentationTestRunner page. Bug:
11386360
quddusc [Thu, 16 Jan 2014 00:32:21 +0000 (00:32 +0000)]
Merge "docs: Fixed typo in InstrumentationTestRunner page. Bug:
11386360" into klp-docs
Ricardo Cervera [Thu, 16 Jan 2014 00:30:36 +0000 (00:30 +0000)]
am
7984122e: am
04666c91: am
96f6ce38: am
291fb4b5: Merge "docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug:
11371890 HTML: quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html" into klp-docs
* commit '
7984122e5e2fbb516e43ccc0cbc3211a82197ca7':
docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug:
11371890 HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html
Ricardo Cervera [Thu, 16 Jan 2014 00:27:29 +0000 (00:27 +0000)]
am
04666c91: am
96f6ce38: am
291fb4b5: Merge "docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug:
11371890 HTML: quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html" into klp-docs
* commit '
04666c91808c5e5efa39d9a490b6f18161e65968':
docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug:
11371890 HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html
Ricardo Cervera [Thu, 16 Jan 2014 00:24:18 +0000 (16:24 -0800)]
am
96f6ce38: am
291fb4b5: Merge "docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug:
11371890 HTML: quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html" into klp-docs
* commit '
96f6ce38e383c0a2d416678bdfce41426e3f6b45':
docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug:
11371890 HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html
Ricardo Cervera [Thu, 16 Jan 2014 00:20:55 +0000 (00:20 +0000)]
am
291fb4b5: Merge "docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug:
11371890 HTML: quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html" into klp-docs
* commit '
291fb4b5ff8337d28ff8aa133cc2ea4a8fc09b58':
docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug:
11371890 HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html
Dirk Dougherty [Thu, 16 Jan 2014 00:20:16 +0000 (00:20 +0000)]
am
26f9d980: am
7be6af67: am
d7a50a62: am
57801123: Merge "Doc change: add Drive API feature page. fix link text on several pages" into klp-docs
* commit '
26f9d980575d0e1e8857f1491547094843f409b9':
Doc change: add Drive API feature page. fix link text on several pages
Dirk Dougherty [Thu, 16 Jan 2014 00:20:11 +0000 (00:20 +0000)]
am
b888739d: am
dd8def1e: am
5f26f2c9: am
6ec44a88: Merge "Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore." into klp-docs
* commit '
b888739d3857e26308942574363e072d5cfbcbad':
Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore.
Ricardo Cervera [Thu, 16 Jan 2014 00:19:07 +0000 (00:19 +0000)]
Merge "docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug:
11371890 HTML: quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html" into klp-docs
Dirk Dougherty [Thu, 16 Jan 2014 00:17:18 +0000 (00:17 +0000)]
am
7be6af67: am
d7a50a62: am
57801123: Merge "Doc change: add Drive API feature page. fix link text on several pages" into klp-docs
* commit '
7be6af670e25db5390bb5d79bc1a35973bd0c5aa':
Doc change: add Drive API feature page. fix link text on several pages
Dirk Dougherty [Thu, 16 Jan 2014 00:17:13 +0000 (00:17 +0000)]
am
dd8def1e: am
5f26f2c9: am
6ec44a88: Merge "Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore." into klp-docs
* commit '
dd8def1e15bf0726ea087f46f91c0f1d533621c9':
Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore.
Dirk Dougherty [Thu, 16 Jan 2014 00:14:13 +0000 (16:14 -0800)]
am
d7a50a62: am
57801123: Merge "Doc change: add Drive API feature page. fix link text on several pages" into klp-docs
* commit '
d7a50a6282ac8540bcd9924d50c7ad27982a3dc9':
Doc change: add Drive API feature page. fix link text on several pages
Dirk Dougherty [Thu, 16 Jan 2014 00:14:07 +0000 (16:14 -0800)]
am
5f26f2c9: am
6ec44a88: Merge "Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore." into klp-docs
* commit '
5f26f2c9d2ae49a3f20bfaa1c73b93ea61881209':
Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore.
Dirk Dougherty [Thu, 16 Jan 2014 00:10:38 +0000 (00:10 +0000)]
am
57801123: Merge "Doc change: add Drive API feature page. fix link text on several pages" into klp-docs
* commit '
57801123c16a160d03dd265ca2f193b51e876186':
Doc change: add Drive API feature page. fix link text on several pages
Dirk Dougherty [Thu, 16 Jan 2014 00:10:34 +0000 (00:10 +0000)]
am
6ec44a88: Merge "Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore." into klp-docs
* commit '
6ec44a882b87fffb37e9dbafe8c5535f16faf349':
Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore.
Dirk Dougherty [Thu, 16 Jan 2014 00:08:53 +0000 (00:08 +0000)]
Merge "Doc change: add Drive API feature page. fix link text on several pages" into klp-docs
Dirk Dougherty [Thu, 16 Jan 2014 00:07:34 +0000 (00:07 +0000)]
Merge "Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore." into klp-docs
Wink Saville [Thu, 16 Jan 2014 00:03:13 +0000 (00:03 +0000)]
am
ab092bb0: am
46988138: am
57756970: am
a6aa3199: Merge "Fixed mistaken reference to "LTE". Bug
7637224"
* commit '
ab092bb065b09ac0caa000269025c5a5ec951973':
Fixed mistaken reference to "LTE". Bug
7637224
Wink Saville [Thu, 16 Jan 2014 00:00:18 +0000 (00:00 +0000)]
am
46988138: am
57756970: am
a6aa3199: Merge "Fixed mistaken reference to "LTE". Bug
7637224"
* commit '
469881381b081157b95e8e5ee3c9293bbbc1c852':
Fixed mistaken reference to "LTE". Bug
7637224
Wink Saville [Wed, 15 Jan 2014 23:57:10 +0000 (15:57 -0800)]
am
57756970: am
a6aa3199: Merge "Fixed mistaken reference to "LTE". Bug
7637224"
* commit '
5775697029760ca886a287ef2c3119d5097ded56':
Fixed mistaken reference to "LTE". Bug
7637224
Wink Saville [Wed, 15 Jan 2014 23:49:14 +0000 (15:49 -0800)]
am
a6aa3199: Merge "Fixed mistaken reference to "LTE". Bug
7637224"
* commit '
a6aa3199bdb676e349c28b861a04c34a4ec136e0':
Fixed mistaken reference to "LTE". Bug
7637224