190197 Commits

Author SHA1 Message Date
Mike Lockwood
02868b1625 MidiDeviceInfo: Add version string property
For USB devices, this is populated with the USB device version string.

Change-Id: Ia9286d5f41783e4e960a9c724bf6b85b6599fe12
2015-04-29 13:44:34 -07:00
Dianne Hackborn
9ac2718e7d Merge "Implement user-settable power save whitelist." into mnc-dev 2015-04-29 20:33:51 +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
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
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
Wale Ogunwale
c14624da8e Some code clean-up.
Change-Id: I626c4c40c32dbf43408e0649364dfe8be2bb2321
2015-04-29 12:55:46 -07:00
Eino-Ville Talvala
be6d985269 Camera2: LEGACY: Support prepare(), sort of.
It doesn't actually do any work, but pretends to.

Bug: 20537146
Change-Id: I48c08936b96ba1a0623cff19eb5c521d1dd50129
2015-04-29 12:55:16 -07:00
Abodunrinwa Toki
09de3928ee Use theme attributes for FloatingToolbar colors.
Bug: 20148220
Change-Id: Idc64313040f873dadf05a8c777343c67538199a6
2015-04-29 20:52:58 +01: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
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
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
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
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
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
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
2333912c6e Restore checkbox checked color to colorControlActivated
Bug: 20683633
Change-Id: I8997ad5829eda7afa03b7c56d4f44e4abfe34bee
2015-04-29 09:51:35 -07:00
Geoff Mendal
0e0c9d9392 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-04-29 16:46:33 +00:00
Alan Viverette
7a6caae616 Merge "Adjust display inversion matrix to account for luminance" into mnc-dev 2015-04-29 16:38:43 +00:00
Geoff Mendal
ac5d723035 Import translations. DO NOT MERGE
Change-Id: Ie2516ab34be72c0de86e3d546b349118be9c093c
Auto-generated-cl: translation import
2015-04-29 09:27:09 -07:00
Andrei Stingaceanu
eea5a9e0de Merge "DO NOT MERGE - Minor clean up: redundant functionality in Editor and TextView." into mnc-dev 2015-04-29 16:21:16 +00:00
Xiyuan Xia
19be9d31c8 Merge "Update bottom area alpha when stack height changes" into mnc-dev 2015-04-29 15:46:24 +00:00
Svet Ganov
fbf01f7796 Add API to get app op for a permission
Change-Id: Id75d8fca6654c694fb78d1b4a3564b01e90a4e78
2015-04-29 08:30:48 -07:00
John Reck
b77a755112 Merge "Remove View:hasStaticLayer()" into mnc-dev 2015-04-29 14:48:28 +00:00
Geoff Mendal
e1b43ee918 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-04-29 14:18:41 +00:00
Geoff Mendal
3f4e8c74df Import translations. DO NOT MERGE
Change-Id: Icf8a8e3bc6d5a88293a6954c35e766ac8c494a4d
Auto-generated-cl: translation import
2015-04-29 07:18:14 -07:00
Geoff Mendal
62cb506f27 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-04-29 14:08:26 +00:00
Geoff Mendal
b312f926f6 Import translations. DO NOT MERGE
Change-Id: Ied1d50de849ab195e9f3c9e70c0f8e8dbf9104fe
Auto-generated-cl: translation import
2015-04-29 07:03:31 -07:00
John Spurlock
8dbcda1b33 Merge "Volume: Simple dialog footer, DND in quick settings." into mnc-dev 2015-04-29 14:02:52 +00:00
John Spurlock
d9c75dba75 Volume: Simple dialog footer, DND in quick settings.
- Show DND tile by default, this is now the only
   place to manage DND modes / end conditions.
 - Remove super footer from volume dialog, replace with
   a simplified version that displays the current mode
   and allows ending DND.
 - Remove obsolete text-only footer from codebase.
 - Migrate remaining volume items into main resource files.
 - Rename "No interruptions" to "Total silence".
 - Add new user information banner for "Total silence"
 - Crude media filtering for Total Silence.
   (deeper muting changes will be done as a followup)
 - Disable volume dialog sliders completely if muted due
   to zen.
 - Cleanup ZenModePanel: assume embedded mode, remove
   expandable subhead
 - Remember "favorite" DND mode inside the DND config panel.
 - AudioService: consult ringer-mode-delegate before voluming
   down into silent.
 - Add new hour options to time-based exit conditions.
 - Volume dialog visual updates to move closer to final visuals.
 - Unify ringer=silent with DND.

Bug: 19260237
Change-Id: I05d7e001eca3b5125418ec3bc4087d0cb8866717
2015-04-29 09:58:38 -04:00
Nicolas Prevot
1c4a44e577 Do not return cross-profile intent results to a non-enabled user.
In PackageManagerService.queryIntentActivities, do not return
ResolveInfos targeting a user which is not enabled.

BUG:19578138
Change-Id: Id4e730ca8671c26f8cf077bc9c66b3dbd37be482
2015-04-29 11:10:19 +00:00
Benjamin Franz
c4aa3c781a Merge "Add status bar flag to disable quick settings" into mnc-dev 2015-04-29 08:36:00 +00:00
Dongwon Kang
25466e0a8f Merge "TIF: throw an exception if an operation takes too long." into mnc-dev 2015-04-29 05:34:26 +00:00
Dongwon Kang
21add3ecc9 TIF: throw an exception if an operation takes too long.
Bug: 19383373
Change-Id: I915f77af3ab12d10810fd85e55d7d5c5da3d6136
2015-04-29 14:33:24 +09:00
Jeff Sharkey
b42d694691 Method to wipe all adoptable disks.
Will be used by various classes doing factory reset.

Bug: 9433509
Change-Id: I0701abe00abc2fb9085ce1ffe6e28fb27c91ab51
2015-04-28 22:25:26 -07:00
Jeff Sharkey
b36586a7c9 Split some VolumeInfo state into VolumeRecord.
VolumeRecord is a historical record of a volume that we've seen in
the past.  It's now surfaced outside the framework for SystemUI to
drive the notifications that bug users to reinsert missing private
volumes.

Show progress notifications for both storage and package movement
operations.  Notify when an empty disk is inserted (no usable volumes)
which launches into the normal format flow.

Add API to forget volumes.

Bug: 20275424, 20275424
Change-Id: I75602c17fdcd4d1f1f62324e1a08c4a33093eefa
2015-04-28 22:02:36 -07:00
David Friedman
30565ed225 am a39e4d37: am 77ad81b5: am ff1bfac6: am c637af9e: am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs
* commit 'a39e4d3716a10e84acbfc0813745ee4303f1edb2':
2015-04-29 04:05:47 +00:00
David Friedman
16bf47e8d6 am 3d983dea: am 21a9fa47: am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs
* commit '3d983deace20df9437bc9efebc67550f3904eee3':
  Localized Android landing pages Bug: 19124242
2015-04-29 03:51:39 +00:00
David Friedman
a39e4d3716 am 77ad81b5: am ff1bfac6: am c637af9e: am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs
* commit '77ad81b5301bfbf1691bdad203dd70ce68ce40b3':
2015-04-29 03:48:52 +00:00
David Friedman
77ad81b530 am ff1bfac6: am c637af9e: am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs
* commit 'ff1bfac68b977f577d537172d87daa5c816be3b7':
  Localized Android landing pages Bug: 19124242
2015-04-29 03:25:38 +00:00