195998 Commits

Author SHA1 Message Date
Alex Klyubin
903d0fb988 Don't offer crypto ops for public keys of trusted cert entries.
Android Keystore cannot offer crypto operations for public keys of
trusted certificate entries (entries without a private key). Prior to
this CL it accidentally tried to do so, causing crypto operations on
these keys to fail.

The fix is for Android Keystore to offer crypto operations only for
public keys for which there is a corresponding private key in the
keystore. Crypto operations on public keys from trusted certificate
entries will be handled by other installed crypto providers. Those
providers don't need a private key to carry out these operations on
public keys.

Bug: 22091725
Bug: 21835320
Change-Id: Ib7d92b067711e4c57128d0db72c08bf288a45ce1
2015-06-25 18:44:43 -07:00
Yusuke Sato
0f61c7dcc4 Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files" into mnc-dev 2015-06-25 17:34:01 +00:00
Nancy Chen
1979dd631d Merge "Add comments for visual voicemail short codes in whitelist." into mnc-dev 2015-06-25 17:32:25 +00:00
Winson Chung
b49dbeef52 Merge "Refactoring recents search bar widget logic." into mnc-dev 2015-06-25 17:24:55 +00:00
Alan Viverette
efb49bd811 Merge "Constrain width and height to >= 0 in FastScroller layout" into mnc-dev 2015-06-25 17:08:42 +00:00
Alan Viverette
de14ad55f6 Constrain width and height to >= 0 in FastScroller layout
Bug: 22071990
Change-Id: I9dcb2066ee069a3764b7d711cb341a4dfdc4445e
2015-06-25 09:57:30 -07:00
Alex Klyubin
9440a6e6be Merge "Support RSA encrypt using private key and PKCS#1 paddding." into mnc-dev 2015-06-25 16:46:17 +00:00
Alex Klyubin
25d2270704 Support RSA encrypt using private key and PKCS#1 paddding.
Some apps such as OpenVPN Connect for some reason generate
PKCS#1-padded RSA signatures using Cipher (initialized in
Cipher.ENCRYPT_MODE with private key!) instead of using Signature.

Unfortunately, RI supports this strange behavior and previous releases
of Android Keystore did the same. So, we have to continue supporting
this craziness.

Bug: 22083023
Change-Id: Ife3950d0d4ceb4e44e08014635312c1252878b69
2015-06-25 09:09:04 -07:00
Mady Mellor
d4d802be39 Merge "Fix: Don't display the drag handles when focus is lost" into mnc-dev 2015-06-25 15:54:03 +00:00
Andrei Stingaceanu
3d7109a1f6 Merge "EditText - can not drag handles in extracted mode" into mnc-dev 2015-06-25 15:52:51 +00:00
Andres Morales
f1900b500f Merge "[LockSettings] clear secure user id when user is removed" into mnc-dev 2015-06-25 15:43:13 +00:00
Mady Mellor
a2861454aa Fix: Don't display the drag handles when focus is lost
The text selection handles should be hidden / shown when the window
loses / regains focus.

Additionally renames method to make more sense.

Bug: 22062480
Change-Id: I6e160234cf112ee285367637e2f1c14defd82e89
2015-06-25 08:40:27 -07:00
Alex Klyubin
c781405f43 Merge "Use standard copyright banner in android/security/keymaster." into mnc-dev 2015-06-25 15:07:28 +00:00
Alex Klyubin
6223b7e911 Merge "Track rename of INT and LONG Keymaster tag types." into mnc-dev 2015-06-25 15:06:49 +00:00
Jason Monk
107cb81f90 Merge "Make BluetoothEventManager listen to ALIAS_CHANGED" into mnc-dev 2015-06-25 14:05:22 +00:00
Andrei Stingaceanu
1cb1f1523a EditText - can not drag handles in extracted mode
In TextView's onPreDraw method, startSelectionActionMode()
is called, but the selection has already been started so
in startSelectionActionMode() it shows the
insertionController which hides the selectionController.
Fix this by adding a check to start the action mode only
if it is not already started.

Bug: 22028858
Change-Id: I2999423155b7a63a7d879bc8ea5032e17dff459f
2015-06-25 11:54:43 +01:00
Igor Viarheichyk
729ffa299c ICU format support for pseudolocalizes.
Custom parser can handle nested ICU messages even if they
are split into multiple fragments. Code reworked to encapsulate
all pseudolocalization logic in Pseudolocalizer and PseudoMethods
classes. To minimize a changelist size, some static functions
remained. Fake BiDi pseudolocalization method is reimplemented
to handle word boundaries correctly. Unit tests added.

