192226 Commits

Author SHA1 Message Date
John Spurlock
f748c4d6c2 Volume: Update divider color to match qs tile divider color.
Bug: 21120949
Change-Id: I35ad4f1badbb109e49d5d5b452e3e11b641d7e14
2015-05-13 16:35:25 -04:00
John Spurlock
765e1592b1 Merge "Volume: Use inactive slider tints when disabled." into mnc-dev 2015-05-13 20:35:10 +00:00
Xiaohui Chen
ac531941fb wallpaper: avoid exception when user is not initialized
Bug: 21087887
Change-Id: I56b9bf08c6e7100589f0df116e9d20f2f77d50e8
2015-05-13 13:34:40 -07:00
John Spurlock
ecc80587a6 Volume: Use inactive slider tints when disabled.
Bug: 21119650
Change-Id: I14e10c83e9d73096775f92d5290306b76eba6af4
2015-05-13 16:33:05 -04:00
Jorim Jaggi
131a19ee6f Merge "Persist fingerprint names" into mnc-dev 2015-05-13 20:32:31 +00:00
Todd Kennedy
d90bf46264 Merge "Don't negate saving state" into mnc-dev 2015-05-13 20:27:17 +00:00
Jorim Jaggi
ee77cebc1a Persist fingerprint names
Bug: 20469328
Change-Id: I8f4a988687bfb78c36cc7cf187103a9d93ed4535
2015-05-13 13:25:26 -07:00
Jason Sams
6faa4d20c5 Fix issues found during CTS testing of FP16
bug 20822382

This corrects a copy&paste error placing F16 into F32.
Fixes an error disallowing vectors of fp16 types.

Change-Id: I34be1aa9a323d61a7121581ab9599d2c2d32dd42
2015-05-13 13:21:30 -07:00
Chris Craik
b846b58f7a Anti-Alias ColorDrawable
Change-Id: I4d0ee2a496de908b99b0f1d8bef1b6f861c94c6f
2015-05-13 13:16:56 -07:00
Julia Reynolds
396d944001 Merge "Remove initiator name param." into mnc-dev 2015-05-13 20:14:44 +00:00
Kenny Root
f5d758c006 Merge "Start handshake before calling hostname verifier, part 2" into mnc-dev 2015-05-13 20:14:26 +00:00
John Spurlock
fb13d497ae Merge "Zen: Use shorter version of countdown condition summary in footer." into mnc-dev 2015-05-13 20:10:49 +00:00
Jeff Sharkey
2817f22d15 Merge "Hide API not ready for prime time." into mnc-dev 2015-05-13 20:08:13 +00:00
Jason Monk
0e6cac2658 Add default icon for permissions
Bug: 21119477
Change-Id: Ie982a1b42d2195ab79c33cf87756efb3bd9eab29
2015-05-13 16:07:57 -04:00
Jeff Sharkey
f85ac77f0c Hide API not ready for prime time.
Bug: 20642684
Change-Id: I133f023ba7d1d9572175a8f6a3e3c8314c5a897d
2015-05-13 13:07:29 -07:00
Kenny Root
725a4a71b8 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
2015-05-13 13:04:44 -07:00
Chong Zhang
80283cd747 Merge "MediaCodec: rename usePersistentInputSurface to setInputSurface" into mnc-dev 2015-05-13 19:57:12 +00:00
Alex Klyubin
3f8d4d8408 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
2015-05-13 12:49:58 -07:00
Alex Klyubin
b33455511b Merge "Ensure key algorithm name of HMAC keys is preserved." into mnc-dev 2015-05-13 19:47:38 +00:00
John Spurlock
bbde26774f Zen: Use shorter version of countdown condition summary in footer.
To try and keep to two-lines.

