OSDN Git Service
Andreas Gampe [Sun, 8 Mar 2015 00:17:47 +0000 (00:17 +0000)]
am
208e80d9: am
a3d5b230: am
cdc19f3f: Merge "Frameworks/base: Remove unnecessary Pattern instance"
* commit '
208e80d931fd775de925529e0c36a34e9b7f916a':
Frameworks/base: Remove unnecessary Pattern instance
Mathieu Chartier [Sun, 8 Mar 2015 00:17:40 +0000 (00:17 +0000)]
am
ea3d53f5: am
773bcfa7: am
e59b7ce2: Merge "Add JIT system properties"
* commit '
ea3d53f5a8f8e396bf8918041087db4603d444e5':
Add JIT system properties
Miao Wang [Sun, 8 Mar 2015 00:17:34 +0000 (00:17 +0000)]
am
989e03f1: am
c1e2bf95: am
4b5af9bc: Merge "[RenderScript] Update the java API about Allocation copyTo & From FieldPacker"
* commit '
989e03f144e8031f33af08945e845283dddcc8ad':
[RenderScript] Update the java API about Allocation copyTo & From FieldPacker
Miao Wang [Sun, 8 Mar 2015 00:17:27 +0000 (00:17 +0000)]
am
449571c4: am
26f1a538: am
8b86ee9f: Merge "[RenderScript] Add missing variable"
* commit '
449571c45e47e9b8d118c59dbd909b0d512f7e6d':
[RenderScript] Add missing variable
Miao Wang [Sun, 8 Mar 2015 00:17:18 +0000 (00:17 +0000)]
am
ec89c1ea: am
a61832c8: am
288e6f67: Merge "[RenderScript] AutoPadding & Unpadding for Vec3 Elements during copyTo & copyFrom."
* commit '
ec89c1ea731256cd0d71ee58733b2855e1e6e4fa':
[RenderScript] AutoPadding & Unpadding for Vec3 Elements during copyTo & copyFrom.
Andreas Gampe [Sun, 8 Mar 2015 00:08:19 +0000 (00:08 +0000)]
am
a3d5b230: am
cdc19f3f: Merge "Frameworks/base: Remove unnecessary Pattern instance"
* commit '
a3d5b2304cf2db03ba728d37c87ef7360c7da44f':
Frameworks/base: Remove unnecessary Pattern instance
Mathieu Chartier [Sun, 8 Mar 2015 00:07:18 +0000 (00:07 +0000)]
am
773bcfa7: am
e59b7ce2: Merge "Add JIT system properties"
* commit '
773bcfa7ecb1e06831e7f060ecc3c43d0cf1bf00':
Add JIT system properties
Miao Wang [Sun, 8 Mar 2015 00:07:09 +0000 (00:07 +0000)]
am
c1e2bf95: am
4b5af9bc: Merge "[RenderScript] Update the java API about Allocation copyTo & From FieldPacker"
* commit '
c1e2bf95ab77127ea21ebd44b8615eca85338af1':
[RenderScript] Update the java API about Allocation copyTo & From FieldPacker
Miao Wang [Sun, 8 Mar 2015 00:07:01 +0000 (00:07 +0000)]
am
26f1a538: am
8b86ee9f: Merge "[RenderScript] Add missing variable"
* commit '
26f1a53838b2c8b77c0995801dcc1c7816c47f16':
[RenderScript] Add missing variable
Miao Wang [Sun, 8 Mar 2015 00:06:55 +0000 (00:06 +0000)]
am
a61832c8: am
288e6f67: Merge "[RenderScript] AutoPadding & Unpadding for Vec3 Elements during copyTo & copyFrom."
* commit '
a61832c8fdff8cf086113f578032136c81935904':
[RenderScript] AutoPadding & Unpadding for Vec3 Elements during copyTo & copyFrom.
Mike Lockwood [Sat, 7 Mar 2015 23:50:36 +0000 (23:50 +0000)]
Merge changes Ib5cc22db,I93e0c449,I65cd4cfd,I1cef3bd4,I628c0468
* changes:
MIDI Manager: Add explicit close mechanism for input and output ports
MidiDeviceService: Add getDeviceInfo() accessor method
Add MidiDevice.close() method so we can clean up our ServiceConnection
Make MidiSender and MidiReceiver abstract classes, rename MidiReceiver.post() to receive()
Eliminate MidiPort base class for MidiInputPort and MidiOutputPort
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
Scott Kennedy [Sat, 7 Mar 2015 01:34:47 +0000 (01:34 +0000)]
Merge "Add more @Nullable annotations"
Scott Kennedy [Sat, 7 Mar 2015 01:24:58 +0000 (17:24 -0800)]
Add more @Nullable annotations
Change-Id: I5b2935eb5e63289d80ebf9bf70741800b1c0934a
Chih-Hung Hsieh [Sat, 7 Mar 2015 01:13:49 +0000 (01:13 +0000)]
Merge "Fix unused local variale warning from clang/llvm."
Chih-Hung Hsieh [Sat, 28 Feb 2015 00:11:36 +0000 (16:11 -0800)]
Fix unused local variale warning from clang/llvm.
Change-Id: Ib9b5d06313e5bf933edfb38a4522929104c7917a
Dianne Hackborn [Sat, 7 Mar 2015 00:44:56 +0000 (00:44 +0000)]
Merge "Add new debug feature to automatically create heap dumps."
Dianne Hackborn [Wed, 4 Mar 2015 01:04:12 +0000 (17:04 -0800)]
Add new debug feature to automatically create heap dumps.
Not yet working, unless you turn off SELinux enforcing.
We need to update SElinux to allow the system process
to give apps access to /data/system/heapdump/javaheap.bin.
Currently watching can only be enabled through the shell,
such as:
adb shell am set-watch-heap com.android.systemui 1024
The last number is the process pss size in bytes, so this is
asking us to warn if it goes about 1K which will be all the
time.
Change-Id: I2089e5db2927afca0bf01a363c6247ee5dcb26e8
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
Yigit Boyar [Sat, 7 Mar 2015 00:09:28 +0000 (00:09 +0000)]
Merge "Remove original movements record from GridLayout"
John Reck [Fri, 6 Mar 2015 23:47:25 +0000 (23:47 +0000)]
Merge "Add percentiles"
John Reck [Fri, 6 Mar 2015 22:40:50 +0000 (14:40 -0800)]
Add percentiles
Change-Id: Ieb6badd177bb6f67dda199dfcb3e0f483c8c4e59
Tor Norbye [Fri, 6 Mar 2015 23:15:25 +0000 (23:15 +0000)]
Merge "Annotate ARGB integer parameters with @ColorInt"
Tor Norbye [Fri, 6 Mar 2015 23:08:58 +0000 (23:08 +0000)]
Merge "Additional annotations: @CallSuper, @Keep, etc."
Mike Lockwood [Fri, 6 Mar 2015 17:18:09 +0000 (09:18 -0800)]
MIDI Manager: Add explicit close mechanism for input and output ports
Relying on errors from closing the file descriptor is not reliable
and was resulting in file descriptor leaks in device servers.
Change-Id: Ib5cc22dba493eae6608a12cc6d4178d8390da77b
Christopher Tate [Fri, 6 Mar 2015 19:43:52 +0000 (19:43 +0000)]
Merge "Don't back up / restore the code_cache/ directory"
Derek Sollenberger [Fri, 6 Mar 2015 18:48:27 +0000 (13:48 -0500)]
SkPorterDuff Multiply mode maps to SkXfermode modulate.
bug:
19627342
Change-Id: I97f26ca1bc8abe2768f4a12cc70fb0fa5d905098
Scott Kennedy [Fri, 6 Mar 2015 18:45:23 +0000 (18:45 +0000)]
Merge "Allow attrs to be @Nullable in TextView and LinearLayout"
Chris Craik [Fri, 6 Mar 2015 18:44:15 +0000 (18:44 +0000)]
Merge "Avoid invalid shader creation for certain blend modes"
Chris Craik [Fri, 6 Mar 2015 18:42:29 +0000 (18:42 +0000)]
Merge "Revert "Revert "Remove references to SkPorterDuff as it is deprecated."""
Chris Craik [Fri, 6 Mar 2015 18:42:15 +0000 (18:42 +0000)]
Revert "Revert "Remove references to SkPorterDuff as it is deprecated.""
Fix build breakage.
This reverts commit
26b4f598c8b1e99b43261614a6861785638c8c00.
Change-Id: If39ce2a41d26a8520091f330234c3d35e413ee92
Chris Craik [Fri, 6 Mar 2015 18:16:44 +0000 (18:16 +0000)]
Merge "Revert "Remove references to SkPorterDuff as it is deprecated.""
Chris Craik [Fri, 6 Mar 2015 18:15:39 +0000 (18:15 +0000)]
Revert "Remove references to SkPorterDuff as it is deprecated."
bug:
19627342
This reverts commit
a9aded1f6253afbea7906509992a8a3721f731ab.
Change-Id: Ic865edfbd31c9e24d18a1397a1d346633376e20a
Chris Craik [Fri, 6 Mar 2015 17:40:35 +0000 (09:40 -0800)]
Avoid invalid shader creation for certain blend modes
bug:
19627342
Change-Id: I41e3c1ce8e6fa52f046ec492d19de7cab92b9ec5
Hiroshi Yamauchi [Fri, 6 Mar 2015 17:43:52 +0000 (17:43 +0000)]
Merge "Deprecate things that rely on Debug.startAllocCounting."
Torne (Richard Coles) [Fri, 6 Mar 2015 17:25:47 +0000 (17:25 +0000)]
Merge "Fix typo in WebSettings javadoc."
Mike Lockwood [Fri, 6 Mar 2015 16:17:33 +0000 (08:17 -0800)]
MidiDeviceService: Add getDeviceInfo() accessor method
so service implementations can access their own device info object.
Change-Id: I93e0c449e72d76568d7b4c9f7f7db00a846b5a33
Glenn Kasten [Fri, 6 Mar 2015 16:14:48 +0000 (16:14 +0000)]
Merge "Fix USB typos"
James Cook [Fri, 6 Mar 2015 15:42:05 +0000 (15:42 +0000)]
Merge "Support undo of some programmatic TextView changes"
Torne (Richard Coles) [Fri, 6 Mar 2015 14:20:00 +0000 (14:20 +0000)]
Fix typo in WebSettings javadoc.
We accidentally repeated the same enum value twice; fixed to mention the
three values correctly.
Change-Id: Iba6a7edd8e1a5b429728056a8f56634427758c73
Mikhail Naganov [Mon, 9 Feb 2015 17:01:40 +0000 (17:01 +0000)]
Provide better error reporting for WebView
Add new callbacks into WebViewClient that will provide notifications
about subresource loading errors and HTTP errors received from servers.
Bug:
19313118
Change-Id: Idb47f53ef7e72cb95f3e9b89d1e238d69e896b8b
Scott Kennedy [Fri, 6 Mar 2015 03:15:11 +0000 (19:15 -0800)]
Allow attrs to be @Nullable in TextView and LinearLayout
Change-Id: I46ac6cddf010e7ce59de6272c30e824104e28acb
Lajos Molnar [Fri, 6 Mar 2015 03:09:18 +0000 (03:09 +0000)]
Merge "media: update AMessage to use handler instead of handler-id"
Christopher Tate [Fri, 6 Mar 2015 02:31:38 +0000 (18:31 -0800)]
Don't back up / restore the code_cache/ directory
Bug
19628750
Change-Id: I1f2f5e8083675bf70d17c0c143dc813ca9e04610
Scott Kennedy [Fri, 6 Mar 2015 02:31:28 +0000 (02:31 +0000)]
Merge "Mark setAccessibilityDelegate()'s argument as @Nullable"
Christopher Tate [Fri, 6 Mar 2015 02:05:33 +0000 (02:05 +0000)]
Merge "Don't enqueue allowBackup=false apps for full backup attempts"
Christopher Tate [Wed, 4 Mar 2015 00:19:44 +0000 (16:19 -0800)]
Don't enqueue allowBackup=false apps for full backup attempts
We are correctly refusing to actually process apps for backup if they have
declared android:allowBackup="false" in their manifests, but we're still
wasting bookkeeping & a certain amount of work in tracking them as part of
the full backup queue. Fix that; now we recognize that they shouldn't be
in the queue in the first place.
When reinflating the queue at boot time we also re-verify the participation
of each mentioned app so that we properly drop ones that have been uninstalled
or altered such that they are no longer full-data backup candidates.
Finally, if an app previously implemented key/value backup, so we think
we'll be running it in that mode in a future backup pass, but has been
updated to use the full-data path instead, we don't want to go ahead and
run a key/value pass on it. Added a backstop check and proceed gracefully
in this situation.
(Also add bit more debug-build logging to LocalTransport)
Bug
19462310
Change-Id: I07ab4f2e68e92766d9e8f2595fa763c91193d743
Scott Kennedy [Fri, 6 Mar 2015 01:48:31 +0000 (17:48 -0800)]
Mark setAccessibilityDelegate()'s argument as @Nullable
Change-Id: I3c087e953e29e81285fc8efa4157f694eeaf075d
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"
Andrew Lee [Fri, 6 Mar 2015 01:05:07 +0000 (01:05 +0000)]
Merge "Add methods for device telephony configs."
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
Dan Sandler [Fri, 6 Mar 2015 00:39:10 +0000 (00:39 +0000)]
am
eef3fbcf: am
8deb6d95: am
e6a4b445: am
3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev
* commit '
eef3fbcf6825a5e5e0cb150123d9bc87956fbb23':
Avoid crashing on startup when policy forbids lockscreen camera.
Miao Wang [Fri, 6 Mar 2015 00:34:51 +0000 (00:34 +0000)]
Merge "[RenderScript] Add missing variable"
Tor Norbye [Mon, 2 Mar 2015 17:39:27 +0000 (09:39 -0800)]
Annotate ARGB integer parameters with @ColorInt
Change-Id: I307f72a382272cf18ddb6b07d9fcb81228568d9a
Tor Norbye [Mon, 2 Mar 2015 15:55:51 +0000 (07:55 -0800)]
Additional annotations: @CallSuper, @Keep, etc.
These mirror the new support library annotations, but
with source retention.
Change-Id: Ib85ceeb37d596aae8cf12d4f8fede3982552d033
Dan Sandler [Fri, 6 Mar 2015 00:31:04 +0000 (00:31 +0000)]
am
8deb6d95: am
e6a4b445: am
3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev
* commit '
8deb6d95a73d5d6860fbfb2eb273cdbc49c5d2c9':
Avoid crashing on startup when policy forbids lockscreen camera.
Miao Wang [Fri, 6 Mar 2015 00:27:15 +0000 (16:27 -0800)]
[RenderScript] Add missing variable
Change-Id: I148bab3a8c3fb360d345549401d0ed579a37e971
Dan Sandler [Fri, 6 Mar 2015 00:21:47 +0000 (00:21 +0000)]
am
e6a4b445: am
3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev
* commit '
e6a4b445944489d67d40c8f52322fb149290fcf8':
Avoid crashing on startup when policy forbids lockscreen camera.
Dan Sandler [Fri, 6 Mar 2015 00:10:22 +0000 (00:10 +0000)]
am
3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev
* commit '
3581f4c91a77ecb9313f51a2d07ed88ff61d9299':
Avoid crashing on startup when policy forbids lockscreen camera.
Dan Sandler [Fri, 6 Mar 2015 00:03:34 +0000 (00:03 +0000)]
Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev
Dan Albert [Thu, 5 Mar 2015 23:56:53 +0000 (23:56 +0000)]
am
7a79c4ca: am
f8d6a4ba: resolved conflicts for merge of
701f9c2f to stage-aosp-master
* commit '
7a79c4cac3b0c722832e868346db2375b6d6c379':
Stop using namespace std.
John Reck [Thu, 5 Mar 2015 23:55:13 +0000 (23:55 +0000)]
Merge "Cleanup Bitmap JNI attempt #2"
Dan Albert [Thu, 5 Mar 2015 23:50:35 +0000 (23:50 +0000)]
am
f8d6a4ba: resolved conflicts for merge of
701f9c2f to stage-aosp-master
* commit '
f8d6a4ba8739e16e13ae0014efa099ec564939a7':
Stop using namespace std.
Miao Wang [Thu, 5 Mar 2015 23:49:57 +0000 (23:49 +0000)]
Merge "[RenderScript] AutoPadding & Unpadding for Vec3 Elements during copyTo & copyFrom."
Eric Gilmore [Thu, 5 Mar 2015 23:46:49 +0000 (23:46 +0000)]
am
dcfa5e03: am
6e3c763f: am
685e6ce8: am
636a39ba: am
e95fa264: am
e17b0a14: am
87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs
* commit '
dcfa5e03f76e6ba9579125669d07cac09cde8cd2':
Re-fixing link, and removing trailing white space.
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
Julia Reynolds [Thu, 5 Mar 2015 23:39:02 +0000 (23:39 +0000)]
Merge "Allow device and profile owners to set a user icon."
Eric Gilmore [Thu, 5 Mar 2015 23:38:31 +0000 (23:38 +0000)]
am
6e3c763f: am
685e6ce8: am
636a39ba: am
e95fa264: am
e17b0a14: am
87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs
* commit '
6e3c763f0146377f610227c879c8037b1842ab6e':
Re-fixing link, and removing trailing white space.
Dan Albert [Thu, 5 Mar 2015 23:31:41 +0000 (23:31 +0000)]
Merge "Stop using namespace std."
Eric Gilmore [Thu, 5 Mar 2015 23:26:17 +0000 (23:26 +0000)]
am
685e6ce8: am
636a39ba: am
e95fa264: am
e17b0a14: am
87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs
* commit '
685e6ce830f97383846335eec758e83ba3ad7060':
Re-fixing link, and removing trailing white space.
Eric Gilmore [Thu, 5 Mar 2015 23:11:09 +0000 (23:11 +0000)]
am
636a39ba: am
e95fa264: am
e17b0a14: am
87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs
* commit '
636a39babbda97743b33511b3dd2addafc8c2847':
Re-fixing link, and removing trailing white space.
Eric Gilmore [Thu, 5 Mar 2015 23:04:27 +0000 (23:04 +0000)]
am
e95fa264: am
e17b0a14: am
87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs
* commit '
e95fa2649b62a3fbccd096b43925a17c6ff03228':
Re-fixing link, and removing trailing white space.
Andreas Gampe [Thu, 5 Mar 2015 22:55:34 +0000 (22:55 +0000)]
am
0fcfae88: am
ecc20aaf: am
63ab6eb2: Merge "Frameworks/base: Use ArraySet more explicitly"
* commit '
0fcfae88f2737b004cae83a77d590046e2b08ef3':
Frameworks/base: Use ArraySet more explicitly
Eric Gilmore [Thu, 5 Mar 2015 22:50:16 +0000 (22:50 +0000)]
am
e17b0a14: am
87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs
* commit '
e17b0a14ccc427bff386517537fcf23e00a087d4':
Re-fixing link, and removing trailing white space.
Andreas Gampe [Thu, 5 Mar 2015 22:46:49 +0000 (22:46 +0000)]
am
ecc20aaf: am
63ab6eb2: Merge "Frameworks/base: Use ArraySet more explicitly"
* commit '
ecc20aafa6f3d272292e7b3577c99f2c127e590f':
Frameworks/base: Use ArraySet more explicitly
Yigit Boyar [Thu, 5 Mar 2015 22:39:38 +0000 (14:39 -0800)]
Fix build. getAlingment should not be public
Change-Id: I4abde1ddc78367795601215106388d6eb535cbca
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
George Mount [Thu, 5 Mar 2015 22:33:08 +0000 (22:33 +0000)]
Merge "Handle null epicenters in EpicenterClipReveal."
Eric Gilmore [Thu, 5 Mar 2015 22:34:58 +0000 (22:34 +0000)]
am
87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs
* commit '
87499b275bc7a8d4a12a3134646769a5c6c34829':
Re-fixing link, and removing trailing white space.
Andreas Gampe [Thu, 5 Mar 2015 22:29:56 +0000 (22:29 +0000)]
Merge "Frameworks/base: Use ArraySet more explicitly"
George Mount [Thu, 5 Mar 2015 22:09:33 +0000 (14:09 -0800)]
Handle null epicenters in EpicenterClipReveal.
Bug
19617067
Change-Id: Ie288288f7a8e0c95ed07d8beb40b78f80048fa98
Yigit Boyar [Thu, 5 Mar 2015 22:17:19 +0000 (14:17 -0800)]
Remove original movements record from GridLayout
Change-Id: Iebb761d0195b9d123dada1262090a71c4c175c5e
John Spurlock [Thu, 5 Mar 2015 22:12:46 +0000 (22:12 +0000)]
Merge "AudioService: Add current stream devices to dumpsys output."
Yigit Boyar [Thu, 5 Mar 2015 21:59:56 +0000 (13:59 -0800)]
Fix some weight bugs in grid layout
This CL also changes how GONE views are considered.
Previously, they would still participate in weight calculations.
Now, they are ignored.
Bug:
19546781
Sub bugs:
Bug:
19571249
Bug:
19571653
Bug:
19571319
Bug:
19571841
Change-Id: I7344f757d3a76be98bb92660f07d2a0cafa9ac12
Eric Gilmore [Thu, 5 Mar 2015 22:00:20 +0000 (22:00 +0000)]
Merge "Re-fixing link, and removing trailing white space." into lmp-docs
John Reck [Thu, 5 Mar 2015 21:50:31 +0000 (13:50 -0800)]
Cleanup Bitmap JNI attempt #2
Original version missed a spot
This reverts commit
c02977e3bbfaaedcb1b1d67e1692becc7dddd59b.
Change-Id: I56244ce10d709fcdef42a001fe4c6ba7b6bbb04d
Eric Gilmore [Thu, 5 Mar 2015 21:39:21 +0000 (13:39 -0800)]
Re-fixing link, and removing trailing white space.
Change-Id: Ic6cef9862424d5581cf0ad5b8366c7033a9fdd93
Derek Sollenberger [Thu, 5 Mar 2015 21:26:39 +0000 (16:26 -0500)]
emove uncessary include for SkPorterDuff.h (Part 2)
Change-Id: I4d29d65a2e8eaf26b1cde6a525703be248bce63d
Raph Levien [Thu, 5 Mar 2015 21:26:31 +0000 (21:26 +0000)]
Merge "Add JNI StaticLayout.Builder"
Derek Sollenberger [Thu, 5 Mar 2015 21:20:35 +0000 (16:20 -0500)]
Remove uncessary include for SkPorterDuff.h
Change-Id: Ibcbed5dd2dc327821fc26e87191185f0069c9911
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
Rich Slogar [Thu, 5 Mar 2015 20:11:26 +0000 (20:11 +0000)]
am
f02b1abc: am
2847fc99: am
cfb0978f: am
bc669e3f: am
dad1cbeb: am
9f485e97: am
4aba69a8: docs: sdk tools date fix
* commit '
f02b1abc2726692dd69f10c1c9e7fa69ccc4ab63':
docs: sdk tools date fix
Rich Slogar [Thu, 5 Mar 2015 20:05:31 +0000 (20:05 +0000)]
am
2847fc99: am
cfb0978f: am
bc669e3f: am
dad1cbeb: am
9f485e97: am
4aba69a8: docs: sdk tools date fix
* commit '
2847fc9912715027492bdae8567cd896b7ba8f9f':
docs: sdk tools date fix