Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
118,485 Commits 3 Branches 0 Tags
b450505c2e0d0dfd67bc228961a00a6eaaf092df
Commit Graph

45695 Commits

Author SHA1 Message Date
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
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
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
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
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
Jeff Hao
6c13f38474 am 56b11064: am 9a5005a3: am f6730d26: Merge "Add sample profiling interface to startMethodTracing." 
* commit '56b110649424534de36ca41b3e352a73b6bdf3c0':
  Add sample profiling interface to startMethodTracing.
 2014-01-15 19:45:06 +00:00
Jeff Hao
56b1106494 am 9a5005a3: am f6730d26: Merge "Add sample profiling interface to startMethodTracing." 
* commit '9a5005a3bfa419cb856a83ca34a67556d9fd5b74':
  Add sample profiling interface to startMethodTracing.
 2014-01-15 11:41:30 -08:00
Jeff Hao
d02e60fbd4 Add sample profiling interface to startMethodTracing. 
Frameworks base side of this change. Also changed art and libcore.

Change-Id: Ib5ba0445163dca714d1ae66430750346ff8811be
 2014-01-15 11:27:24 -08:00
Marco Nelissen
e495a5a3f3 am cb15fb60: am 0d4916f1: am c3036a12: Merge "Before requerying a cursor, check if it is closed." 
* commit 'cb15fb6041e604025d4b76645435f8cbafee754c':
  Before requerying a cursor, check if it is closed.
 2014-01-15 17:27:19 +00:00
Marco Nelissen
cb15fb6041 am 0d4916f1: am c3036a12: Merge "Before requerying a cursor, check if it is closed." 
* commit '0d4916f19f81f80fc83eb7646c6d339630d5f618':
  Before requerying a cursor, check if it is closed.
 2014-01-15 09:22:55 -08:00
Marco Nelissen
c3036a1246 Merge "Before requerying a cursor, check if it is closed." 2014-01-15 17:17:05 +00:00
Ashok Bhat
b091d47a2e AArch64: Use long for pointers in BitmapRegionDecoder 
For storing pointers, long is used in BitmapRegionDecoder
class, as native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

In addition, Graphics.cpp has been changed to work
with modified BitmapRegionDecoder.

Change-Id: Id54087dd3bfb29577e8b762e70946793369dc701
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
 2014-01-15 14:23:22 +00:00
Ashok Bhat
dcaf5593dd AArch64: Use long for pointers in Movie class 
For storing pointers, long is used in Movie class,
as native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: I946325e4af6cb9282012bebdaee89e1117d8797b
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
 2014-01-15 14:22:56 +00:00
Ashok Bhat
a0545dd54f AArch64: Add AssetInputStream.getNativeAsset 
This patch adds AssetInputStream.getNativeAsset. This function
returns asset pointer, which can then be passed to JNI functions.
Note that this function is hidden and not part of Android API.

This function will eventually replace getAssetInt,
once all the classes that use getAssetInt are changed
to use getNativeAsset instead.

Change-Id: I2a2b2e6864f1f57ae2b3a10c45559b3635266ed5
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
 2014-01-15 14:21:59 +00:00
Ashok Bhat
075e9a19ce AArch64: Use long for pointers in media classes 
For storing pointers, long is used in media classes,
as native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: Idc4ca0124d03df7f9cef412488abafd020e5e774
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
 2014-01-15 13:09:27 +00:00
John Spurlock
cce06eda6b am b3436359: am e05190ea: am 85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs 
* commit 'b34363590953e4efd70168cdf03386d1e469a548':
  Docfixes: three typos and escape */*.
 2014-01-14 19:57:02 +00:00