(cherry picked from commit cbb1e676b56677ae3585c067f29646dddffb4857)

bug: 22060509

Change-Id: I11968d81984d99501a4d9334ff2e7453a1eb7a00
2015-06-25 09:49:43 +01:00
Erik Kline
e42441a232 Merge "Don't lose critical success/failure messages" into mnc-dev 2015-06-25 03:46:35 +00:00
Svetoslav
57f2dac721 Merge "iUpdate the sensor group description" into mnc-dev 2015-06-25 02:14:54 +00:00
Svetoslav
c625795539 iUpdate the sensor group description
bug:21784262

Change-Id: I417e2170b8a977b274ca0f6b2364c670bbb5264a
2015-06-24 19:12:52 -07:00
Winson Chung
af3bb69367 Refactoring recents search bar widget logic.
Bug: 19062975

Change-Id: I303710598675aeebca8f34ac57de6249462ec033
2015-06-24 18:44:44 -07:00
Anthony Hugh
2e2d030bfe am a50fa710: (-s ours) am 001df9ca: DO NOT MERGE: Introduce stem keycodes for Wear
* commit 'a50fa71044f759013dc506ae3dc5fce11e67494e':
  DO NOT MERGE: Introduce stem keycodes for Wear
2015-06-25 01:37:28 +00:00
Alex Klyubin
656fd49386 Merge "Make NONEwithECDSA truncate input when necessary." into mnc-dev 2015-06-25 01:31:21 +00:00
Andreas Gampe
8f7ae66e47 Merge "Frameworks/base: Add tracing system properties" into mnc-dev 2015-06-25 01:29:38 +00:00
Anthony Hugh
a50fa71044 am 001df9ca: DO NOT MERGE: Introduce stem keycodes for Wear
* commit '001df9ca900f3098222a4920a0048d2eb947bd4e':
  DO NOT MERGE: Introduce stem keycodes for Wear
2015-06-25 01:27:41 +00:00
Dave Langemak
ecff75a158 Merge "Revert "Throw IAE on invalid measure spec size"" into mnc-dev 2015-06-25 01:18:00 +00:00
Dave Langemak
afaed06cda Revert "Throw IAE on invalid measure spec size"
This reverts commit ac6cfb32fec5e4b9ce47c4cde4bbcc7b43a0c4a7.

Change-Id: Ie60b48eac5f732071a5039b9b6bc7b18eb694d5b
2015-06-25 01:14:26 +00:00
Amith Yamasani
3704da0d9e Merge "No need to check WRITE_SETTINGS permission in ContentProvider" into mnc-dev 2015-06-25 00:24:19 +00:00
Alan Viverette
10bf27e2c9 Merge "Avoid negative childSpecSize in RelativeLayout" into mnc-dev 2015-06-25 00:09:06 +00:00
Adam Powell
91feb107f2 Merge "Fix ChooserActivity check for still-alive ChooserTargets" into mnc-dev 2015-06-25 00:08:54 +00:00
Alan Viverette
39310d3606 Avoid negative childSpecSize in RelativeLayout
Bug: 22071351
Change-Id: I951fd7c7973c49581d3ea30bae64d6c20bc362be
2015-06-24 17:03:48 -07:00
ztenghui
93666e8691 Merge "Resize the VectorDrawable according to the virtual Dpi" into mnc-dev 2015-06-24 23:32:18 +00:00
Alan Viverette
6acb521f7c Merge "Update local state when creating LayerDrawable from constant state" into mnc-dev 2015-06-24 23:15:16 +00:00
Anthony Hugh
001df9ca90 DO NOT MERGE: Introduce stem keycodes for Wear
Cherry-pick from master

This change adds four new stem keycodes for Android Wear. These
keycodes are intended to represent the various hardware buttons
around the watch.  There is one primary stem key that will be used
for power/settings and three generic stem keys that will be
customizable.

