190712 Commits

Author SHA1 Message Date
John Reck
6228ea26ef am 108f0a34: am b2cec86a: Merge "Skip frames with no damage" into mnc-dev
* commit '108f0a341ad2176b25df7757f1dc793289b48cc0':
  Skip frames with no damage
2015-04-29 20:33:48 +00:00
Abodunrinwa Toki
0fd52d6ae8 am ef586c12: (-s ours) am eaa44818: am 05a56db3: Merge "DO NOT MERGE: Minor fixes to FloatingToolbar." into mnc-dev
* commit 'ef586c12d1bd1ac69dc7a9dcbddb1ee9d596d361':
  DO NOT MERGE: Minor fixes to FloatingToolbar.
2015-04-29 20:33:15 +00:00
Ben Kwa
192b3d4f90 Properly unparcel the PFDs passed to
android.content.ContentProviderProxy.openFile.

BUG=20693984

Change-Id: Id089d218057d5439da1bd5bf0ce3991059c1ecad
2015-04-29 13:30:25 -07:00
Alex Klyubin
4812563f68 AndroidKeyStore keys should not be handled by Bouncy Castle.
Bouncy Castle JCA provider incorrectly declares that its Cipher, Mac,
Signature, and KeyAgreement implementations accept arbitrary keys (
including AndroidKeyStore keys). As a result, when a Cipher, Mac,
Signature, or KeyAgreement instance is requested from JCA without
explicitly specifying the provider (which follows best practices)
and then initialied with an AndroidKeyStore key, JCA chooses the
BouncyCastle's implementation, which in turn blows up because it
can't handle such keys.

The workaround is to install Cipher, Mac, Signature, and
KeyAgreement implementations backed by AndroidKeyStore as a
higher-priority JCA provider than the Bouncy Castle one. This is
achieved by splitting out the above implementations from
AndroidKeyStoreProvider into AndroidKeyStoreBCWorkaroundProvider
and installing the AndroidKeyStoreProvider at the usual priority
(below Bouncy Castle) and the AndroidKeyStoreBCWorkaroundProvider
at above Bouncy Castle priority.

Bug: 20691708
Change-Id: I336464f4a49bc30c6845ddc4e84b07f4105424dd
2015-04-29 13:28:56 -07:00
Mike Lockwood
f105f61dd9 Merge "UsbDevice: Add support for retrieving version string for a USB device" into mnc-dev 2015-04-29 20:27:50 +00:00
Junda Liu
bd0ffb8e34 Merge "Moving all Telephony overlays to CarrierConfigManager." into mnc-dev 2015-04-29 20:25:25 +00:00
Jonathan Basseri
9b56ad8f1a Moving all Telephony overlays to CarrierConfigManager.
This adds every variable and its default value from
packages/services/Telephony/res/values/config.xml to the new
CarrierConfigManager API. Variable docstrings are also taken from
config.xml, with minimal edits.

These variables were not included because either they are not carrier
specific, or they are device specific:

OtaPlaySuccessFailureTone
OtaShowActivateFailTimes
OtaShowActivationScreen
OtaShowListeningScreen
carrier_settings
carrier_settings_menu
config_allow_hfa_outside_of_setup_wizard
config_enabled_lte
csp_enabled
dialer_default_class
dtmf_type_enabled
hac_enabled
send_mic_mute_to_AudioManager
ui_default_package

This also adds BOOL_HIDE_CARRIER_NETWORK_SETTINGS which is a replacement
for android.provider.Settings.Global.HIDE_CARRIER_NETWORK_SETTINGS.

Bug: 20270007
Change-Id: I985a55cf88d3bd1863e28af7790b59eef01d6504
2015-04-29 13:23:21 -07:00
Abodunrinwa Toki
ef586c12d1 am eaa44818: am 05a56db3: Merge "DO NOT MERGE: Minor fixes to FloatingToolbar." into mnc-dev
* commit 'eaa44818adbe8c6ee850c530fc70809502340469':
  DO NOT MERGE: Minor fixes to FloatingToolbar.
2015-04-29 20:21:57 +00:00
Chris Craik
4549108c46 am 81bd735a: Merge "Require minimum 4 bit stencil for layers." into mnc-dev
* commit '81bd735a010771ab502dabe7ef4d20ea520cf6ac':
  Require minimum 4 bit stencil for layers.
