OSDN Git Service
Andreas Gampe [Sat, 7 Mar 2015 17:13:16 +0000 (17:13 +0000)]
am
7a4cb563: Merge "Frameworks/base: Remove unnecessary Pattern instance"
* commit '
7a4cb563a29f05658760739d3bc2e70bd6342174':
Frameworks/base: Remove unnecessary Pattern instance
Andreas Gampe [Sat, 7 Mar 2015 17:13:09 +0000 (17:13 +0000)]
am
cdc19f3f: Merge "Frameworks/base: Remove unnecessary Pattern instance"
* commit '
cdc19f3f8a20b975e8e70f4b4cce5ce2be811726':
Frameworks/base: Remove unnecessary Pattern instance
Andreas Gampe [Sat, 7 Mar 2015 01:03:13 +0000 (01:03 +0000)]
Merge "Frameworks/base: Remove unnecessary Pattern instance"
Andreas Gampe [Fri, 6 Mar 2015 23:53:06 +0000 (15:53 -0800)]
Frameworks/base: Remove unnecessary Pattern instance
Using a static Pattern in UriMatcher prevents compile-time
initialization.
It is also not efficient, as String.split has a fast path for simple
splits.
Bug:
19542228
Change-Id: Ie9e5bfe6da04c6d05ec10b1426d0cd136ef46ef2
Andreas Gampe [Sat, 7 Mar 2015 00:18:44 +0000 (00:18 +0000)]
Merge "Frameworks/base: Remove unnecessary Pattern instance"
Andreas Gampe [Fri, 6 Mar 2015 23:29:06 +0000 (15:29 -0800)]
Frameworks/base: Remove unnecessary Pattern instance
Using a static Pattern in ActivityThread prevents compile-time
initialization of ActivityThread and GestureDetector, which depends
on the former.
It is also not efficient, as String.split has a fast path for simple
splits.
Bug:
19542228
Change-Id: I5bb843c08c81e0d259bb8afafa87a8467bb1730e
Mathieu Chartier [Fri, 6 Mar 2015 01:36:55 +0000 (01:36 +0000)]
am
e59b7ce2: Merge "Add JIT system properties"
* commit '
e59b7ce2564a916240e561b36f4476f2d72a65c5':
Add JIT system properties
Mathieu Chartier [Fri, 6 Mar 2015 01:31:27 +0000 (01:31 +0000)]
Merge "Add JIT system properties"
Miao Wang [Fri, 6 Mar 2015 01:10:38 +0000 (01:10 +0000)]
am
4b5af9bc: Merge "[RenderScript] Update the java API about Allocation copyTo & From FieldPacker"
* commit '
4b5af9bce10dbb8b6d5ff27a5f0c49f3498a6245':
[RenderScript] Update the java API about Allocation copyTo & From FieldPacker
Miao Wang [Fri, 6 Mar 2015 01:05:28 +0000 (01:05 +0000)]
Merge "[RenderScript] Update the java API about Allocation copyTo & From FieldPacker"
Mathieu Chartier [Fri, 6 Mar 2015 01:00:41 +0000 (17:00 -0800)]
Add JIT system properties
Added the following runtime options.
"dalvik.vm.usejit" -> "-Xusejit:"
"dalvik.vm.jitcodecachesize" -> "-Xjitcodecachesize:"
"dalvik.vm.jitthreshold" -> "-Xjitthreshold:"
Bug:
17950037
Change-Id: I4996cdd1e34a1743d83c37069f545e6e09bccdb9
Miao Wang [Fri, 6 Mar 2015 01:02:23 +0000 (01:02 +0000)]
am
8b86ee9f: Merge "[RenderScript] Add missing variable"
* commit '
8b86ee9fb5909a95a46907aede4d1b22b4ef3bba':
[RenderScript] Add missing variable
Miao Wang [Fri, 6 Mar 2015 01:01:58 +0000 (01:01 +0000)]
am
288e6f67: Merge "[RenderScript] AutoPadding & Unpadding for Vec3 Elements during copyTo & copyFrom."
* commit '
288e6f67181ce74ec4b97b61def1b9510b1221d0':
[RenderScript] AutoPadding & Unpadding for Vec3 Elements during copyTo & copyFrom.
Miao Wang [Thu, 5 Mar 2015 00:40:21 +0000 (16:40 -0800)]
[RenderScript] Update the java API about Allocation copyTo & From FieldPacker
Change-Id: I4e1b911d4cdfec8a841bc5a8bc615c64c50e8fc8
Miao Wang [Fri, 6 Mar 2015 00:34:51 +0000 (00:34 +0000)]
Merge "[RenderScript] Add missing variable"
Miao Wang [Fri, 6 Mar 2015 00:27:15 +0000 (16:27 -0800)]
[RenderScript] Add missing variable
Change-Id: I148bab3a8c3fb360d345549401d0ed579a37e971
Miao Wang [Thu, 5 Mar 2015 23:49:57 +0000 (23:49 +0000)]
Merge "[RenderScript] AutoPadding & Unpadding for Vec3 Elements during copyTo & copyFrom."
Dan Albert [Thu, 5 Mar 2015 23:41:39 +0000 (15:41 -0800)]
resolved conflicts for merge of
701f9c2f to stage-aosp-master
Change-Id: I42e0411c0acef4b15137491ecaaed95d9b1cd0c1
Dan Albert [Thu, 5 Mar 2015 23:31:41 +0000 (23:31 +0000)]
Merge "Stop using namespace std."
Andreas Gampe [Thu, 5 Mar 2015 22:38:56 +0000 (22:38 +0000)]
am
63ab6eb2: Merge "Frameworks/base: Use ArraySet more explicitly"
* commit '
63ab6eb220a2a75837d6e3d18d19cbd5dda175eb':
Frameworks/base: Use ArraySet more explicitly
Andreas Gampe [Thu, 5 Mar 2015 22:29:56 +0000 (22:29 +0000)]
Merge "Frameworks/base: Use ArraySet more explicitly"
Andreas Gampe [Thu, 5 Mar 2015 21:13:55 +0000 (13:13 -0800)]
Frameworks/base: Use ArraySet more explicitly
In KeySetManagerService, use ArraySet more explicitly. Avoid for-each
loops.
Collections API methods on ArraySet are not very efficient. Iterators
incur two object allocations: a helper and the actual iterator object.
During boot, about 4.5K such calls are made. Using the ArraySet more
explicitly like an ArrayList/array avoids the overhead.
Bug:
19617481
Change-Id: I25df334fa1d4be3210667fb1404e3c43f2585049
Andreas Gampe [Thu, 5 Mar 2015 17:15:58 +0000 (17:15 +0000)]
am
6695b992: Merge "Frameworks/base: Add removeAll for ArraySet"
* commit '
6695b9920d15f8d9a17d6b0c66b863d1c2e38584':
Frameworks/base: Add removeAll for ArraySet
Andreas Gampe [Thu, 5 Mar 2015 17:10:30 +0000 (17:10 +0000)]
Merge "Frameworks/base: Add removeAll for ArraySet"
Brian Carlstrom [Thu, 5 Mar 2015 06:22:18 +0000 (06:22 +0000)]
am
165c2564: Merge "Manually add SignalStrength to preloaded-classes"
* commit '
165c25641ccedf6447d09dfec00f485df1361c35':
Manually add SignalStrength to preloaded-classes
Brian Carlstrom [Thu, 5 Mar 2015 06:15:53 +0000 (06:15 +0000)]
Merge "Manually add SignalStrength to preloaded-classes"
Brian Carlstrom [Thu, 5 Mar 2015 05:56:26 +0000 (21:56 -0800)]
Manually add SignalStrength to preloaded-classes
Bug:
19323020
Change-Id: I61e9d2dd5d06fe2353da17e5646f259122e5ea98
Andreas Gampe [Thu, 5 Mar 2015 01:14:10 +0000 (17:14 -0800)]
Frameworks/base: Add removeAll for ArraySet
Add a simple ArraySet.removeAll(ArraySet) method. This avoids two
allocations, a MapCollections helper and an Iterator object, over
the removeAll(Collection) code.
KeySetManagerService heavily calls removeAll during boot (about 9K
times in AOSP). This reduces GC stress and optimizes the removal
(about half the time the removed collection has only one element).
The removal method in KeySetManagerService is also done under a lock,
so that it gates parallelization efforts in PackageManagerService.
Bug:
19498314
Change-Id: Ib0e483adfd09831cd66ab19a820ebf6544a2b66f
Miao Wang [Mon, 2 Mar 2015 23:15:15 +0000 (15:15 -0800)]
[RenderScript] AutoPadding & Unpadding for Vec3 Elements during
copyTo & copyFrom.
Change-Id: I10b6fb235717e181ebb30b92e4dbe23e6183a29c
Dan Albert [Wed, 4 Mar 2015 21:54:20 +0000 (13:54 -0800)]
Stop using namespace std.
The pattern of #include and using namespace std here fails to build
with GCC. At first glance it's a GCC bug rather than libc++ doing
something wrong. Regardless, it can be worked around by just
specifying std:: where appropriate.
Bug:
19606303
Change-Id: I5652682eae7ca7559cf2a9307909859013440781
Nick Kralevich [Tue, 3 Mar 2015 17:02:22 +0000 (17:02 +0000)]
am
56fde9e7: Merge "SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates."
* commit '
56fde9e70ef850ca7e3f076e52567f5c75b5e7da':
SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates.
Nick Kralevich [Tue, 3 Mar 2015 16:55:09 +0000 (16:55 +0000)]
Merge "SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates."
Selim Gurun [Tue, 3 Mar 2015 02:20:57 +0000 (02:20 +0000)]
am
75666e90: Merge "Revert "Add potential future APIs for postmessage""
* commit '
75666e9054d97a9daecd5648f71414406413c6d9':
Revert "Add potential future APIs for postmessage"
Selim Gurun [Tue, 3 Mar 2015 02:13:40 +0000 (02:13 +0000)]
Merge "Revert "Add potential future APIs for postmessage""
Selim Gurun [Tue, 3 Mar 2015 01:54:25 +0000 (01:54 +0000)]
Revert "Add potential future APIs for postmessage"
This reverts commit
37bd8907cb94be69c9bd4c308e49c38524e87269.
Change-Id: Iaa9356b95859846ce9c3209d3d1bcfc800d2ff93
Miao Wang [Tue, 3 Mar 2015 01:11:18 +0000 (01:11 +0000)]
am
caa8a8fb: Merge "[Renderscript] JAVA API update for Allocation.CopyTo add the following functions to make it more symmetric to copyFrom()."
* commit '
caa8a8fb9849f1d44ffab3117950ac1e7b02cd4d':
[Renderscript] JAVA API update for Allocation.CopyTo add the following functions to make it more symmetric to copyFrom().
Miao Wang [Tue, 3 Mar 2015 00:57:47 +0000 (00:57 +0000)]
Merge "[Renderscript] JAVA API update for Allocation.CopyTo add the following functions to make it more symmetric to copyFrom()."
Jason Sams [Tue, 3 Mar 2015 00:03:58 +0000 (00:03 +0000)]
am
514e0801: Merge "Fix crash when updating adapter offsets."
* commit '
514e0801cc95c9827d220104317e1fe45f396b94':
Fix crash when updating adapter offsets.
Jason Sams [Mon, 2 Mar 2015 23:57:11 +0000 (23:57 +0000)]
Merge "Fix crash when updating adapter offsets."
Selim Gurun [Mon, 2 Mar 2015 23:07:36 +0000 (23:07 +0000)]
am
9fc8356b: Merge "Add potential future APIs for postmessage"
* commit '
9fc8356baa7816a13e0c140788ccf67301cbd28d':
Add potential future APIs for postmessage
Selim Gurun [Mon, 2 Mar 2015 23:02:11 +0000 (23:02 +0000)]
Merge "Add potential future APIs for postmessage"
Selim Gurun [Mon, 2 Mar 2015 21:59:56 +0000 (13:59 -0800)]
Add potential future APIs for postmessage
Bug:
10237116
The APIs are hidden while work is ongoing.
Change-Id: I3e2f06d6e41af276171b127f06bdd74924c2e74c
Stephen Smalley [Fri, 27 Feb 2015 19:35:53 +0000 (14:35 -0500)]
SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates.
The current SELinuxPolicyInstallReceiver logic can yield a partial
or mixed (old and new) set of policy files under /data/security/current
if there is an error or a crash at certain points before completing
the installation of the update.
Rewrite the logic to avoid the possibility of such partial or mixed
policy updates by using rename on the entire directory of policy
files rather than operating on a per-file basis. Also separate
the extraction of the policy files from the bundle into their own
temporary directory. Make sure we delete any previous temporary directory
or backup directory before using them for this update. Drop the
use of a symlink for /data/security/current altogether; it provides
no benefit.
Change-Id: I564af01c2c3ca1531c216013b8724c7511f32de8
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Mark Salyzyn [Fri, 27 Feb 2015 18:52:36 +0000 (18:52 +0000)]
am
a891d08d: Merge "jni: Add paranoia regarding android_logger_list_read"
* commit '
a891d08dad829c9aacd29bd2c3b36debe3fc1cc3':
jni: Add paranoia regarding android_logger_list_read
Mark Salyzyn [Fri, 27 Feb 2015 18:46:04 +0000 (18:46 +0000)]
Merge "jni: Add paranoia regarding android_logger_list_read"
Geoff Mendal [Fri, 27 Feb 2015 00:32:48 +0000 (00:32 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Geoff Mendal [Fri, 27 Feb 2015 00:32:29 +0000 (00:32 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Geoff Mendal [Fri, 27 Feb 2015 00:28:53 +0000 (16:28 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id83bfa16ba15aaa1f901547117c114490f4035fa
Auto-generated-cl: translation import
Geoff Mendal [Fri, 27 Feb 2015 00:26:53 +0000 (16:26 -0800)]
Import translations. DO NOT MERGE
Change-Id: I030ed9725292854138dabb8c6d9b67e5a7ef0aa6
Auto-generated-cl: translation import
Geoff Mendal [Fri, 27 Feb 2015 00:20:50 +0000 (00:20 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Geoff Mendal [Fri, 27 Feb 2015 00:20:26 +0000 (00:20 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Geoff Mendal [Fri, 27 Feb 2015 00:18:09 +0000 (16:18 -0800)]
Import translations. DO NOT MERGE
Change-Id: I12dd7931cbe95c7dfb4c9c468e19a25bcd780324
Auto-generated-cl: translation import
Geoff Mendal [Fri, 27 Feb 2015 00:16:10 +0000 (16:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: I69d645539c36b3915e43eaa0d7b190bc6d559840
Auto-generated-cl: translation import
Geoff Mendal [Fri, 27 Feb 2015 00:15:41 +0000 (00:15 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Geoff Mendal [Fri, 27 Feb 2015 00:14:09 +0000 (16:14 -0800)]
Import translations. DO NOT MERGE
Change-Id: Idb623a7515bd47274efcd49cc7f9182296213202
Auto-generated-cl: translation import
Geoff Mendal [Fri, 27 Feb 2015 00:13:07 +0000 (00:13 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Geoff Mendal [Fri, 27 Feb 2015 00:12:53 +0000 (00:12 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Geoff Mendal [Fri, 27 Feb 2015 00:12:31 +0000 (00:12 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Geoff Mendal [Fri, 27 Feb 2015 00:11:44 +0000 (00:11 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Geoff Mendal [Fri, 27 Feb 2015 00:10:51 +0000 (00:10 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Geoff Mendal [Fri, 27 Feb 2015 00:10:10 +0000 (00:10 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Geoff Mendal [Fri, 27 Feb 2015 00:08:40 +0000 (16:08 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1a8de3ff34e0661702038b8f006f920c5ca3ba27
Auto-generated-cl: translation import
Geoff Mendal [Fri, 27 Feb 2015 00:04:59 +0000 (16:04 -0800)]
Import translations. DO NOT MERGE
Change-Id: I333284d756efb9b6f22577b047e95fde5a27ff71
Auto-generated-cl: translation import
Geoff Mendal [Fri, 27 Feb 2015 00:02:59 +0000 (16:02 -0800)]
Import translations. DO NOT MERGE
Change-Id: I59953f8c826f975cd602346307300d124b884a1c
Auto-generated-cl: translation import
Geoff Mendal [Thu, 26 Feb 2015 23:59:12 +0000 (15:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: I893f1ac696506a8a96a1e447b3851ed3bf51c31c
Auto-generated-cl: translation import
Geoff Mendal [Thu, 26 Feb 2015 23:57:08 +0000 (15:57 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5fb0da094aa109b970f333aea78b0366f2f5eb2c
Auto-generated-cl: translation import
Geoff Mendal [Thu, 26 Feb 2015 23:54:57 +0000 (15:54 -0800)]
Import translations. DO NOT MERGE
Change-Id: I654168fbbcd5fe9371390f2d673561ce1e5c9c89
Auto-generated-cl: translation import
Mark Salyzyn [Thu, 26 Feb 2015 22:43:04 +0000 (14:43 -0800)]
jni: Add paranoia regarding android_logger_list_read
Change-Id: Ic52be201ec7efaef6a385aaf8ea523554aa06f22
Geoff Mendal [Thu, 26 Feb 2015 20:53:29 +0000 (12:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic79aace8bc91318a1d637c834ae3176ee221bead
Auto-generated-cl: translation import
Narayan Kamath [Thu, 26 Feb 2015 17:49:19 +0000 (17:49 +0000)]
am
8cba382f: Merge "Bad month value in DatePicker in Calendar Mode"
* commit '
8cba382f04e4ead4a6b8c4a74216ddb383e8db91':
Bad month value in DatePicker in Calendar Mode
Narayan Kamath [Thu, 26 Feb 2015 17:42:22 +0000 (17:42 +0000)]
Merge "Bad month value in DatePicker in Calendar Mode"
You Kim [Thu, 26 Feb 2015 10:06:16 +0000 (19:06 +0900)]
Bad month value in DatePicker in Calendar Mode
Calendar MONTH field is zero based. Use predefined month.
Change-Id: I957bf385dc8e877e8698dacad68808f4d9d8a6d0
Jason Sams [Thu, 26 Feb 2015 00:42:00 +0000 (16:42 -0800)]
Fix crash when updating adapter offsets.
Change-Id: I0a6923e387f9743a06cc2c4c67995a79789d4cdd
Miao Wang [Sat, 21 Feb 2015 02:36:32 +0000 (18:36 -0800)]
[Renderscript] JAVA API update for Allocation.CopyTo
add the following functions to make it more symmetric to copyFrom().
- copy1DRangeToUnchecked, copy1DRangeTo
- copy2DRangeToUnchecked, copy2DRangeTo
- copy3DRangeToUnchecked, copy3DRangeTo
- setFromFieldPacker, 2D and 3D variants
- copyElementTo, (1D, 2D & 3D)
Change-Id: I6b896123e1c00cead552aa5b31a701b15dd70f85
Dan Albert [Wed, 25 Feb 2015 23:00:52 +0000 (23:00 +0000)]
am
b78cce6f: Merge "Update autogenerated gl functions."
* commit '
b78cce6f92e38b57a6a56183cdbafc054c5758fe':
Update autogenerated gl functions.
Dan Albert [Wed, 25 Feb 2015 22:50:24 +0000 (22:50 +0000)]
Merge "Update autogenerated gl functions."
Mark Salyzyn [Wed, 25 Feb 2015 19:13:12 +0000 (19:13 +0000)]
am
0d8b97a4: Merge "jni: switch to ANDROID_LOG_* mode flags"
* commit '
0d8b97a44e4cb5c5cfffd6421eb2cec1ebc00d2f':
jni: switch to ANDROID_LOG_* mode flags
Mark Salyzyn [Wed, 25 Feb 2015 19:04:24 +0000 (19:04 +0000)]
Merge "jni: switch to ANDROID_LOG_* mode flags"
Mark Salyzyn [Mon, 26 Jan 2015 20:51:27 +0000 (12:51 -0800)]
jni: switch to ANDROID_LOG_* mode flags
Change-Id: I8aea5bf4faf79a96fa8485f7707e7484cd11d7a3
Narayan Kamath [Tue, 24 Feb 2015 12:56:52 +0000 (12:56 +0000)]
am
72dc62ea: Merge "Track removal of refcounts from FileMap."
* commit '
72dc62ead214bdec5c46d42f4e859b139dba0a00':
Track removal of refcounts from FileMap.
Narayan Kamath [Tue, 24 Feb 2015 12:50:55 +0000 (12:50 +0000)]
Merge "Track removal of refcounts from FileMap."
Narayan Kamath [Tue, 24 Feb 2015 10:11:52 +0000 (10:11 +0000)]
am
6e208cdd: Merge "Remove wrong javadoc comment"
* commit '
6e208cddad3315c4e38accdb801908b2b9b5cbbd':
Remove wrong javadoc comment
Narayan Kamath [Tue, 24 Feb 2015 10:04:31 +0000 (10:04 +0000)]
Merge "Remove wrong javadoc comment"
Chad Brubaker [Mon, 23 Feb 2015 22:45:11 +0000 (22:45 +0000)]
am
f3c117ca: Merge "Add new IKeystoreService methods to KeyStore"
* commit '
f3c117ca0d116b01174732790be1939282d0a5a0':
Add new IKeystoreService methods to KeyStore
Chad Brubaker [Mon, 23 Feb 2015 22:45:01 +0000 (22:45 +0000)]
am
598f9b2a: Merge "Add Keymaster 0.4 binder API"
* commit '
598f9b2a19bf5adf834f9a0edd12d4b4bc7ea27d':
Add Keymaster 0.4 binder API
Chad Brubaker [Mon, 23 Feb 2015 22:20:54 +0000 (22:20 +0000)]
Merge "Add new IKeystoreService methods to KeyStore"
Chad Brubaker [Mon, 23 Feb 2015 22:20:37 +0000 (22:20 +0000)]
Merge "Add Keymaster 0.4 binder API"
Chad Brubaker [Wed, 11 Feb 2015 05:33:23 +0000 (21:33 -0800)]
Add new IKeystoreService methods to KeyStore
Add wrappers for all the new IKeystoreService keymaster 0.4 methods to
android.security.KeyStore.
Change-Id: Icb5500cfffb62d1af326edf326e1b9b67e5cece9
Chad Brubaker [Wed, 21 Jan 2015 22:00:55 +0000 (14:00 -0800)]
Add Keymaster 0.4 binder API
This adds the classes for creating and serializing arguments and results
from keymaster as well as the enum values from
hardware/libhardware/include/hardware/keymaster_defs.h which will be
needed for argument creation as well as converting keymaster error
codes into Java exceptions.
Change-Id: I61046756361d43d9f02eea370c2cbd07c3638ea3
Dan Albert [Mon, 23 Feb 2015 18:41:10 +0000 (10:41 -0800)]
Update autogenerated gl functions.
Corresponding frameworks/native change:
https://android-review.googlesource.com/#/c/134491/
Since this fixes the int-to-pointer cast issues, stop ignoring that
warning.
Change-Id: I85134dc151ba368e4619e36125264b2b3f104202
Narayan Kamath [Mon, 23 Feb 2015 15:47:54 +0000 (15:47 +0000)]
Track removal of refcounts from FileMap.
Use delete instead of release.
Change-Id: I25c841b368aa9d51e9259399b94cafa2bbb7a076
Narayan Kamath [Mon, 23 Feb 2015 10:54:40 +0000 (10:54 +0000)]
am
6b492e78: Merge "Clean up Javadocs for UEventObserver"
* commit '
6b492e78115833f0093d1517483728b574121c07':
Clean up Javadocs for UEventObserver
Narayan Kamath [Mon, 23 Feb 2015 10:50:18 +0000 (10:50 +0000)]
Merge "Clean up Javadocs for UEventObserver"
Valter Strods [Tue, 19 Aug 2014 20:42:18 +0000 (23:42 +0300)]
Clean up Javadocs for UEventObserver
This commit removes a couple of apostrophes from the word "UEvents" as
the apostrophes would only be needed if something that belongs to the
UEvent was being talked about. Instead, the UEvents are being talked
about themselves - as a bunch.
Change-Id: I6a7908c6b73c0739102b632d2499e0f1e3c2d47f
Elliott Hughes [Sat, 21 Feb 2015 17:09:46 +0000 (17:09 +0000)]
am
d002e027: Merge "Fix \'fuchsia\' typo."
* commit '
d002e02750b51fed3da41a2b4b222824df8d1a10':
Fix 'fuchsia' typo.
Elliott Hughes [Sat, 21 Feb 2015 17:04:21 +0000 (17:04 +0000)]
Merge "Fix 'fuchsia' typo."
Elliott Hughes [Sat, 21 Feb 2015 03:07:41 +0000 (19:07 -0800)]
Fix 'fuchsia' typo.
Bug: https://code.google.com/p/android/issues/detail?id=152142
Change-Id: Ib45f2d19d52fe9d95d560d37296d50cba190cb83
Jason Sams [Fri, 20 Feb 2015 20:00:40 +0000 (20:00 +0000)]
am
adb52ef7: Merge "Implement finalizer for RS contexts."
* commit '
adb52ef7034d4d3e0eee58cedae2a343d29771b9':
Implement finalizer for RS contexts.
Jason Sams [Fri, 20 Feb 2015 19:51:54 +0000 (19:51 +0000)]
Merge "Implement finalizer for RS contexts."
Jason Sams [Fri, 20 Feb 2015 01:19:52 +0000 (17:19 -0800)]
Implement finalizer for RS contexts.
Fixes memory leak when apps forget to call .destroy() on the context.
Change-Id: Ida4685768e92cfe3875da38846d17b86cc386cd0
OSDN Git Service