BUG: 21903503
Change-Id: I867cf79554c72d42c8acbb3ff8b1678e482d4fe2
2015-06-24 16:13:19 -07:00
Junda Liu
e5c7ca7d79 Rename and add carrier config keys for volte and ims.
Bug: b/21878236
Change-Id: I2bc36664969fce9e773ce8a53d56b92936d96971
2015-06-24 16:07:56 -07:00
Alex Klyubin
8effa36ca6 Use standard copyright banner in android/security/keymaster.
Bug: 18088752
Change-Id: I22eec18130cc46222d50481164069e7714154979
2015-06-24 16:06:55 -07:00
Tim Murray
948c6ecc5a Merge "add cpuset support" into mnc-dev 2015-06-24 22:59:53 +00:00
Alex Klyubin
3e7a9e4ec6 Track rename of INT and LONG Keymaster tag types.
Bug: 22008538
Change-Id: Id0091e59738c828a96305edbfc4f3958e712278b
2015-06-24 15:46:45 -07:00
Amith Yamasani
9a660991ed No need to check WRITE_SETTINGS permission in ContentProvider
Permission checks are enforced within the SettingsProvider specifically
for SECURE/SYSTEM/GLOBAL. Now WRITE_SETTINGS is runtime, so it shouldn't
apply to all the settings types.

Bug: 22044704
Change-Id: I9ed25d96b2fa4f46d3d049efa4300cd1d37bbd24
2015-06-24 15:46:09 -07:00
Alex Klyubin
d23dc502b0 Make NONEwithECDSA truncate input when necessary.
Keymaster's implementation of ECDSA with digest NONE rejects input
longer than group size in bytes. RI's NONEwithECDSA accepts inputs
of arbitrary length by truncating them to the above size. This CL
makes Android Keystore's NONEwithECDSA do the truncation to keep
the JCA and Keymaster happy.

The change is inside AndroidKeyStoreECDSASignatureSpi$NONE. All other
small modifications are for supporting that change by making it
possible for AndroidKeyStoreSignatureSpiBase to pass in the signature
being verified into KeyStoreCryptoOperationStreamer. This in turn is
needed to make it possible for NONEwithECDSA implementation to provide
a wrapper streamer which truncates input.

Bug: 22030217
Change-Id: I26064f6df37ef8c631d70a36a356aa0b76a9ad29
2015-06-24 15:42:09 -07:00
Selim Cinek
1cc869561e Merge "Fixed an inconsistency when booting up with SIMPIn" into mnc-dev 2015-06-24 22:20:00 +00:00
Selim Cinek
3b9fbd2f2d Merge "Fixed a bug with encryption where the keyguard was never shown with PIN" into mnc-dev 2015-06-24 22:19:38 +00:00
Chris Wren
749d66b82f Merge "remove setLatestEventInfo" into mnc-dev 2015-06-24 22:17:45 +00:00
ztenghui
95080637db Resize the VectorDrawable according to the virtual Dpi
b/21928507

Change-Id: I9e596192a0fdf13fc91481f990a345c3b267f225
2015-06-24 15:09:09 -07:00
Joe Fernandez
cede20a7c2 am 1ee8470c: am 3eefa1f9: Merge "docs: Update Android support page" into mnc-preview-docs
* commit '1ee8470ca399362424544e763dcb67e515590b10':
  docs: Update Android support page
2015-06-24 21:52:49 +00:00
Alan Viverette
06ff2af68a Update local state when creating LayerDrawable from constant state
Also clears DrawableContainer's futures list when it's no longer needed,
correctly sets deep copy of state set in StateListDrawable, makes some
private methods into package-protected to avoid thunk, and propagates
state to StateListDrawable's super class so that getState() has correct
information.

Bug: 21840003
Change-Id: I0d4232807f280d663c03b4a80e4aab8626806440
2015-06-24 14:42:44 -07:00
Joe Fernandez
1ee8470ca3 am 3eefa1f9: Merge "docs: Update Android support page" into mnc-preview-docs
* commit '3eefa1f9de9e6466251373074f3c720936b62a8c':
  docs: Update Android support page
2015-06-24 21:38:28 +00:00
Adam Lesinski
b21a77fefc Merge "Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityManager#getPackageImportance()" into mnc-dev 2015-06-24 21:32:38 +00:00
Joe Fernandez
3eefa1f9de Merge "docs: Update Android support page" into mnc-preview-docs 2015-06-24 21:30:04 +00:00
ztenghui
9336eb5d1c Merge "Update the internal test case to show the strokeWidth can scale now" into mnc-dev 2015-06-24 21:27:15 +00:00