2015-04-29 20:21:44 +00:00
John Reck
108f0a341a am b2cec86a: Merge "Skip frames with no damage" into mnc-dev
* commit 'b2cec86a44f3fe937079b26827bdc031f5aec731':
  Skip frames with no damage
2015-04-29 20:21:39 +00:00
Chris Craik
81bd735a01 Merge "Require minimum 4 bit stencil for layers." into mnc-dev 2015-04-29 20:17:43 +00:00
John Reck
b2cec86a44 Merge "Skip frames with no damage" into mnc-dev 2015-04-29 20:10:26 +00:00
Abodunrinwa Toki
eaa44818ad am 05a56db3: Merge "DO NOT MERGE: Minor fixes to FloatingToolbar." into mnc-dev
* commit '05a56db39d26e1e6ee160e82b79df39c15d1804c':
  DO NOT MERGE: Minor fixes to FloatingToolbar.
2015-04-29 20:09:20 +00:00
Svet Ganov
8baf2b6663 am 0dbaba6c: am 5e47c802: am 56867804: Merge "Respect the record audio app op - framework" into mnc-dev
* commit '0dbaba6c3a7ae0a45e2305a21b0ef5decbde59a4':
  Respect the record audio app op - framework
2015-04-29 20:09:09 +00:00
Mike Lockwood
c9bb40ea95 UsbDevice: Add support for retrieving version string for a USB device
Change-Id: Ia8630f5ffd05f90347b971110a81f4927060cc4b
2015-04-29 13:05:55 -07:00
Chris Craik
e145013153 Require minimum 4 bit stencil for layers.
bug:19270131
Change-Id: I81367179d268e7c1642259c456c1f3d0018f6c0d
2015-04-29 13:04:02 -07:00
Abodunrinwa Toki
05a56db39d Merge "DO NOT MERGE: Minor fixes to FloatingToolbar." into mnc-dev 2015-04-29 19:57:48 +00:00
Chris Craik
80a2f50315 am e58e0e50: am 737f0b22: am 7201bf2b: Merge "Unify View alpha implies clipping behavior" into mnc-dev
* commit 'e58e0e50efa429b47985acedf3ec7d8d5745ea95':
  Unify View alpha implies clipping behavior
2015-04-29 19:56:07 +00:00
Wale Ogunwale
c14624da8e Some code clean-up.
Change-Id: I626c4c40c32dbf43408e0649364dfe8be2bb2321
2015-04-29 12:55:46 -07:00
Svet Ganov
0dbaba6c3a am 5e47c802: am 56867804: Merge "Respect the record audio app op - framework" into mnc-dev
* commit '5e47c802ef1ac9437b012bc70701ffaf048cb399':
  Respect the record audio app op - framework
2015-04-29 19:55:31 +00:00
Abodunrinwa Toki
09de3928ee Use theme attributes for FloatingToolbar colors.
Bug: 20148220
Change-Id: Idc64313040f873dadf05a8c777343c67538199a6
2015-04-29 20:52:58 +01:00
Svet Ganov
5e47c802ef am 56867804: Merge "Respect the record audio app op - framework" into mnc-dev
* commit '5686780404a41901d226cc7ba506c1c0ba284713':
  Respect the record audio app op - framework
2015-04-29 19:44:33 +00:00
Alex Klyubin
708fc94045 Add KeyPermanentlyInvalidatedException.
This enables users of AndroidKeyStore crypto to differentiate between
the key being unusable until the user is authenticated
(UserNotAuthenticatedException) and the key being permanently unusable
(KeyPermanentlyInvalidatedException). The latter is the case when the
secure lock screen has been disabled or reset, and, for keys that
require user authentication for every use, when a new fingerprint is
enrolled or all fingerprints are unenrolled.

NOTE: The KeyPermanentlyInvalidatedException subsumes/replaces the
NewFingerprintEnrolledException which has thus been removed. There
is no way to find out whether a key was permenently invalidated
specifically because a new fingerprint was added.

Bug: 20642549
Bug: 20526234
Change-Id: I0206cd99eef5c605c9c4d6afc5eea02eb3b1fe6b
2015-04-29 12:44:10 -07:00
Chris Craik
e58e0e50ef am 737f0b22: am 7201bf2b: Merge "Unify View alpha implies clipping behavior" into mnc-dev
* commit '737f0b22bec07297eea782ea2cb29b056e849efc':
  Unify View alpha implies clipping behavior
