git.osdn.net Git - android-x86/frameworks-base.git/log

(root) / android-x86 / frameworks-base.git / log

Todd Kennedy [Wed, 13 May 2015 20:35:51 +0000 (20:35 +0000)]

am d90bf462: Merge "Don\'t negate saving state" into mnc-dev

* commit 'd90bf46264615159e1e16ee69e78a8651e126d6e':
Don't negate saving state

commit | commitdiff | tree

Todd Kennedy [Wed, 13 May 2015 20:27:16 +0000 (20:27 +0000)]

Merge "Don't negate saving state" into mnc-dev

commit | commitdiff | tree

Julia Reynolds [Wed, 13 May 2015 20:17:48 +0000 (20:17 +0000)]

am 396d9440: Merge "Remove initiator name param." into mnc-dev

* commit '396d944001f0b897b1689baa0bd7d3e04046b3ca':
Remove initiator name param.

commit | commitdiff | tree

Kenny Root [Wed, 13 May 2015 20:17:45 +0000 (20:17 +0000)]

am f5d758c0: Merge "Start handshake before calling hostname verifier, part 2" into mnc-dev

* commit 'f5d758c006c278d166f22587f3deb9a63bdf4e4b':
Start handshake before calling hostname verifier, part 2

commit | commitdiff | tree

John Spurlock [Wed, 13 May 2015 20:17:41 +0000 (20:17 +0000)]

am fb13d497: Merge "Zen: Use shorter version of countdown condition summary in footer." into mnc-dev

* commit 'fb13d497ae2a68444dad89a4c2e0a6fa19ad4bf2':
Zen: Use shorter version of countdown condition summary in footer.

commit | commitdiff | tree

Jeff Sharkey [Wed, 13 May 2015 20:17:37 +0000 (20:17 +0000)]

am 2817f22d: Merge "Hide API not ready for prime time." into mnc-dev

* commit '2817f22d157fd02fe6df14b76b59bac1276b5b86':
Hide API not ready for prime time.

commit | commitdiff | tree

Julia Reynolds [Wed, 13 May 2015 20:14:41 +0000 (20:14 +0000)]

Merge "Remove initiator name param." into mnc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Wed, 13 May 2015 20:08:12 +0000 (20:08 +0000)]

Merge "Hide API not ready for prime time." into mnc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Chong Zhang [Wed, 13 May 2015 20:04:56 +0000 (20:04 +0000)]

am 80283cd7: Merge "MediaCodec: rename usePersistentInputSurface to setInputSurface" into mnc-dev

* commit '80283cd747d247780a5336bad6b41811175fd282':
MediaCodec: rename usePersistentInputSurface to setInputSurface

commit | commitdiff | tree

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

commit | commitdiff | tree

Alex Klyubin [Wed, 13 May 2015 19:59:56 +0000 (19:59 +0000)]

am b3345551: Merge "Ensure key algorithm name of HMAC keys is preserved." into mnc-dev

* commit 'b33455511b7b704e848c79c9e76e28abe2509178':
Ensure key algorithm name of HMAC keys is preserved.

commit | commitdiff | tree

Chong Zhang [Wed, 13 May 2015 19:56:06 +0000 (19:56 +0000)]

Merge "MediaCodec: rename usePersistentInputSurface to setInputSurface" into mnc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Wed, 13 May 2015 19:46:50 +0000 (19:46 +0000)]

am 4af455be: Merge "Rewriting should fail when any paths are null." into mnc-dev

* commit '4af455beb79086a960f7205d7b730aa6da015993':
Rewriting should fail when any paths are null.

commit | commitdiff | tree

Jeff Sharkey [Wed, 13 May 2015 19:46:45 +0000 (19:46 +0000)]

am 4c27d917: Merge "Updated storage notification icons." into mnc-dev

* commit '4c27d9170842813d12fd30850d0b5b7e170aad4a':
Updated storage notification icons.

