summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Collapse)AuthorAgeFilesLines
* Remove stray logging statement.Narayan Kamath2014-03-111-2/+0
| | | | | bug: https://code.google.com/p/android/issues/detail?id=66974 Change-Id: Ie34c102de143cf6aeb16c78778dda3ef5e928380
* ART profiler usage.Dave Allison2014-03-071-2/+36
| | | | | | | | | | | | | | | | | This is a change to add args to some of the profiler related functions, including installd commands. Also read properties and set command line options for the runtime profiling parameters. Changed calls to isDexOptNeeded() to isDexOptNeededInternal(). This needs additional arguments passed for profiles. Bug: 12877748 Change-Id: I1a426c9309d760bac0cf92daa298defee62287c1 Conflicts: core/jni/AndroidRuntime.cpp
* Inform libcore of time format pref. changes.Narayan Kamath2014-03-074-0/+42
| | | | | | | | | | - Introduce a boolean extra for intent TIME_CHANGED that specifies if the user wants a 24 hour format or not. - Have the ActivityManagerService inform running processes of changes to this preference. - Add plumbing in ActivityThread to inform j.t.DateFormat Change-Id: I05fafb903ae54e39c03a048b7a219dc5a93fd472
* Merge "NFC: getNdefMessage() should throw exception if no tag in field."Martijn Coenen2014-03-061-0/+2
|\
| * NFC: getNdefMessage() should throw exception if no tag in field.Mathias Jeppsson2014-01-281-0/+2
| | | | | | | | | | | | | | According to documentation, an TagLostException should be thrown, if the tag has been moved out of field when reading NDEF message. Change-Id: Ib7e485ed442027fdebd5bc7a46101fbca0c88bdb
* | Harden NsdManager against null-dereference crashesDave Platt2014-03-041-19/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to race conditions or programming errors, the NsdManager can attempt to process an asynchronous status message (and issue a callback to the listener) after the listener has already been removed from the NsdManager state. This causes dereferencing of null objects, and a crash. Split out the three async-queue message cases: these are ones in which message.arg2 does not hold an NsdManager array index and the code should not interpret this field as if it were. Add an explicit check for "null listener" (the array index in the message has already been released), log a warning, and exit early. Safeguard accesses to the "NSD service type" string from a (possibly null) NsdServiceInfo object... return a constant "?" string rather than crashing. Bug: 9016259 Change-Id: I40aabdfc65d86fdd0eaac7a1e7e56e6ff69796cf
* | Fix descriptor leak after accepting connectionsDave Platt2014-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | After accepting a connection on a listening socket and storing the resulting FileDescriptor into a newly created LocalSocketImpl, the new impl's "descriptor was created locally and should be closed normally" flag should be set. (cherrypicked from 3e7305c6bf6062b5cb1e2ddcec6c6d30b4a8bc0d) Bug: 11805817 Change-Id: I0a1a7c62ec3fbcf647a44a22110ddc778d14e5f4
* | Make getAssetInt throw unconditionally.Narayan Kamath2014-02-251-1/+1
| | | | | | | | | | | | | | All callers have been moved over to getNativeAsset, and this method has been hidden from the public API internally. Change-Id: I5f29b5ddb4449adadf426e49a4085c7320289a15
* | Merge changes I6d4fdada,Ia34899a4Greg Hackmann2014-02-212-2/+23
|\ \ | | | | | | | | | | | | | | | * changes: open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal Move time setting code from SystemClock to AlarmManagerService
| * | Move time setting code from SystemClock to AlarmManagerServiceGreg Hackmann2014-02-212-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On devices using /dev/rtc instead of /dev/alarm, updating the time-of-day clock and RTC are separate syscalls. Hence the clock and RTC could be left in inconsistent states if two threads called SystemClock.setCurrentTimeMillis() simultaneously. By moving this code into AlarmManagerService, we can put a global lock around AlarmManagerService.setTime() and prevent the race condition. Note that access to SystemClock.setCurrentTimeMillis() is now gated by android.permission.SET_TIME, where before it was gated by filesystem permissions (i.e., could the process write to /dev/alarm or /dev/rtc). Change-Id: Ia34899a4cde983656305fd2ef466dfe908ed23c8 Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | Merge "Fix documentation for Parcel.readException()."Elliott Hughes2014-02-211-4/+5
|\ \ \
| * | | Fix documentation for Parcel.readException().Mark Doliner2014-01-021-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old documentation was kind of useless and not clear, so this is an improvement. In addition to this change, I think this method should probably be private instead of public, especially since the values for code are private. But it's too late to change that now. Also the method name is pretty poor, since it's not actually reading anything. Something like "throwException" would be more appropriate. I'm open to suggestions on how to improve this situation. Maybe mark the method as deprecated with a comment that it will be made private in the future? Change-Id: I830f2bcf606714bd130d8c953aa33974b33c9a83
* | | | Merge "Miscellaneous small documentation fixes."Elliott Hughes2014-02-214-4/+4
|\ \ \ \
| * | | | Miscellaneous small documentation fixes.Mark Doliner2014-01-034-4/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | Most of these I noticed on my own. The change to docs/html/tools/testing/testing_ui.jd is mentioned in a bug report: https://code.google.com/p/android/issues/detail?id=56324 Signed-off-by: Mark Doliner <markdoliner@google.com>
* | | | Remove unused JNITest classAshok Bhat2014-02-211-48/+0
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | JNITest class is no longer actively used. This patch removes the class (java and jni) files. JNI interfaces and calls are extensively tested in the art unit tests (art/tests) and in cts (see CtsJniTestCases). Change-Id: I62f7c72deb5d206fa3f545ae39a9cb9011110d0a Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | AArch64: Make AssetAtlasService 64-bit compatibleAshok Bhat2014-02-203-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in this patch include [x] Long(64-bit) is used to store native pointers in AssetAtlasService and related classes as they can be 64-bit. [x] 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: Ib4c77c134e3ad5b21732e20cde9a54a0b16bdab1 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | Fixed a possible infinite loop in JsonReader#skipValue()Calin Juravle2014-02-181-0/+3
| | | | | | | | | | | | | | | Bug: https://code.google.com/p/android/issues/detail?id=65846 Change-Id: Idaa0e75fc5612550c4b9ccb9afa5535ea5b189df
* | | Merge "Extended locales in AAPT / AssetManager."Narayan Kamath2014-02-171-4/+1
|\ \ \
| * | | Extended locales in AAPT / AssetManager.Narayan Kamath2014-02-141-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support 3 letter language codes, script codes & variants. The bulk of the changes are related to the implementation of command line filtering of locales etc. The previous code assumed that the value of each "axis" (locale, density, size etc.) could be represented by a 4 byte type. This is no longer the case. This change introduces a new class, AaptLocaleValue which holds a (normalized) locale parsed from a directory name or a filter string. This class takes responsibility for parsing locales as well as writing them to ResTable_config structures, which is their representation in the resource table. This includes minor changes at the java / JNI level for AssetManager. We now call locale.toLanguageTag() to give the native layer a well formed BCP-47 tag. I've removed some duplicated parsing code in AssetManager.cpp and replaced them with functions on ResTable_config. The native getLocales function has been changed to return well formed BCP-47 locales as well, so that the corresponding java function can use Locale.forLanguageTag to construct a Locale object out of it. Finally, this change introduces default and copy constructors for ResTable_config to prevent having to memset() the associated memory to 0 on every stack allocation. (cherry-picked from commit 91447d88f2bdf9c2bf8d1a53570efef6172fba74) Change-Id: I1b43086860661012f949fb8e5deb7df44519b854
* | | | Merge "AArch64: Use long for pointers in SurfaceSession class"Narayan Kamath2014-02-141-4/+4
|\ \ \ \ | |/ / / |/| | |
| * | | AArch64: Use long for pointers in SurfaceSession classAshok Bhat2014-02-061-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For storing pointers, long is used in SurfaceSession class, as native pointers can be 64-bit. Change-Id: I1535a488dfffaddd20e3beac57e558035d715cbf Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | Merge "Finish fixing Zygote descriptor leakage problem"Dave Platt2014-02-122-1/+45
|\ \ \ \
| * | | | Finish fixing Zygote descriptor leakage problemDave Platt2014-02-062-1/+45
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to prevent Zygote descriptors from leaking into the child environment, they should be closed by the forked-off child process before the child switches to the application UID. These changes close the descriptors via dup2(), substituting a descriptor open to /dev/null in their place; this allows the Zygote Java code to close the FileDescriptor objects cleanly. This is a multi-project change: dalvik, art, libcore, frameworks/base, and external/sepolicy are affected. The CLs need to be approved together, lest the build break or the software fail to boot. Round 2: indent change Bug: 12114500 Change-Id: I090402136a8a8b7d6aad6eb153026e85d7cf6ad3
* | | | Merge "Improve Parcel's handling of non-primitive arrays"Paul Duffin2014-02-121-8/+13
|\ \ \ \
| * | | | Improve Parcel's handling of non-primitive arraysPaul Duffin2014-02-111-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Treat arrays other than actual Object arrays (i.e. those whose component type is actually Object) and the primitive arrays already handled specially by Parcel as Serializable's. Issue: 64583 Change-Id: I3ff797f3262e77e4de27f35709bceee5410d1ed4
* | | | | Merge "Runtime resource overlay, iteration 2"Dianne Hackborn2014-02-118-16/+85
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Runtime resource overlay, iteration 2Mårten Kongstad2014-02-038-16/+85
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support any number of overlay packages. Support any target package. UPDATED PACKAGE MATCHING ------------------------ In Runtime resource overlay, iteration 1, only a single overlay package was considered. Package matching was based on file paths: /vendor/overlay/system/framework-res.apk corresponded to /system/framework-res.apk. Introduce a more flexible matching scheme where any package is an overlay package if its manifest includes <overlay targetPackage="com.target.package"/> For security reasons, an overlay package must fulfill certain criteria to take effect: see below. THE IDMAP TOOL AND IDMAP FILES ------------------------------ Idmap files are created by the 'idmap' binary; idmap files must be present when loading packages. For the Android system, Zygote calls 'idmap' as part of the resource pre-loading. For application packages, 'idmap' is invoked via 'installd' during package installation (similar to 'dexopt'). UPDATED FLOW ------------ The following is an outline of the start-up sequences for the Android system and Android apps. Steps marked with '+' are introduced by this commit. Zygote initialization Initial AssetManager object created + idmap --scan creates idmaps for overlays targeting 'android', \ stores list of overlays in /data/resource-cache/overlays.list AssetManager caches framework-res.apk + AssetManager caches overlay packages listed in overlays.list Android boot New AssetManager's ResTable acquired AssetManager re-uses cached framework-res.apk + AssetManager re-uses cached 'android' overlays (if any) App boot ActivityThread prepares AssetManager to load app.apk + ActivityThread prepares AssetManager to load app overlays (if any) New AssetManager's ResTable acquired as per Android boot SECURITY -------- Overlay packages are required to be pre-loaded (in /vendor/overlay). These packages are trusted by definition. A future iteration of runtime resource overlay may add support for downloaded overlays, which would likely require target and overlay signatures match for the overlay to be trusted. LOOKUP PRIORITY --------------- During resource lookup, packages are sequentially queried to provide a best match, given the constraints of the current configuration. If any package provide a better match than what has been found so far, it replaces the previous match. The target package is always queried last. When loading a package with more than one overlay, the order in which the overlays are added become significant if several packages overlay the same resource. Had downloaded overlays been supported, the install time could have been used to determine the load order. Regardless, for pre-installed overlays, the install time is randomly determined by the order in which the Package Manager locates the packages during initial boot. To support a well-defined order, pre-installed overlay packages are expected to define an additional 'priority' attribute in their <overlay> tags: <overlay targetPackage="com.target.package" priority="1234"/> Pre-installed overlays are loaded in order of their priority attributes, sorted in ascending order. Assigning the same priority to several overlays targeting the same base package leads to undefined behaviour. It is the responsibility of the vendor to avoid this. The following example shows the ResTable and PackageGroups after loading an application and two overlays. The resource lookup framework will query the packages in the order C, B, A. +------+------+- -+------+------+ | 0x01 | | ... | | 0x7f | +------+------+- -+------+------+ | | "android" Target package A | Pre-installed overlay B (priority 1) | Pre-installed overlay C (priority 2) Change-Id: If49c963149369b1957f7d2303b3dd27f669ed24e
* | | | Merge "Use long for pointers in EmojiFactory and PdfDocument"Narayan Kamath2014-02-111-12/+12
|\ \ \ \ | |/ / / |/| | |
| * | | Use long for pointers in EmojiFactory and PdfDocumentAshok Bhat2014-01-311-12/+12
| | | | | | | | | | | | | | | | | | | | Change-Id: I275c9ce390dd9e01f772e2044c74cebdb0701de6 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | AArch64: Make AssetManager and related classes 64-bit compatibleAshok Bhat2014-01-314-70/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following changes have been done: [x] Long is used to store native pointers as pointers can be 64-bit. [x] AssetManager openAsset native function returned -1 if file name was empty and java function considered any non-zero value as success. This has been fixed by native function throwing Illegal Argument Exception as well. [x] AssetManager incRefsLocked and decRefsLocked now accept long as input to support 64-bit native references. [x] AssetManager incRefsLocked method incorrecly used 'this.hashCode()' instead of the passed parameter id. This has been fixed. [x] 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: I095b9f900d49e51f43ad6afc47cbc23116a6a64a Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Craig Barber <craig.barber@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
* | | | Merge "Fixed cancel() not working correctly"Narayan Kamath2014-01-311-3/+12
|\ \ \ \ | |/ / / |/| | |
| * | | Fixed cancel() not working correctlyjl19902014-01-301-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method handleMessage(Message msg) from mHandler variable was not checking if the timer was cancelled, so sendMessageDelayed(obtainMessage(MSG), delay) was keeping the timer alive. The patch simply adds a boolean and checks if the CountDownTimer was cancelled before calling sendMessageDelayed(obtainMessage(MSG), delay) bug: https://code.google.com/p/android/issues/detail?id=58668 Change-Id: Ic6bbb9d33a3616f8503db222513cc14ad2270cb8 Signed-off-by: jl1990 <jlcarrasco1990@gmail.com>
* | | | frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new defaultBrian Carlstrom2014-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 12798969 Change-Id: Ibb7ed86867e4dca53ad7fe33326b08e6f5e664c4
* | | | AArch64: Use of long for pointers in PropertyValuesHolderAshok Bhat2014-01-291-21/+21
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Long is used in PropertyValuesHolder class to store native pointers as they can be 64-bit. Note that jmethodID, a pointer to structures, is also carried in long rather than int to support 64-bit system. Change-Id: Ifb514fc8473d7c41c0d6194fc6eb85d4816b2cd9 Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | Merge "AArch64: Make Binder and Parcel 64-bit compatible"Narayan Kamath2014-01-292-46/+51
|\ \ \
| * | | AArch64: Make Binder and Parcel 64-bit compatibleAshok Bhat2014-01-232-46/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes include [x] Long is used to store native pointers [x] Added new method obtain(long obj) to Parcel. Binder uses this method instead of obtain(int obj). [x] obtain(int) has been changed to throw unsupported operation exception. Change-Id: I408e0f2a24deb28c9277d86670653a51eb314266 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Craig Barber <craig.barber@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
* | | | AArch64: Make graphics classes 64-bit compatibleAshok Bhat2014-01-2810-242/+242
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in this patch include [x] Long is used to store native pointers as they can be 64-bit. [x] Some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) [x] AssetAtlasManager is not completely 64-bit compatible yet. Specifically mAtlasMap member has to be converted to hold native pointer using long. Added a TODO to AssetAtlasManager.java to indicate the change required. Change-Id: I940433f601c6db998c1a8ffff338f5361200d5ed Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Craig Barber <craig.barber@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
* | | Merge "Fixed race condition in Spinner.DialogPopup on null reference."Christopher Tate2014-01-271-2/+4
|\ \ \
| * | | Fixed race condition in Spinner.DialogPopup on null reference.Daniel 2 Olofsson2013-07-121-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NullPointerException is triggered when DialogPopup is dismissed due to object mPopup being null when not showing. Race condition is triggered when dialog is dismissed before touch event to dismiss dialog has been processed properly. Fixed by adding a null check prior to accessing mPopup object. Change-Id: I3c4fe9c279d92a7103fb4f68189d1d42beedc606
* | | | Remove unused field from AssetManager.Narayan Kamath2014-01-221-1/+0
| |/ / |/| | | | | | | | | | | | | | | | | This field was introduced in commit 4bdd33b81a17 but wasn't used there (or since). Change-Id: I0615e98b8990d42da6b85f8094ab19eb0465fd9e
* | | Merge "AArch64: Use long for pointers in view/input classes"Narayan Kamath2014-01-164-22/+22
|\ \ \
| * | | AArch64: Use long for pointers in view/input classesAshok Bhat2014-01-094-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For storing pointers, long is used in view/input 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: Iafda9f4653c023bcba95b873637d935d0b569f5d 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>
* | | | Merge "AArch64: Use long for pointers in android/os/MessageQueue"Narayan Kamath2014-01-161-6/+6
|\ \ \ \
| * | | | AArch64: Use long for pointers in android/os/MessageQueueAshok Bhat2014-01-101-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Long is used in android/os/MessageQueue class to store pointers 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: I7e901b8515a5b5e3afe1dadaaf3e5c186955c2a0 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
* | | | | Merge changes Id54087dd,I946325e4,I2a2b2e68Narayan Kamath2014-01-161-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: AArch64: Use long for pointers in BitmapRegionDecoder AArch64: Use long for pointers in Movie class AArch64: Add AssetInputStream.getNativeAsset
| * | | | | AArch64: Add AssetInputStream.getNativeAssetAshok Bhat2014-01-151-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | Merge "AArch64: Use long for pointers in MotionEvent class"Narayan Kamath2014-01-161-40/+40
|\ \ \ \ \ \
| * | | | | | AArch64: Use long for pointers in MotionEvent classAshok Bhat2014-01-081-40/+40
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For storing pointers, long is used in MotionEvent class, as native pointers can be 64-bit. Change-Id: I88ebfef26070b7f49c14945cad37aa3db209ec90 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Craig Barber <craig.barber@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
* | | | | | Merge "AArch64: Use long for pointers in VelocityTracker class"Narayan Kamath2014-01-161-9/+9
|\ \ \ \ \ \
| * | | | | | AArch64: Use long for pointers in VelocityTracker classAshok Bhat2014-01-081-9/+9
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For storing pointers, long is used in VelocityTracker class, as native pointers can be 64-bit. Change-Id: I8c454663a97745c7440bb6f99ef49d28e9026876 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>