Commit Graph

195983 Commits

Author SHA1 Message Date
f1900b500f Merge "[LockSettings] clear secure user id when user is removed" into mnc-dev 2015-06-25 15:43:13 +00:00
c781405f43 Merge "Use standard copyright banner in android/security/keymaster." into mnc-dev 2015-06-25 15:07:28 +00:00
6223b7e911 Merge "Track rename of INT and LONG Keymaster tag types." into mnc-dev 2015-06-25 15:06:49 +00:00
107cb81f90 Merge "Make BluetoothEventManager listen to ALIAS_CHANGED" into mnc-dev 2015-06-25 14:05:22 +00:00
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 cbb1e676b5)

bug: 22060509

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

Change-Id: I417e2170b8a977b274ca0f6b2364c670bbb5264a
2015-06-24 19:12:52 -07:00
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
656fd49386 Merge "Make NONEwithECDSA truncate input when necessary." into mnc-dev 2015-06-25 01:31:21 +00:00
8f7ae66e47 Merge "Frameworks/base: Add tracing system properties" into mnc-dev 2015-06-25 01:29:38 +00:00
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
ecff75a158 Merge "Revert "Throw IAE on invalid measure spec size"" into mnc-dev 2015-06-25 01:18:00 +00:00
afaed06cda Revert "Throw IAE on invalid measure spec size"
This reverts commit ac6cfb32fe.

Change-Id: Ie60b48eac5f732071a5039b9b6bc7b18eb694d5b
2015-06-25 01:14:26 +00:00
3704da0d9e Merge "No need to check WRITE_SETTINGS permission in ContentProvider" into mnc-dev 2015-06-25 00:24:19 +00:00
10bf27e2c9 Merge "Avoid negative childSpecSize in RelativeLayout" into mnc-dev 2015-06-25 00:09:06 +00:00
91feb107f2 Merge "Fix ChooserActivity check for still-alive ChooserTargets" into mnc-dev 2015-06-25 00:08:54 +00:00
39310d3606 Avoid negative childSpecSize in RelativeLayout
Bug: 22071351
Change-Id: I951fd7c7973c49581d3ea30bae64d6c20bc362be
2015-06-24 17:03:48 -07:00
93666e8691 Merge "Resize the VectorDrawable according to the virtual Dpi" into mnc-dev 2015-06-24 23:32:18 +00:00
6acb521f7c Merge "Update local state when creating LayerDrawable from constant state" into mnc-dev 2015-06-24 23:15:16 +00:00
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
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
8effa36ca6 Use standard copyright banner in android/security/keymaster.
Bug: 18088752
Change-Id: I22eec18130cc46222d50481164069e7714154979
2015-06-24 16:06:55 -07:00
948c6ecc5a Merge "add cpuset support" into mnc-dev 2015-06-24 22:59:53 +00:00
3e7a9e4ec6 Track rename of INT and LONG Keymaster tag types.
Bug: 22008538
Change-Id: Id0091e59738c828a96305edbfc4f3958e712278b
2015-06-24 15:46:45 -07:00
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
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
1cc869561e Merge "Fixed an inconsistency when booting up with SIMPIn" into mnc-dev 2015-06-24 22:20:00 +00:00
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
749d66b82f Merge "remove setLatestEventInfo" into mnc-dev 2015-06-24 22:17:45 +00:00
95080637db Resize the VectorDrawable according to the virtual Dpi
b/21928507

Change-Id: I9e596192a0fdf13fc91481f990a345c3b267f225
2015-06-24 15:09:09 -07:00
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
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
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
b21a77fefc Merge "Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityManager#getPackageImportance()" into mnc-dev 2015-06-24 21:32:38 +00:00
3eefa1f9de Merge "docs: Update Android support page" into mnc-preview-docs 2015-06-24 21:30:04 +00:00
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
c5ab38f4af docs: Update Android support page
- remove Helpouts
- remove Merchant issue reporting link
- remove other dead links
- clean up page code

b\18579472
b\19355066

Change-Id: If55aa57b11604bdd328c55e26ad5bd4ba0b32de7
2015-06-24 14:26:37 -07:00
6301d80224 Merge "Catching launch errors when trying to go Home while Home is updating." into mnc-dev 2015-06-24 21:21:24 +00:00
420cf23676 Merge "Make measureText(String, int, int) not use context" into mnc-dev 2015-06-24 21:12:35 +00:00
b8f03072d4 Catching launch errors when trying to go Home while Home is updating.
Bug: 21442898

Change-Id: I7fc74422b220cb02acb195b5c9121ff72bc16dbe
2015-06-24 14:11:45 -07:00
92537303a2 Update the internal test case to show the strokeWidth can scale now
Change-Id: I16b0a232eb4108aedc9289e51a52ec9472b9dfd0
2015-06-24 14:06:53 -07:00
1149cdc84b Make measureText(String, int, int) not use context
The measureText method when applied to a string should just measure
the substring, rather than treat the entire string as context. It was
less likely to cause problems than the similar issues with char
arrays, but still wrong. This patch makes the behavior consistent.

Bug: 20087437
Change-Id: I1c6e07a694b151f4fb097edae8e271805e996d06
2015-06-24 14:05:52 -07:00
c412be6824 Fix ChooserActivity check for still-alive ChooserTargets
Only prune ChooserTargets if the resolved activity source they came
from is still present after refreshing the list. Compare this directly
against the ComponentName rather than ResolveInfo.equals, as the
latter isn't implemented.

Bug 21953672

Change-Id: I6486bda85c19d7371167affe2a2b80a2668bd734
2015-06-24 13:54:10 -07:00
c30454c104 Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityManager#getPackageImportance()
Bug:22055550
Change-Id: I1e732e95698daf44bcb223cafde3d3c22746d232
2015-06-24 13:35:46 -07:00
1af5fe2308 Merge "Require that verified intent filters only have http/https <data> decls" into mnc-dev 2015-06-24 20:35:18 +00:00
94f5fe8612 am f5222156: am 00ebd145: docs: Added "Single Use Devices" video to Android for Work main page
* commit 'f522215653bef1dc6bc5a140d6e1cb0cd2db7824':
  docs: Added "Single Use Devices" video to Android for Work main page
2015-06-24 20:27:51 +00:00
413020a6ca Require that verified intent filters only have http/https <data> decls
It is malformed to write a single intent filter like this:

  <intent-filter android:autoVerify="true">
    <data android:host="foo.example"
          android:path="/"
          android:scheme="http" />
    <data android:host="*"
          android:path="/custom"
          android:scheme="fooexamplecustomscheme" />
  </intent-filter>

In practice this app is accidentally defining a filter that will match
"http://*".  This is now detected, and will never be auto-verified for
any of the mentioned domains.

Verified intent filters must *only* handle the http & https schemes.

Bug 21920537

Change-Id: I933cddbea23185d242565cac940e1e7a7e4e289b
2015-06-24 13:16:20 -07:00
f522215653 am 00ebd145: docs: Added "Single Use Devices" video to Android for Work main page
* commit '00ebd145d1572e0d12403ed0194d540926996f0e':
  docs: Added "Single Use Devices" video to Android for Work main page
2015-06-24 20:15:17 +00:00
d4e9e0e1d6 Merge "Keymaster INT, LONG and DATE tag values are unsigned." into mnc-dev 2015-06-24 20:03:10 +00:00