2015-04-29 19:42:49 +00:00
Dianne Hackborn
0b4daca9ba Implement user-settable power save whitelist.
The whitelist is now maintained by DeviceIdleController,
which is moving out into its own independent system service.
Network stats now queries it for the whitelist, instead of
collecting that itself.

Also did a few improvements in alarm manager -- made the
code for moving alarms out of the pending list more robust,
and fixed the debug output to always print the contents of
the pending list even if we aren't in a pending state.  (That
would have helped me identify the problem much earlier.)

Change-Id: I0f7119d4c553c3af4d77b2f71246fa6e2c13c561
2015-04-29 12:38:09 -07:00
Svet Ganov
5686780404 Merge "Respect the record audio app op - framework" into mnc-dev 2015-04-29 19:34:06 +00:00
Chris Craik
737f0b22be am 7201bf2b: Merge "Unify View alpha implies clipping behavior" into mnc-dev
* commit '7201bf2b7ebac4ed0be6efd6b046f93a8de5b2d0':
  Unify View alpha implies clipping behavior
2015-04-29 19:32:42 +00:00
Chris Craik
7201bf2b7e Merge "Unify View alpha implies clipping behavior" into mnc-dev 2015-04-29 19:23:41 +00:00
John Spurlock
b349af5731 Volume: dismiss volume UI to avoid HUNs.
Also include headsUp in the name of the pinned callback
method.

Internal version of AOSP proposal:
  https://android-review.googlesource.com/147502

Change-Id: I8fe14bd7d65b2d3564cb1e2869d7ffbbac89e80d
2015-04-29 14:59:34 -04:00
destradaa
cbba357159 am 2c160c1a: am bdf9ffdd: am c0667853: Merge "Add SystemApis in GpsMeasurements APIs to reflect changes in GPS HAL. b/19938206" into mnc-dev
* commit '2c160c1a64a696dcb6261311ca0a406a07231d33':
  Add SystemApis in GpsMeasurements APIs to reflect changes in GPS HAL. b/19938206
2015-04-29 18:34:18 +00:00
destradaa
2c160c1a64 am bdf9ffdd: am c0667853: Merge "Add SystemApis in GpsMeasurements APIs to reflect changes in GPS HAL. b/19938206" into mnc-dev
* commit 'bdf9ffdd834f5cd021f79c33ce82a16b461f454f':
  Add SystemApis in GpsMeasurements APIs to reflect changes in GPS HAL. b/19938206
2015-04-29 18:25:52 +00:00
destradaa
bdf9ffdd83 am c0667853: Merge "Add SystemApis in GpsMeasurements APIs to reflect changes in GPS HAL. b/19938206" into mnc-dev
* commit 'c0667853ffad211a5dd40202ff1a4601449b745e':
  Add SystemApis in GpsMeasurements APIs to reflect changes in GPS HAL. b/19938206
2015-04-29 18:14:17 +00:00
destradaa
c0667853ff Merge "Add SystemApis in GpsMeasurements APIs to reflect changes in GPS HAL. b/19938206" into mnc-dev 2015-04-29 18:01:05 +00:00
Abodunrinwa Toki
402bcf77d2 am 8020631f: (-s ours) am 45b04c1a: am 47ea8b3d: Merge "DO NOT MERGE: Update floatingtoolbar position when cursor moves." into mnc-dev
* commit '8020631fa4a5d2d30cdf227cd2563404a3f7d726':
  DO NOT MERGE: Update floatingtoolbar position when cursor moves.
2015-04-29 17:59:43 +00:00
Cedric Ho
a02ac06b90 am 94ae5f3c: am fbad902a: am 80fa2cc8: Merge "Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE to indicate whether to only use an offline speech recognition engine." into mnc-dev
* commit '94ae5f3c089e9bdd39011dacc09411058ddc4a6e':
  Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE to indicate whether to only use an offline speech recognition engine.
2015-04-29 17:59:37 +00:00
Chad Brubaker
31229a39ce am 658b6868: am fb5caad6: am 721474bb: Merge "Add OP_AUTH_NEEDED KeyStore result code" into mnc-dev
* commit '658b686838f3b4ffdc7f371f9f89d7e022b1b02a':
  Add OP_AUTH_NEEDED KeyStore result code
2015-04-29 17:59:31 +00:00
Abodunrinwa Toki
c23ac32601 DO NOT MERGE: Minor fixes to FloatingToolbar.
* Changes to isShowing() method.
* Changes to initial content visibility on show().

