Narayan Kamath
48de490c33
am 486544f7: Merge "AArch64: Use long for pointers in view/input classes"
...
* commit '486544f763bd27eb92c95101e23f939c79c9890e':
AArch64: Use long for pointers in view/input classes
2014-01-16 07:32:03 -08:00
Narayan Kamath
faa62aaca5
am 84ee7930: Merge "AArch64: Use long for pointers in android/os/MessageQueue"
...
* commit '84ee7930bb0f91f6a19662efa4c3f7c7044be426':
AArch64: Use long for pointers in android/os/MessageQueue
2014-01-16 07:32:01 -08:00
Narayan Kamath
caea42fd2d
am 98002dfb: Merge "AArch64: Use long for pointers in graphics/PathMeasure"
...
* commit '98002dfb60a20caf62d6682659547c042a4a3342':
AArch64: Use long for pointers in graphics/PathMeasure
2014-01-16 07:31:58 -08:00
Narayan Kamath
aef12450d2
am 1b0f0be0: Merge "Make YuvToJpegEncoder more JNI compliant"
...
* commit '1b0f0be0979cbe00641d5d386691e87d668a2aa8':
Make YuvToJpegEncoder more JNI compliant
2014-01-16 07:31:56 -08:00
Narayan Kamath
8796ab7f22
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
2014-01-16 07:31:53 -08:00
Narayan Kamath
947d88a0ea
am 138d67c8: Merge "AArch64: Use long for pointers in MotionEvent class"
...
* commit '138d67c8476a846030be74ced1b1990d497402e0':
AArch64: Use long for pointers in MotionEvent class
2014-01-16 07:31:50 -08:00
Narayan Kamath
a0b25d41d5
am d85bba8e: Merge "AArch64: Use long for pointers in VelocityTracker class"
...
* commit 'd85bba8ebd24257cb52867b6a082350746e97ad2':
AArch64: Use long for pointers in VelocityTracker class
2014-01-16 07:31:48 -08:00
Narayan Kamath
80b3dd0d8e
am 27a647bf: Merge "AArch64: Use long for pointers in android/os/MemoryFile"
...
* commit '27a647bf382f12aea6d0c9584302423e1c44fbb0':
AArch64: Use long for pointers in android/os/MemoryFile
2014-01-16 07:31:45 -08:00
Narayan Kamath
53321d9990
am f19c50d6: Merge "AArch64: Use long for pointers in KeyCharacterMap class"
...
* commit 'f19c50d6577b09ddabb5fa8c166b56c35ce2a66d':
AArch64: Use long for pointers in KeyCharacterMap class
2014-01-16 07:31:42 -08:00
Narayan Kamath
bc0468e676
am 6f17adba: Merge "AArch64: Use long for pointers in media classes"
...
* commit '6f17adbabc329db1671c2fa6fd9e25cbf6a3fa8e':
AArch64: Use long for pointers in media classes
2014-01-16 07:31:39 -08:00
Elliott Hughes
12377887e3
am 991e9818: Merge "AArch64: Use long for pointers in speech/srec classes"
...
* commit '991e9818c69443fac927970c4c3521adaf687a44':
AArch64: Use long for pointers in speech/srec classes
2014-01-16 07:31:36 -08:00
Ricardo Cervera
72e2c2a0b4
am bb6c94f9: am 8f8a6145: am 294d5f79: am 1d2a4e7b: Merge "docs: Fixed typos in audio-focus.jd. Bug: 12528498 HTML: http://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
2014-01-16 15:29:55 +00:00
Ricardo Cervera
bb6c94f967
am 8f8a6145: am 294d5f79: am 1d2a4e7b: Merge "docs: Fixed typos in audio-focus.jd. Bug: 12528498 HTML: http://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
2014-01-16 15:27:25 +00:00
Ricardo Cervera
8f8a614534
am 294d5f79: am 1d2a4e7b: Merge "docs: Fixed typos in audio-focus.jd. Bug: 12528498 HTML: http://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
2014-01-16 07:25:04 -08:00
Ricardo Cervera
294d5f790a
am 1d2a4e7b: Merge "docs: Fixed typos in audio-focus.jd. Bug: 12528498 HTML: http://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
2014-01-16 15:19:30 +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
Narayan Kamath
d85bba8ebd
Merge "AArch64: Use long for pointers in VelocityTracker class"
2014-01-16 12:11:51 +00:00
Narayan Kamath
27a647bf38
Merge "AArch64: Use long for pointers in android/os/MemoryFile"
2014-01-16 12:11:47 +00:00
Narayan Kamath
f19c50d657
Merge "AArch64: Use long for pointers in KeyCharacterMap class"
2014-01-16 12:11:42 +00:00
Narayan Kamath
6f17adbabc
Merge "AArch64: Use long for pointers in media classes"
2014-01-16 12:11:38 +00:00
Craig Mautner
593a4e6f98
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
2014-01-15 17:59:22 -08:00
Craig Mautner
e9ddaa0b18
Merge "Cleanup after ActivityView" into klp-modular-dev
2014-01-16 01:49:24 +00:00
Craig Mautner
34b73dfaa3
Cleanup after ActivityView
...
- Release Surface and VirtualDisplay when shutting down ActivityView.
- Shut down child stacks when relaunching parent activity.
Change-Id: I60314b2b43bd2da5406cf6ec871293b5baca157c
2014-01-15 17:47:51 -08:00
Elliott Hughes
991e9818c6
Merge "AArch64: Use long for pointers in speech/srec classes"
2014-01-16 01:38:51 +00:00
Ashok Bhat
bdebe1ad95
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>
2014-01-15 17:38:06 -08:00
Ricardo Cervera
1d2a4e7b9f
Merge "docs: Fixed typos in audio-focus.jd. Bug: 12528498 HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html " into klp-docs
2014-01-16 01:26:14 +00:00
quddusc
e014eb6368
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
2014-01-16 00:44:54 +00:00
quddusc
fc6b772f78
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
2014-01-16 00:41:59 +00:00
quddusc
bf6d079783
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
2014-01-15 16:38:46 -08:00
quddusc
2f1c2e3230
am 3126ce6e: Merge "docs: Fixed typo in InstrumentationTestRunner page. Bug: 11386360" into klp-docs
...
* commit '3126ce6e096bebf4e21aea73d2bb872dcedb0d16':
docs: Fixed typo in InstrumentationTestRunner page. Bug: 11386360
2014-01-16 00:36:27 +00:00
quddusc
3126ce6e09
Merge "docs: Fixed typo in InstrumentationTestRunner page. Bug: 11386360" into klp-docs
2014-01-16 00:32:21 +00:00
Ricardo Cervera
b5466418d1
am 7984122e: am 04666c91: am 96f6ce38: am 291fb4b5: Merge "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 " 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
2014-01-16 00:30:36 +00:00
Ricardo Cervera
7984122e5e
am 04666c91: am 96f6ce38: am 291fb4b5: Merge "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 " 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
2014-01-16 00:27:29 +00:00
Ricardo Cervera
04666c9180
am 96f6ce38: am 291fb4b5: Merge "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 " 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
2014-01-15 16:24:18 -08:00
Ricardo Cervera
96f6ce38e3
am 291fb4b5: Merge "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 " 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
2014-01-16 00:20:55 +00:00
Dirk Dougherty
e913f18c5a
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
2014-01-16 00:20:16 +00:00
Dirk Dougherty
061dc1b6fb
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.
2014-01-16 00:20:11 +00:00
Ricardo Cervera
291fb4b5ff
Merge "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 " into klp-docs
2014-01-16 00:19:08 +00:00
Dirk Dougherty
26f9d98057
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
2014-01-16 00:17:18 +00:00
Dirk Dougherty
b888739d38
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.
2014-01-16 00:17:13 +00:00
Dirk Dougherty
7be6af670e
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
2014-01-15 16:14:13 -08:00
Dirk Dougherty
dd8def1e15
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.
2014-01-15 16:14:07 -08:00
Dirk Dougherty
d7a50a6282
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
2014-01-16 00:10:38 +00:00
Dirk Dougherty
5f26f2c9d2
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.
2014-01-16 00:10:34 +00:00
Dirk Dougherty
57801123c1
Merge "Doc change: add Drive API feature page. fix link text on several pages" into klp-docs
2014-01-16 00:08:53 +00:00