Bug: 21119801
Change-Id: I5a6760381a6b673b8481164f92cf6b7b236af349
2015-05-13 15:45:40 -04:00
Jeff Sharkey
4af455beb7 Merge "Rewriting should fail when any paths are null." into mnc-dev 2015-05-13 19:39:26 +00:00
Jeff Sharkey
41be35dd01 Rewriting should fail when any paths are null.
Bug: 21017105
Change-Id: I0c5e9c5bdf397d51e2799b06a52bc5bd0bdd09b0
2015-05-13 12:38:16 -07:00
Jeff Sharkey
4c27d91708 Merge "Updated storage notification icons." into mnc-dev 2015-05-13 19:35:28 +00:00
Alex Klyubin
cbdd377db8 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
2015-05-13 12:35:15 -07:00
John Spurlock
2047ce8240 Merge "Zen: Serialize notify conditions calls, defer subscription." into mnc-dev 2015-05-13 19:06:10 +00:00
Kenny Root
84260768c4 Merge "Start handshake before calling hostname verifier" into mnc-dev 2015-05-13 19:04:09 +00:00
Hui Shu
d377c0f6ca Address API council feedback for setOffscreenPreRaster.
BUG: 21043955
Change-Id: I6481f5f84c9e00c16caeb2d9e175aa869600c715
2015-05-13 12:01:42 -07:00
Kenny Root
423a47bb02 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
2015-05-13 11:58:31 -07:00
Amith Yamasani
59a5733adf Merge "Track app idle history and dump it" into mnc-dev 2015-05-13 18:52:30 +00:00
Amith Yamasani
0a11e69428 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
2015-05-13 11:49:35 -07:00
John Spurlock
a7d92b19c0 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
2015-05-13 14:48:02 -04:00
Fred Chung
fc9b0604fa am ba649917: am 09a8de75: Merge "docs: M Preview Program Overview page" into mnc-preview-docs
* commit 'ba6499175773301b140047c44628c6e9f03f139f':
  docs: M Preview Program Overview page
2015-05-13 18:45:05 +00:00
Jeff Sharkey
a49d5fc767 Updated storage notification icons.
Bug: 19993667
Change-Id: Ibecb634ad7993dc8d1b244654396a6176a0891b9
2015-05-13 11:41:56 -07:00
Jason Monk
401c40a822 Merge "SettingsLib: Track permission's packageName" into mnc-dev 2015-05-13 18:40:55 +00:00
Hiroshi Yamauchi
c126b8e81f Merge "Replace JNI primitive array critical calls with non-critical ones." into mnc-dev 2015-05-13 18:38:11 +00:00
Dirk Dougherty
1b8b3a0000 Merge "resolved conflicts for merge of 45fed517 to mnc-dev" into mnc-dev 2015-05-13 18:37:20 +00:00
Dirk Dougherty
40e6ac9166 resolved conflicts for merge of 45fed517 to mnc-dev
Change-Id: I08e44ee778436e5592e73ced82356f015cbdfe74
2015-05-13 11:33:26 -07:00
Todd Kennedy
46d168fb6b 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
2015-05-13 11:13:58 -07:00
Chad Brubaker
90c66e3ded Merge "Add keystore onUserAdded/Removed methods" into mnc-dev 2015-05-13 18:10:05 +00:00
Chris Wren
5e4027fe25 Merge "induct a bunch of new logging categories." into mnc-dev 2015-05-13 18:05:56 +00:00
Chad Brubaker
83ce095c84 Add keystore onUserAdded/Removed methods
(cherry-picked from commit 31c2897105e6d71f8e6edeab312d2147bbdbaeb1)

Change-Id: I73fe9344ec5660e58425d5c85d14381820533d57
2015-05-13 10:57:42 -07:00
Chong Zhang
9560ddb48a MediaCodec: rename usePersistentInputSurface to setInputSurface
bug: 21045402
Change-Id: I510a3a694367b8e5a21f4a4fa2a338031fed8991
2015-05-13 10:53:47 -07:00
Alan Viverette
876677ef2d Merge "Strip PNG metadata" into mnc-dev 2015-05-13 17:53:15 +00:00
Jonathan Basseri
c69cd0bf75 Merge "Switching to PersistableBundle in carrier config API." into mnc-dev 2015-05-13 17:46:32 +00:00
Nicolas Prevot
22fec2201f Merge "Fix the doc for ACTION_MANAGED_PROFILE_PROVISIONED." into mnc-dev 2015-05-13 17:46:05 +00:00
Jonathan Basseri
4f9ad1678e 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
2015-05-13 10:45:29 -07:00
Chris Wren
28890446fd induct a bunch of new logging categories.
Bug: 20264417
Change-Id: Ica85a31016592be87f727c0d86a4be59eb854158
2015-05-13 13:37:42 -04:00
Mady Mellor
21623faa44 Merge "Fix issue where handle is in front of word rather than end of word" into mnc-dev 2015-05-13 17:34:13 +00:00
Dan Sandler
b27333bcca Merge "Icon API tuneups:" into mnc-dev 2015-05-13 17:32:17 +00:00
Joe LaPenna
4201be08a1 am 37d0c94f: (-s ours) am 0cbd0cbd: Merge "Reduce display device log spam." into lmp-mr1-modular-dev
* commit '37d0c94f7a4a1e2ca31b5cbc269222ded7495ca0':
  Reduce display device log spam.
2015-05-13 17:25:07 +00:00