192302 Commits

Author SHA1 Message Date
Jae Seo
ae649b1af8 Merge "TIF: API Review: android.media.tv" into mnc-dev 2015-05-13 21:44:01 +00:00
Alan Viverette
4f4855bca8 Merge "Use drawableStart in dialog list item so we can set padding" into mnc-dev 2015-05-13 21:44:00 +00:00
Lajos Molnar
6b7ef3725e media: rename MediaCodec.setSurface to setOutputSurface
Bug: 21045402
Change-Id: Ie57880af6ce6feea9713360b094f2b198d3c119e
2015-05-13 14:43:33 -07:00
Adam Lesinski
4ee67bc7a7 Merge "AAPT2: Fix issue where @null was wrongly encoded" into mnc-dev 2015-05-13 21:43:00 +00:00
John Reck
25607a6642 Revert "DO NOT MERGE Backport of limited jank-tracking metrics"
This reverts commit 2614bd225f84f7a23e6b30fc6b47bede153e5f4c.

Change-Id: I344b4cbaa0bb0caf50bceb806d1446ee27ea52d8
2015-05-13 21:42:28 +00:00
Jorim Jaggi
ae8fcaf4c3 Merge "Use platform delay for assist long press gesture" into mnc-dev 2015-05-13 21:42:16 +00:00
John Reck
69355eaa1c Merge "DO NOT MERGE Backport of limited jank-tracking metrics" into lmp-mr1-dev 2015-05-13 21:42:13 +00:00
Adam Lesinski
45fefaef00 Merge "AAPT2: Debug: Dump only targetted style" into mnc-dev 2015-05-13 21:41:47 +00:00
Adam Lesinski
68727a0b20 Merge "AAPT2: inferred style parent processing" into mnc-dev 2015-05-13 21:40:24 +00:00
Adam Lesinski
79e04686f6 Merge "AAPT2: Support static lib referencing static lib" into mnc-dev 2015-05-13 21:38:02 +00:00
Alex Klyubin
87cca291bd Merge "New AndroidKeyStore API in android.security.keystore." into mnc-dev 2015-05-13 21:36:17 +00:00
Nick Kralevich
fcf10f7c12 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
2015-05-13 14:28:13 -07:00
Jorim Jaggi
827e0facfe 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
2015-05-13 14:23:05 -07:00
Jorim Jaggi
3b028d754f Use platform delay for assist long press gesture
Bug: 20853645
Change-Id: I1f25a04bfc7d07077211743b9d258fd637a402e6
2015-05-13 14:17:16 -07:00
Selim Gurun
0a814b61e3 Address API feedback for PostMessage
Bug: 21043955

Add anchor tags, and hide the constructor for WebMessagePort.

Change-Id: Ibd2e15581c06be9015a3cd7c7741edf6657d4552
2015-05-13 14:14:14 -07:00
Kenny Guy
467eb0566f Merge "Allowing profile to set a subset of keyguard restrictions." into mnc-dev 2015-05-13 21:07:17 +00:00
Jason Monk
d7fd045014 Merge "Add default icon for permissions" into mnc-dev 2015-05-13 21:06:30 +00:00
Jeff Sharkey
c968e21937 Merge "Determine if we have adoptable disks." into mnc-dev 2015-05-13 20:57:03 +00:00
Jeff Sharkey
0d838a0fad Determine if we have adoptable disks.
Bug: 19993667
Change-Id: I9b21b05736c22d34ca22f5ad6e1a6ebec440cfb6
2015-05-13 13:54:35 -07:00
Chris Craik
d6acd422af Merge "Revert "Anti-alias by default"" into mnc-dev 2015-05-13 20:47:47 +00:00
Chris Craik
74a727d061 Merge "Anti-Alias ColorDrawable" into mnc-dev 2015-05-13 20:44:49 +00:00
Chris Craik
caa6226b17 Revert "Anti-alias by default"
bug:20948129

Keep HIDDEN_DEFAULT_PAINT_FLAGS name.

This reverts commit 1b60cc0529161b5eca6407b551d67d355994c567.

Change-Id: I97cd9c556375c74c52b006bda4fc7b3a2cfa89e1
2015-05-13 13:44:30 -07:00
John Spurlock
bc2c21e292 Merge "Volume: Update divider color to match qs tile divider color." into mnc-dev 2015-05-13 20:39:55 +00:00
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