OSDN Git Service
Lajos Molnar [Wed, 13 May 2015 23:01:27 +0000 (23:01 +0000)]
Merge "media: rename MediaCodec.setSurface to setOutputSurface" into mnc-dev
Selim Gurun [Wed, 13 May 2015 22:36:59 +0000 (22:36 +0000)]
Merge "Address API feedback for PostMessage" into mnc-dev
Jorim Jaggi [Wed, 13 May 2015 22:36:00 +0000 (22:36 +0000)]
Merge "Fix build" into mnc-dev
Jorim Jaggi [Wed, 13 May 2015 22:34:01 +0000 (15:34 -0700)]
Fix build
Change-Id: Ia9277c6c983758d301c89312e39b59a2db0b29c4
Nick Kralevich [Wed, 13 May 2015 22:31:57 +0000 (22:31 +0000)]
Merge "Modify how USB connections are handled." into mnc-dev
Jorim Jaggi [Wed, 13 May 2015 22:13:26 +0000 (22:13 +0000)]
Merge "Make sure the app can draw a frame before unlocking" into mnc-dev
Junda Liu [Wed, 13 May 2015 22:13:23 +0000 (22:13 +0000)]
Merge "Rename BOOL_SHOW_CDMA to BOOL_SHOW_CDMA_CHOICES, so the name makes more sense." into mnc-dev
Junda Liu [Wed, 13 May 2015 22:11:10 +0000 (15:11 -0700)]
Rename BOOL_SHOW_CDMA to BOOL_SHOW_CDMA_CHOICES, so the name makes more sense.
Bug: b/
21028396
Change-Id: I4905a1d1db247955ae7fa00a7f5ddfd7337ba5a8
Yohei Yukawa [Wed, 13 May 2015 22:10:33 +0000 (22:10 +0000)]
Merge "Update IME focus when the active view is losing the focus." into mnc-dev
Junda Liu [Wed, 13 May 2015 22:09:20 +0000 (22:09 +0000)]
Merge "Rename BOOL_SHOW_CDMA to BOOL_SHOW_CDMA_CHOICES, so the name makes more sense." into mnc-dev
Hui Shu [Wed, 13 May 2015 22:07:54 +0000 (22:07 +0000)]
Merge "Address API council feedback for setOffscreenPreRaster." into mnc-dev
Jonathan Basseri [Tue, 5 May 2015 19:00:59 +0000 (12:00 -0700)]
Add null annotations for getting carrier config.
CarrierConfigManager can return null Bundles for carrier config, but
never returns null when getting default values. Add the appropriate
annotations.
Change-Id: Iffbed3b54ca7cc28cf8b04f133aacdf9e6e4fd20
Junda Liu [Wed, 13 May 2015 21:57:48 +0000 (14:57 -0700)]
Rename BOOL_SHOW_CDMA to BOOL_SHOW_CDMA_CHOICES, so the name makes more sense.
Bug: b/
21028396
Change-Id: I029671b6bcd03a07956ccf35f4e5fe03d16a2218
Nancy Chen [Wed, 13 May 2015 21:54:47 +0000 (21:54 +0000)]
Merge "Add phone account field for voicemail to distinguish the source." into mnc-dev
Jae Seo [Wed, 13 May 2015 21:43:47 +0000 (21:43 +0000)]
Merge "TIF: API Review: android.media.tv" into mnc-dev
Alan Viverette [Wed, 13 May 2015 21:43:12 +0000 (21:43 +0000)]
Merge "Use drawableStart in dialog list item so we can set padding" into mnc-dev
Lajos Molnar [Wed, 13 May 2015 21:39:55 +0000 (14:39 -0700)]
media: rename MediaCodec.setSurface to setOutputSurface
Bug:
21045402
Change-Id: Ie57880af6ce6feea9713360b094f2b198d3c119e
Adam Lesinski [Wed, 13 May 2015 21:42:57 +0000 (21:42 +0000)]
Merge "AAPT2: Fix issue where @null was wrongly encoded" into mnc-dev
Jorim Jaggi [Wed, 13 May 2015 21:42:14 +0000 (21:42 +0000)]
Merge "Use platform delay for assist long press gesture" into mnc-dev
Adam Lesinski [Wed, 13 May 2015 21:41:38 +0000 (21:41 +0000)]
Merge "AAPT2: Debug: Dump only targetted style" into mnc-dev
Adam Lesinski [Wed, 13 May 2015 21:40:06 +0000 (21:40 +0000)]
Merge "AAPT2: inferred style parent processing" into mnc-dev
Adam Lesinski [Wed, 13 May 2015 21:38:01 +0000 (21:38 +0000)]
Merge "AAPT2: Support static lib referencing static lib" into mnc-dev
Alex Klyubin [Wed, 13 May 2015 21:33:36 +0000 (21:33 +0000)]
Merge "New AndroidKeyStore API in android.security.keystore." into mnc-dev
Nick Kralevich [Wed, 13 May 2015 18:54:03 +0000 (11:54 -0700)]
Modify how USB connections are handled.
* Introduce a new "charger only" mode. In this mode, MTP is disabled,
and no file transfers can occur.
* Make charger only mode the default.
* Modify "persist.sys.usb.config" so it now only holds the adb status.
* Make the USB settings non-persistent. Unplugging the USB connection will
reset the device back to "charger only" mode.
* Fixup wording per UI guidelines.
TODO: Re-implement MDM restrictions for USB / MTP access controls.
Bug:
18905620
Change-Id: I99a50d9132a81e98187f431166fd9fef4d437e4f
Jorim Jaggi [Thu, 7 May 2015 18:41:41 +0000 (11:41 -0700)]
Make sure the app can draw a frame before unlocking
- The mechanism to stop windows drawing while window animator was
animating was somehow flaky. It relied on the fact that the client
would call relayout() whenever the animating state changed. This is
mostly the case, but not for lockscreen animations. Instead, we now
use a push model, where window manager tells the app that the state
has changed.
- In addition, it only stopped drawing if that window was animating,
but then only resumed drawing after all windows have finished
animating. Now, we do this per window, so we only stop drawing for
windows that are currently animating.
- We resume the top activity now at the very beginning of the
unlocking sequence. This gives the app a chance to draw a frame
before the user sees anything. If it's to slow, then we just use the
outdated framebuffer.
Bug:
19964562
Change-Id: Ifef8abd189a3146d854b81b9b948861e4d38c155
Jorim Jaggi [Wed, 13 May 2015 21:17:16 +0000 (14:17 -0700)]
Use platform delay for assist long press gesture
Bug:
20853645
Change-Id: I1f25a04bfc7d07077211743b9d258fd637a402e6
Selim Gurun [Wed, 13 May 2015 17:15:55 +0000 (10:15 -0700)]
Address API feedback for PostMessage
Bug:
21043955
Add anchor tags, and hide the constructor for WebMessagePort.
Change-Id: Ibd2e15581c06be9015a3cd7c7741edf6657d4552
Kenny Guy [Wed, 13 May 2015 21:07:15 +0000 (21:07 +0000)]
Merge "Allowing profile to set a subset of keyguard restrictions." into mnc-dev
Jason Monk [Wed, 13 May 2015 21:06:28 +0000 (21:06 +0000)]
Merge "Add default icon for permissions" into mnc-dev
Jeff Sharkey [Wed, 13 May 2015 20:57:01 +0000 (20:57 +0000)]
Merge "Determine if we have adoptable disks." into mnc-dev
Jeff Sharkey [Wed, 13 May 2015 20:54:30 +0000 (13:54 -0700)]
Determine if we have adoptable disks.
Bug:
19993667
Change-Id: I9b21b05736c22d34ca22f5ad6e1a6ebec440cfb6
Chris Craik [Wed, 13 May 2015 20:47:46 +0000 (20:47 +0000)]
Merge "Revert "Anti-alias by default"" into mnc-dev
Chris Craik [Wed, 13 May 2015 20:44:48 +0000 (20:44 +0000)]
Merge "Anti-Alias ColorDrawable" into mnc-dev
Chris Craik [Wed, 13 May 2015 20:09:50 +0000 (13:09 -0700)]
Revert "Anti-alias by default"
bug:
20948129
Keep HIDDEN_DEFAULT_PAINT_FLAGS name.
This reverts commit
1b60cc0529161b5eca6407b551d67d355994c567.
Change-Id: I97cd9c556375c74c52b006bda4fc7b3a2cfa89e1
John Spurlock [Wed, 13 May 2015 20:39:54 +0000 (20:39 +0000)]
Merge "Volume: Update divider color to match qs tile divider color." into mnc-dev
John Spurlock [Wed, 13 May 2015 20:31:34 +0000 (16:31 -0400)]
Volume: Update divider color to match qs tile divider color.
Bug:
21120949
Change-Id: I35ad4f1badbb109e49d5d5b452e3e11b641d7e14
John Spurlock [Wed, 13 May 2015 20:35:09 +0000 (20:35 +0000)]
Merge "Volume: Use inactive slider tints when disabled." into mnc-dev
John Spurlock [Wed, 13 May 2015 20:23:14 +0000 (16:23 -0400)]
Volume: Use inactive slider tints when disabled.
Bug:
21119650
Change-Id: I14e10c83e9d73096775f92d5290306b76eba6af4
Jorim Jaggi [Wed, 13 May 2015 20:32:30 +0000 (20:32 +0000)]
Merge "Persist fingerprint names" into mnc-dev
Todd Kennedy [Wed, 13 May 2015 20:27:16 +0000 (20:27 +0000)]
Merge "Don't negate saving state" into mnc-dev
Jorim Jaggi [Tue, 12 May 2015 22:00:12 +0000 (15:00 -0700)]
Persist fingerprint names
Bug:
20469328
Change-Id: I8f4a988687bfb78c36cc7cf187103a9d93ed4535
Chris Craik [Wed, 13 May 2015 20:16:56 +0000 (13:16 -0700)]
Anti-Alias ColorDrawable
Change-Id: I4d0ee2a496de908b99b0f1d8bef1b6f861c94c6f
Julia Reynolds [Wed, 13 May 2015 20:14:41 +0000 (20:14 +0000)]
Merge "Remove initiator name param." into mnc-dev
Kenny Root [Wed, 13 May 2015 20:14:25 +0000 (20:14 +0000)]
Merge "Start handshake before calling hostname verifier, part 2" into mnc-dev
John Spurlock [Wed, 13 May 2015 20:10:48 +0000 (20:10 +0000)]
Merge "Zen: Use shorter version of countdown condition summary in footer." into mnc-dev
Jeff Sharkey [Wed, 13 May 2015 20:08:12 +0000 (20:08 +0000)]
Merge "Hide API not ready for prime time." into mnc-dev
Jason Monk [Wed, 13 May 2015 20:01:16 +0000 (16:01 -0400)]
Add default icon for permissions
Bug:
21119477
Change-Id: Ie982a1b42d2195ab79c33cf87756efb3bd9eab29
Jeff Sharkey [Wed, 13 May 2015 19:52:06 +0000 (12:52 -0700)]
Hide API not ready for prime time.
Bug:
20642684
Change-Id: I133f023ba7d1d9572175a8f6a3e3c8314c5a897d
Kenny Root [Tue, 12 May 2015 22:13:50 +0000 (15:13 -0700)]
Start handshake before calling hostname verifier, part 2
If the hostname verifier calls SSLSocket#getSession() before the
handshake has been started, it will implicitly start the handshake.
However, it will swallow any errors and return the canonical invalid
SSLSession instead. This makes it extremely difficult to debug issues.
Instead start the handshake before calling into the verifier since we
are guaranteed to be the first caller of #startHandshake() and won't
cause a renegotiation. That will allow us to see the actual
SSLHandshakeException if it occurs.
Follow up for change
317c0a4959df0361431d5fbf7dacc162bfb48cd2
Bug:
21118659
Change-Id: I8c606a78ba8a990b4e0d28880b566867261fefbc
Chong Zhang [Wed, 13 May 2015 19:56:06 +0000 (19:56 +0000)]
Merge "MediaCodec: rename usePersistentInputSurface to setInputSurface" into mnc-dev
Alex Klyubin [Wed, 13 May 2015 16:15:00 +0000 (09:15 -0700)]
New AndroidKeyStore API in android.security.keystore.
This CL addresses the comments from API Council about Android KeyStore
KeyPairGeneratorSpec, KeyGeneratorSpec and KeyStoreParameter:
1. These abstractions should not take or hold references to Context.
2. The Builders of these abstractions should take all mandatory
parameters in their constructors rather than expose them as
setters -- only optional paratemers should be exposed via setters.
These comments cannot be addressed without deprecation in the already
launched KeyPairGeneratorSpec and KeyStoreParameter. Instead of
deprecating just the getContext methods and Builder constructors, this
CL goes for the nuclear option of deprecating KeyPairGeneratorSpec and
KeyStoreParameter as a whole and exposing all of the AndroidKeyStore
API in the new package android.security.keystore. This enables this CL
to correct all of the accrued design issues with KeyPairGeneratorSpec
(e.g., naming of certificate-related methods) and KeyStoreParameter.
This also makes the transition to API Level M more clear for existing
users of the AndroidKeyStore API. These users will only have to deal
with the new always-mandatory parameters (e.g., purposes) and
sometimes-mandatory (e.g., digests, block modes, paddings) if they
switch to the new API. Prior to this CL they would've had to deal with
this if they invoked any of the new methods of KeyPairGeneratorSpec
or KeyStoreParameter introduced in API Level M.
This CL rips out all the new API introduced into KeyPairGeneratorSpec
and KeyStoreParameter classes for Android M, thus reverting these
classes to the API launched in L MR1. This is because the new API is
now in android.security.keystore.KeyGenParameterSpec and KeyProtection
respectively.
Bug:
21039983
Change-Id: I59672b3c6ef7bc25c40aa85f1c47d9d8a05d627c
Alex Klyubin [Wed, 13 May 2015 19:47:37 +0000 (19:47 +0000)]
Merge "Ensure key algorithm name of HMAC keys is preserved." into mnc-dev
John Spurlock [Wed, 13 May 2015 19:42:04 +0000 (15:42 -0400)]
Zen: Use shorter version of countdown condition summary in footer.
To try and keep to two-lines.
Bug:
21119801
Change-Id: I5a6760381a6b673b8481164f92cf6b7b236af349
Jeff Sharkey [Wed, 13 May 2015 19:39:25 +0000 (19:39 +0000)]
Merge "Rewriting should fail when any paths are null." into mnc-dev
Jeff Sharkey [Wed, 13 May 2015 19:38:16 +0000 (12:38 -0700)]
Rewriting should fail when any paths are null.
Bug:
21017105
Change-Id: I0c5e9c5bdf397d51e2799b06a52bc5bd0bdd09b0
Jeff Sharkey [Wed, 13 May 2015 19:35:27 +0000 (19:35 +0000)]
Merge "Updated storage notification icons." into mnc-dev
Alex Klyubin [Wed, 13 May 2015 19:30:19 +0000 (12:30 -0700)]
Ensure key algorithm name of HMAC keys is preserved.
When Android KeyStore loads an HMAC key, it needs to compose the JCA
key algorithm name (e.g., HmacSHA256) based on the digests the key is
authorized for. A key can be authorized for multiple digests. Thus,
the approach is to use the first one for constructing the JCA key
algorithm name.
This CL ensures that when importing HMAC keys the first KM_TAG_DIGEST
tag is set to the digest of the JCA key algorithm name.
Bug:
18088752
Change-Id: I911ca7427b249ee823d06e988687af6146ebaff8
John Spurlock [Wed, 13 May 2015 19:06:09 +0000 (19:06 +0000)]
Merge "Zen: Serialize notify conditions calls, defer subscription." into mnc-dev
Kenny Root [Wed, 13 May 2015 19:04:08 +0000 (19:04 +0000)]
Merge "Start handshake before calling hostname verifier" into mnc-dev
Hui Shu [Wed, 13 May 2015 19:01:42 +0000 (12:01 -0700)]
Address API council feedback for setOffscreenPreRaster.
BUG:
21043955
Change-Id: I6481f5f84c9e00c16caeb2d9e175aa869600c715
Kenny Root [Tue, 12 May 2015 22:13:50 +0000 (15:13 -0700)]
Start handshake before calling hostname verifier
If the hostname verifier calls SSLSocket#getSession() before the
handshake has been started, it will implicitly start the handshake.
However, it will swallow any errors and return the canonical invalid
SSLSession instead. This makes it extremely difficult to debug issues.
Instead start the handshake before calling into the verifier since we
are guaranteed to be the first caller of #startHandshake() and won't
cause a renegotiation. That will allow us to see the actual
SSLHandshakeException if it occurs.
(cherry picked from commit
317c0a4959df0361431d5fbf7dacc162bfb48cd2 in
external/apache-http)
Bug:
14975169
Bug:
17332309
Bug:
17524215
Bug:
17812533
Bug:
18507278
Bug:
19069992
Bug:
19378885
Bug:
19414083
Bug:
19550311
Bug:
19731556
Bug:
19853723
Bug:
20908941
Bug:
21118659
Change-Id: Ie74ec12c8b131c7bf400a07fc91c78da4d5e470f
Amith Yamasani [Wed, 13 May 2015 18:52:29 +0000 (18:52 +0000)]
Merge "Track app idle history and dump it" into mnc-dev
Amith Yamasani [Fri, 8 May 2015 23:36:21 +0000 (16:36 -0700)]
Track app idle history and dump it
"dumpsys usagestats history" will show the
active state of each app for the last 100 hours,
if the device hasn't rebooted.
Bug:
20066058
Change-Id: I703e5bc121298e4363c202da56fffb0b8534bcaf
John Spurlock [Wed, 13 May 2015 18:48:02 +0000 (14:48 -0400)]
Zen: Serialize notify conditions calls, defer subscription.
- Don't subscribe/unsubscribe to new rules until the config has
been set, avoids race conditions.
- Process all condition updates on the same thread.
- Add the schedule provider's next alarm state to dumpsys.
Bug:
21111868
Change-Id: I389f4a4905a56d6c976f01408f48f87230109aba
Fred Chung [Wed, 13 May 2015 18:45:05 +0000 (18:45 +0000)]
am
ba649917: am
09a8de75: Merge "docs: M Preview Program Overview page" into mnc-preview-docs
* commit '
ba6499175773301b140047c44628c6e9f03f139f':
docs: M Preview Program Overview page
Jeff Sharkey [Wed, 13 May 2015 18:40:30 +0000 (11:40 -0700)]
Updated storage notification icons.
Bug:
19993667
Change-Id: Ibecb634ad7993dc8d1b244654396a6176a0891b9
Jason Monk [Wed, 13 May 2015 18:40:49 +0000 (18:40 +0000)]
Merge "SettingsLib: Track permission's packageName" into mnc-dev
Hiroshi Yamauchi [Wed, 13 May 2015 18:38:10 +0000 (18:38 +0000)]
Merge "Replace JNI primitive array critical calls with non-critical ones." into mnc-dev
Dirk Dougherty [Wed, 13 May 2015 18:37:19 +0000 (18:37 +0000)]
Merge "resolved conflicts for merge of
45fed517 to mnc-dev" into mnc-dev
Dirk Dougherty [Wed, 13 May 2015 18:31:26 +0000 (11:31 -0700)]
resolved conflicts for merge of
45fed517 to mnc-dev
Change-Id: I08e44ee778436e5592e73ced82356f015cbdfe74
Todd Kennedy [Wed, 13 May 2015 18:13:58 +0000 (11:13 -0700)]
Don't negate saving state
In the original implementation, we would only save the state if the
activity was "!isFinishing()". That was abstracted into a method
that returned whether we should save state. However, the "!" wasn't
removed. D'oh.
Bug:
20860094
Change-Id: I8827cb265f2e7fb911f5d110c56e464aa092bfe7
Chad Brubaker [Wed, 13 May 2015 18:09:57 +0000 (18:09 +0000)]
Merge "Add keystore onUserAdded/Removed methods" into mnc-dev
Chris Wren [Wed, 13 May 2015 18:05:54 +0000 (18:05 +0000)]
Merge "induct a bunch of new logging categories." into mnc-dev
Chad Brubaker [Tue, 12 May 2015 20:00:02 +0000 (13:00 -0700)]
Add keystore onUserAdded/Removed methods
(cherry-picked from commit
31c2897105e6d71f8e6edeab312d2147bbdbaeb1)
Change-Id: I73fe9344ec5660e58425d5c85d14381820533d57
Chong Zhang [Wed, 13 May 2015 17:25:29 +0000 (10:25 -0700)]
MediaCodec: rename usePersistentInputSurface to setInputSurface
bug:
21045402
Change-Id: I510a3a694367b8e5a21f4a4fa2a338031fed8991
Alan Viverette [Wed, 13 May 2015 17:53:13 +0000 (17:53 +0000)]
Merge "Strip PNG metadata" into mnc-dev
Jonathan Basseri [Wed, 13 May 2015 17:46:29 +0000 (17:46 +0000)]
Merge "Switching to PersistableBundle in carrier config API." into mnc-dev
Nicolas Prevot [Wed, 13 May 2015 17:46:04 +0000 (17:46 +0000)]
Merge "Fix the doc for ACTION_MANAGED_PROFILE_PROVISIONED." into mnc-dev
Jonathan Basseri [Tue, 12 May 2015 17:06:32 +0000 (10:06 -0700)]
Switching to PersistableBundle in carrier config API.
Part of this API involves persisting config bundles to avoid binding to
apps at critical moments (like boot). Regular bundles should not be
written to disk because they support object types that can lose their
meaning while the data is at rest.
In order to use PersistableBundle, we must either start with one or
filter unwanted types out of Bundle objects. Since the carrier config
API has no use for unsupported types, we chose to use PersistableBundle
everywhere.
Bug:
20268926
Change-Id: I17989ce840014c2a0ed3679c1bca5a8498082c7f
Chris Wren [Wed, 13 May 2015 17:37:42 +0000 (13:37 -0400)]
induct a bunch of new logging categories.
Bug:
20264417
Change-Id: Ica85a31016592be87f727c0d86a4be59eb854158
Mady Mellor [Wed, 13 May 2015 17:34:12 +0000 (17:34 +0000)]
Merge "Fix issue where handle is in front of word rather than end of word" into mnc-dev
Dan Sandler [Wed, 13 May 2015 17:32:16 +0000 (17:32 +0000)]
Merge "Icon API tuneups:" into mnc-dev
Joe LaPenna [Wed, 13 May 2015 17:25:07 +0000 (17:25 +0000)]
am
37d0c94f: (-s ours) am
0cbd0cbd: Merge "Reduce display device log spam." into lmp-mr1-modular-dev
* commit '
37d0c94f7a4a1e2ca31b5cbc269222ded7495ca0':
Reduce display device log spam.
Dan Sandler [Wed, 13 May 2015 14:51:52 +0000 (10:51 -0400)]
Icon API tuneups:
- Reorder parameters to loadDrawableAsync()
- New version of createWithResource that takes a package
name instead of a Resources
- Add loadDrawableAsUser() for INTERACT_ACROSS_USERS clients
like SystemUI
- Docs cleanups
Bug:
21089268
Bug:
21031774
Change-Id: I465d2b865e35e12094b564f994e59d55e522f65a
Wei Liu [Wed, 13 May 2015 16:59:53 +0000 (16:59 +0000)]
Merge "resolved conflicts for merge of
f0c4f0dd to mnc-dev" into mnc-dev
Wei Liu [Wed, 13 May 2015 16:57:33 +0000 (09:57 -0700)]
resolved conflicts for merge of
f0c4f0dd to mnc-dev
Change-Id: I16df088016c010aa25ee73ea8e68b3db8c0449e3
Geoff Mendal [Wed, 13 May 2015 16:55:44 +0000 (16:55 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Jason Monk [Wed, 13 May 2015 16:30:34 +0000 (12:30 -0400)]
SettingsLib: Track permission's packageName
Bug:
20269176
Change-Id: If07051985f3e8b6223cba4289d6cd29d94ebb0cd
John Reck [Wed, 13 May 2015 16:30:03 +0000 (16:30 +0000)]
Merge "Unify DrawProfiler/JankStats" into mnc-dev
Paul McLean [Wed, 13 May 2015 16:18:59 +0000 (16:18 +0000)]
Merge "API Council Change Phase 2 - add/remove callback" into mnc-dev
Geoff Mendal [Wed, 13 May 2015 16:05:02 +0000 (09:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: If88312e77d2b5b89b00097db2923a8953ac460ff
Auto-generated-cl: translation import
Stefan Kuhne [Wed, 13 May 2015 16:04:44 +0000 (16:04 +0000)]
Merge "Ensure activity visiblity when moving task" into mnc-dev
John Spurlock [Wed, 13 May 2015 15:49:31 +0000 (15:49 +0000)]
Merge "Zen: Map external ringer mode = silent to zen = alarms." into mnc-dev
Clara Bayarri [Wed, 13 May 2015 15:46:57 +0000 (15:46 +0000)]
Merge "Fix Floating Toolbar appearing after ActionMode was cancelled" into mnc-dev
Yohei Yukawa [Wed, 13 May 2015 15:25:19 +0000 (15:25 +0000)]
Merge "Show IME switcher also when hardware keyboard is connected." into mnc-dev
John Spurlock [Wed, 13 May 2015 15:19:19 +0000 (11:19 -0400)]
Zen: Map external ringer mode = silent to zen = alarms.
Bug:
21109517
Change-Id: I0e9506dad05ce4edf709ee879367b9f6aeba8dfd
Tobias Sargeant [Wed, 13 May 2015 15:18:47 +0000 (15:18 +0000)]
Merge "Update API." into mnc-dev
Jason Monk [Wed, 13 May 2015 15:15:06 +0000 (15:15 +0000)]
Merge "Fix crash from WPS" into mnc-dev
Tobias Sargeant [Wed, 13 May 2015 15:12:26 +0000 (16:12 +0100)]
Update API.
Bug:
21043955
Change-Id: Ibc012c1e60336f1f070982d27b8c75be8590dc5a
Jason Monk [Wed, 13 May 2015 15:07:53 +0000 (11:07 -0400)]
Fix crash from WPS
Also fix the tests to handle the new threadedness while here.
Bug:
20067687
Change-Id: I116bf14c71886b251c2e8bcaeb2c9b0e5f9ec817