drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
122,431 Commits 1 Branch 0 Tags
Commit Graph

122431 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ricardo Cervera
f12fa01220 am 72e2c2a0: 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 '72e2c2a0b4df1d48e19b055d353094000c021c22':
  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:33:34 +00:00
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
Leon Scroggins III
307023f550 Merge "In nativeDecodeFileDescriptor, use fdopen." 2014-01-16 15:23:35 +00:00
Craig Mautner
441b57bce9 am 593a4e6f: Fix NPE when destroyActivity occurs after detach. 
* commit '593a4e6f982cecddc3f2f6107044b5e12fab3e20':
  Fix NPE when destroyActivity occurs after detach.
 2014-01-16 15:22:27 +00:00
Craig Mautner
fc8fa54f80 am e9ddaa0b: Merge "Cleanup after ActivityView" into klp-modular-dev 
* commit 'e9ddaa0b183d979be782a63970929cebd861b7c9':
  Cleanup after ActivityView
 2014-01-16 15:22:15 +00: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
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
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
Dianne Hackborn
c46809e997 Whoops add a line separator. 
Change-Id: Ie596527a39319fcf3f80a444fed9e62f90163ea5
 2014-01-15 17:53:02 -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
Dianne Hackborn
c8345b32c9 Merge "Add battery power use reporting to batterystats service." 2014-01-16 01:39:06 +00: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
Chris Craik
0430ee5acb Merge "Support projection of DisplayLists onto ancestors." 2014-01-16 01:31:39 +00: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
Jeff Sharkey
4ca728c064 Detect removable and emulated secondary storage. 
Also rename existing secondary storage API to match naming
convention in rest of class.

Bug: 11536709
Change-Id: I2684c817de4982b414893d2d9927a21e3f171d53
 2014-01-15 17:00:56 -08:00