commit | commitdiff | tree

John Spurlock [Wed, 13 May 2015 19:46:41 +0000 (19:46 +0000)]

am 2047ce82: Merge "Zen: Serialize notify conditions calls, defer subscription." into mnc-dev

* commit '2047ce824030a2ea6227a7544789281530b7892d':
Zen: Serialize notify conditions calls, defer subscription.

commit | commitdiff | tree

Kenny Root [Wed, 13 May 2015 19:46:36 +0000 (19:46 +0000)]

am 84260768: Merge "Start handshake before calling hostname verifier" into mnc-dev

* commit '84260768c44860fbe11c014c47c8f7340a394512':
Start handshake before calling hostname verifier

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Wed, 13 May 2015 19:35:27 +0000 (19:35 +0000)]

Merge "Updated storage notification icons." into mnc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

John Spurlock [Wed, 13 May 2015 19:06:09 +0000 (19:06 +0000)]

Merge "Zen: Serialize notify conditions calls, defer subscription." into mnc-dev

commit | commitdiff | tree

Kenny Root [Wed, 13 May 2015 19:04:08 +0000 (19:04 +0000)]

Merge "Start handshake before calling hostname verifier" into mnc-dev

commit | commitdiff | tree

Amith Yamasani [Wed, 13 May 2015 19:00:33 +0000 (19:00 +0000)]

am 59a5733a: Merge "Track app idle history and dump it" into mnc-dev

* commit '59a5733adfc8fc4d906407f7edee1b9c61e73437':
Track app idle history and dump it

commit | commitdiff | tree

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

commit | commitdiff | tree

Fred Chung [Wed, 13 May 2015 18:54:52 +0000 (18:54 +0000)]

am fc9b0604: am ba649917: am 09a8de75: Merge "docs: M Preview Program Overview page" into mnc-preview-docs

* commit 'fc9b0604fa862c1fc12a129892b629e0955e3721':
docs: M Preview Program Overview page

commit | commitdiff | tree

Amith Yamasani [Wed, 13 May 2015 18:52:29 +0000 (18:52 +0000)]

Merge "Track app idle history and dump it" into mnc-dev

commit | commitdiff | tree

Jason Monk [Wed, 13 May 2015 18:50:16 +0000 (18:50 +0000)]

am 401c40a8: Merge "SettingsLib: Track permission\'s packageName" into mnc-dev

* commit '401c40a8228598e18f6891b34218e99cca79e760':
SettingsLib: Track permission's packageName

commit | commitdiff | tree

Hiroshi Yamauchi [Wed, 13 May 2015 18:50:11 +0000 (18:50 +0000)]

am c126b8e8: Merge "Replace JNI primitive array critical calls with non-critical ones." into mnc-dev

* commit 'c126b8e81f5055dadfa8805d530a262a2cf05ab3':
Replace JNI primitive array critical calls with non-critical ones.

commit | commitdiff | tree

Dirk Dougherty [Wed, 13 May 2015 18:50:01 +0000 (18:50 +0000)]

am 1b8b3a00: Merge "resolved conflicts for merge of 45fed517 to mnc-dev" into mnc-dev

* commit '1b8b3a0000812f9935f33667b055a546228ebfb6':
Doc change: add new engagement and other distribute files.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Wed, 13 May 2015 18:40:30 +0000 (11:40 -0700)]

Updated storage notification icons.

Bug: 19993667
Change-Id: Ibecb634ad7993dc8d1b244654396a6176a0891b9

commit | commitdiff | tree

Jason Monk [Wed, 13 May 2015 18:40:49 +0000 (18:40 +0000)]

Merge "SettingsLib: Track permission's packageName" into mnc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Chad Brubaker [Wed, 13 May 2015 18:15:43 +0000 (18:15 +0000)]

am 90c66e3d: Merge "Add keystore onUserAdded/Removed methods" into mnc-dev