Change-Id: I1b20cd5a3fc86ae7427b55c44efd3cc1118148ae
2015-04-29 17:57:06 +00:00
Abodunrinwa Toki
8020631fa4 am 45b04c1a: am 47ea8b3d: Merge "DO NOT MERGE: Update floatingtoolbar position when cursor moves." into mnc-dev
* commit '45b04c1a5ef4f21b14b40dd0c1035933188da322':
  DO NOT MERGE: Update floatingtoolbar position when cursor moves.
2015-04-29 17:43:40 +00:00
Cedric Ho
94ae5f3c08 am fbad902a: am 80fa2cc8: Merge "Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE to indicate whether to only use an offline speech recognition engine." into mnc-dev
* commit 'fbad902aad433f4eaa82192019fef1dcaba26d47':
  Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE to indicate whether to only use an offline speech recognition engine.
2015-04-29 17:43:34 +00:00
Chad Brubaker
658b686838 am fb5caad6: am 721474bb: Merge "Add OP_AUTH_NEEDED KeyStore result code" into mnc-dev
* commit 'fb5caad6d71c1ed0c2ea7065f5bc650822d70e16':
  Add OP_AUTH_NEEDED KeyStore result code
2015-04-29 17:43:30 +00:00
Abodunrinwa Toki
45b04c1a5e am 47ea8b3d: Merge "DO NOT MERGE: Update floatingtoolbar position when cursor moves." into mnc-dev
* commit '47ea8b3d6bcef193a2d0ec9f0141525c83a0bcda':
  DO NOT MERGE: Update floatingtoolbar position when cursor moves.
2015-04-29 17:32:36 +00:00
Cedric Ho
fbad902aad am 80fa2cc8: Merge "Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE to indicate whether to only use an offline speech recognition engine." into mnc-dev
* commit '80fa2cc8a96e05cec574bd06c9038ad4255ecafb':
  Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE to indicate whether to only use an offline speech recognition engine.
2015-04-29 17:32:32 +00:00
Chad Brubaker
fb5caad6d7 am 721474bb: Merge "Add OP_AUTH_NEEDED KeyStore result code" into mnc-dev
* commit '721474bb9cfb76e29e0fe6e98c6b582c6fa78fe4':
  Add OP_AUTH_NEEDED KeyStore result code
2015-04-29 17:32:27 +00:00
Benjamin Franz
2e3e943ccd Add package name extra to PackageInstaller callback
If an app invokes app install via PackageInstaller APIs without knowing
the package name, the callback contains no information about the name
of the installed package. Add EXTRA_PACKAGE_NAME to this callback.

Also allow PackageInstaller to distinguish between a newly installed and
an updated package.

Bug: 19764848
Bug: 20150135
Change-Id: I062440a08df9a723e9445ea10bc6f6800c5b99a8
2015-04-29 18:28:39 +01:00
Abodunrinwa Toki
47ea8b3d6b Merge "DO NOT MERGE: Update floatingtoolbar position when cursor moves." into mnc-dev 2015-04-29 17:26:29 +00:00
Alan Viverette
666fd1caf9 am 4f0287f9: am d2d8f27a: am 2333912c: Restore checkbox checked color to colorControlActivated
* commit '4f0287f9f8b4383a330f660b4e277c431f38b4d4':
  Restore checkbox checked color to colorControlActivated
2015-04-29 17:23:41 +00:00
Geoff Mendal
35bcf99806 am e1f670b0: (-s ours) am 91b5e328: (-s ours) am 0e0c9d93: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'e1f670b0da193342ea658dd80f9e436139e6c47c':
  Import translations. DO NOT MERGE
2015-04-29 17:23:36 +00:00
Cedric Ho
80fa2cc8a9 Merge "Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE to indicate whether to only use an offline speech recognition engine." into mnc-dev 2015-04-29 17:19:40 +00:00
Chad Brubaker
721474bb9c Merge "Add OP_AUTH_NEEDED KeyStore result code" into mnc-dev 2015-04-29 17:17:33 +00:00
Alan Viverette
4f0287f9f8 am d2d8f27a: am 2333912c: Restore checkbox checked color to colorControlActivated
* commit 'd2d8f27ab9e0bb13f7aab4929e2ff4a8b547fdde':
  Restore checkbox checked color to colorControlActivated
2015-04-29 17:12:33 +00:00