* commit '90c66e3ded4a91613b0c1760ab2ef15e0d118a36':
Add keystore onUserAdded/Removed methods

commit | commitdiff | tree

Chris Wren [Wed, 13 May 2015 18:15:39 +0000 (18:15 +0000)]

am 5e4027fe: Merge "induct a bunch of new logging categories." into mnc-dev

* commit '5e4027fe258f92d2d8b1d181cd959086aa84ac15':
induct a bunch of new logging categories.

commit | commitdiff | tree

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

commit | commitdiff | tree

Chad Brubaker [Wed, 13 May 2015 18:09:57 +0000 (18:09 +0000)]

Merge "Add keystore onUserAdded/Removed methods" into mnc-dev

commit | commitdiff | tree

Chris Wren [Wed, 13 May 2015 18:05:54 +0000 (18:05 +0000)]

Merge "induct a bunch of new logging categories." into mnc-dev

commit | commitdiff | tree

Alan Viverette [Wed, 13 May 2015 17:57:59 +0000 (17:57 +0000)]

am 876677ef: Merge "Strip PNG metadata" into mnc-dev

* commit '876677ef2d04545593fd4cd7bb8539fa15e3dc09':
Strip PNG metadata

commit | commitdiff | tree

Jonathan Basseri [Wed, 13 May 2015 17:57:54 +0000 (17:57 +0000)]

am c69cd0bf: Merge "Switching to PersistableBundle in carrier config API." into mnc-dev

* commit 'c69cd0bf7586c57f9662955d798a2ae0eef6ee76':
Switching to PersistableBundle in carrier config API.

commit | commitdiff | tree

Nicolas Prevot [Wed, 13 May 2015 17:57:50 +0000 (17:57 +0000)]

am 22fec220: Merge "Fix the doc for ACTION_MANAGED_PROFILE_PROVISIONED." into mnc-dev

* commit '22fec2201f01222d61c84f536289fd1e8bb5a03f':
Fix the doc for ACTION_MANAGED_PROFILE_PROVISIONED.

commit | commitdiff | tree

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

commit | commitdiff | tree

Chong Zhang [Wed, 13 May 2015 17:25:29 +0000 (10:25 -0700)]

MediaCodec: rename usePersistentInputSurface to setInputSurface

bug: 21045402
Change-Id: I510a3a694367b8e5a21f4a4fa2a338031fed8991

commit | commitdiff | tree

Alan Viverette [Wed, 13 May 2015 17:53:13 +0000 (17:53 +0000)]

Merge "Strip PNG metadata" into mnc-dev

commit | commitdiff | tree

Jonathan Basseri [Wed, 13 May 2015 17:46:29 +0000 (17:46 +0000)]

Merge "Switching to PersistableBundle in carrier config API." into mnc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Mady Mellor [Wed, 13 May 2015 17:38:56 +0000 (17:38 +0000)]

am 21623faa: Merge "Fix issue where handle is in front of word rather than end of word" into mnc-dev

* commit '21623faa449496d68bd102ddda5874f572b9c55a':
Fix issue where handle is in front of word rather than end of word

commit | commitdiff | tree

Dan Sandler [Wed, 13 May 2015 17:38:47 +0000 (17:38 +0000)]

am b27333bc: Merge "Icon API tuneups:" into mnc-dev

* commit 'b27333bcca733ec0ec828b45d20507cbfa13c6d6':
Icon API tuneups:

commit | commitdiff | tree

Joe LaPenna [Wed, 13 May 2015 17:38:43 +0000 (17:38 +0000)]

am 4201be08: am 37d0c94f: (-s ours) am 0cbd0cbd: Merge "Reduce display device log spam." into lmp-mr1-modular-dev

* commit '4201be08a1cb1358e7ee30f81927b7c11f477ea3':
Reduce display device log spam.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Dan Sandler [Wed, 13 May 2015 17:32:16 +0000 (17:32 +0000)]

Merge "Icon API tuneups:" into mnc-dev

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

Wei Liu [Wed, 13 May 2015 17:07:37 +0000 (17:07 +0000)]

am b9599750: Merge "resolved conflicts for merge of f0c4f0dd to mnc-dev" into mnc-dev

* commit 'b9599750235985e92ed393bbbd0f59e31ec25b01':
Create GpsLocationProvider only if GPS is supported.

commit | commitdiff | tree

Geoff Mendal [Wed, 13 May 2015 17:01:36 +0000 (17:01 +0000)]

am ec6e7a66: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'ec6e7a662db44d32bb3c8676e7c9e87dea86075f':
Import translations. DO NOT MERGE

commit | commitdiff | tree

John Reck [Wed, 13 May 2015 17:01:28 +0000 (17:01 +0000)]

am 75e7d7eb: Merge "Unify DrawProfiler/JankStats" into mnc-dev

* commit '75e7d7eb0e5dd0ffd3ebc234e10d885d1366281a':
Unify DrawProfiler/JankStats

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Geoff Mendal [Wed, 13 May 2015 16:55:44 +0000 (16:55 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dev

commit | commitdiff | tree

Jason Monk [Wed, 13 May 2015 16:30:34 +0000 (12:30 -0400)]

SettingsLib: Track permission's packageName

Bug: 20269176
Change-Id: If07051985f3e8b6223cba4289d6cd29d94ebb0cd

commit | commitdiff | tree

John Reck [Wed, 13 May 2015 16:30:03 +0000 (16:30 +0000)]

Merge "Unify DrawProfiler/JankStats" into mnc-dev

commit | commitdiff | tree

Paul McLean [Wed, 13 May 2015 16:27:56 +0000 (16:27 +0000)]

am 7b0e380b: Merge "API Council Change Phase 2 - add/remove callback" into mnc-dev

* commit '7b0e380bf04c076840ce7215f8dd95dc7e234a45':
API Council Change Phase 2 - add/remove callback

commit | commitdiff | tree

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

commit | commitdiff | tree

Stefan Kuhne [Wed, 13 May 2015 16:15:20 +0000 (16:15 +0000)]

am 4d893744: Merge "Ensure activity visiblity when moving task" into mnc-dev

* commit '4d89374483c61c107a4ad758656cb76e46f7c5c5':
Ensure activity visiblity when moving task

commit | commitdiff | tree

John Spurlock [Wed, 13 May 2015 16:10:31 +0000 (16:10 +0000)]

am e1d0188b: Merge "Zen: Map external ringer mode = silent to zen = alarms." into mnc-dev

* commit 'e1d0188b6954bd42160cbb1e9445e08c7c9c0ae3':
Zen: Map external ringer mode = silent to zen = alarms.

commit | commitdiff | tree

Clara Bayarri [Wed, 13 May 2015 16:10:27 +0000 (16:10 +0000)]

am 99bd704f: Merge "Fix Floating Toolbar appearing after ActionMode was cancelled" into mnc-dev

* commit '99bd704f1c6bb4b818e6521ca41a70a2ec2245f4':
Fix Floating Toolbar appearing after ActionMode was cancelled

commit | commitdiff | tree

Yohei Yukawa [Wed, 13 May 2015 16:10:26 +0000 (16:10 +0000)]

am 05fe90c1: Merge "Show IME switcher also when hardware keyboard is connected." into mnc-dev

* commit '05fe90c10b54111a742187935f2890029b348bf5':
Show IME switcher also when hardware keyboard is connected.

commit | commitdiff | tree

Tobias Sargeant [Wed, 13 May 2015 16:10:25 +0000 (16:10 +0000)]

am a58fbec6: Merge "Update API." into mnc-dev

* commit 'a58fbec633bb6b4fa1afe03fc25d5e81235202e1':
Update API.

commit | commitdiff | tree

Jason Monk [Wed, 13 May 2015 16:10:25 +0000 (16:10 +0000)]

am 1c5a55e9: Merge "Fix crash from WPS" into mnc-dev

* commit '1c5a55e997371e50deb543c0e491bdcc96e71b67':
Fix crash from WPS

commit | commitdiff | tree

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

commit | commitdiff | tree

Stefan Kuhne [Wed, 13 May 2015 16:04:44 +0000 (16:04 +0000)]

Merge "Ensure activity visiblity when moving task" into mnc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Tobias Sargeant [Wed, 13 May 2015 15:18:47 +0000 (15:18 +0000)]

Merge "Update API." into mnc-dev

commit | commitdiff | tree

Jason Monk [Wed, 13 May 2015 15:15:06 +0000 (15:15 +0000)]

Merge "Fix crash from WPS" into mnc-dev

commit | commitdiff | tree

John Spurlock [Wed, 13 May 2015 15:12:43 +0000 (15:12 +0000)]

am 5b32fa78: Merge "NoMan: Specify all users for noman broadcasts." into mnc-dev

* commit '5b32fa78d30f44bcabd1695d2f5d1062ca1118d5':
NoMan: Specify all users for noman broadcasts.

commit | commitdiff | tree

Geoff Mendal [Wed, 13 May 2015 15:12:34 +0000 (15:12 +0000)]

am 6a3418e2: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '6a3418e2e1608a57244a9957b535148783b70a31':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Brian Colonna [Wed, 13 May 2015 15:12:27 +0000 (15:12 +0000)]

am 9a61013d: Merge "Removed unused Face Unlock aidl files" into mnc-dev

* commit '9a61013d2d0e4448b884a0869b80ea20da441691':
Removed unused Face Unlock aidl files

commit | commitdiff | tree

Tobias Sargeant [Wed, 13 May 2015 15:12:26 +0000 (16:12 +0100)]

Update API.

Bug: 21043955
Change-Id: Ibc012c1e60336f1f070982d27b8c75be8590dc5a

commit | commitdiff | tree

Erik Kline [Wed, 13 May 2015 15:12:19 +0000 (15:12 +0000)]

am cf304fb3: Merge "Initial IpReachabilityMonitor implementation." into mnc-dev

* commit 'cf304fb35c2086601178858e307d3dda36dbbff7':
Initial IpReachabilityMonitor implementation.

commit | commitdiff | tree

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

commit | commitdiff | tree

Clara Bayarri [Wed, 13 May 2015 14:12:12 +0000 (15:12 +0100)]

Fix Floating Toolbar appearing after ActionMode was cancelled

The Views created for the Toolbar were not cleaned up properly when the
mode was cancelled by the client in onCreateActionMode, leading to the
toolbar appearing over other views when it shouldn't due to
onWindowFocusChanged showing the Toolbar if it exists.

We don't actually need the views if we don't know whether they are
going to be shown yet, so moved view creation to after onCreateActionMode

Bug: 20713912
Change-Id: Ic0c31d1634e1e96d9981a77b2c769306a8bf1a8d

commit | commitdiff | tree

Paul McLean [Tue, 12 May 2015 22:36:56 +0000 (15:36 -0700)]

API Council Change Phase 2 - add/remove callback

Change-Id: Ic7d374c67ef46a2bc8427fa3555e3ad1a4b0723e

commit | commitdiff | tree

John Spurlock [Wed, 13 May 2015 14:54:00 +0000 (14:54 +0000)]

Merge "NoMan: Specify all users for noman broadcasts." into mnc-dev

commit | commitdiff | tree

John Spurlock [Wed, 13 May 2015 14:47:05 +0000 (10:47 -0400)]

NoMan: Specify all users for noman broadcasts.

Change-Id: I347bc25b09506dd5fd695e68f23e9654bab8103c

commit | commitdiff | tree

Geoff Mendal [Wed, 13 May 2015 14:13:23 +0000 (14:13 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dev