OSDN Git Service

android-x86/frameworks-base.git
9 years agoMerge "Rename AudioState to CallAudioState" into mnc-dev
Yorke Lee [Thu, 14 May 2015 01:21:06 +0000 (01:21 +0000)]
Merge "Rename AudioState to CallAudioState" into mnc-dev

9 years agoMerge "Add QS Tuner" into mnc-dev
Jason Monk [Thu, 14 May 2015 01:02:12 +0000 (01:02 +0000)]
Merge "Add QS Tuner" into mnc-dev

9 years agoAdd QS Tuner
Jason Monk [Tue, 12 May 2015 23:29:02 +0000 (19:29 -0400)]
Add QS Tuner

Change-Id: I908d0161b7209b8e99299f5cb3eb58f3d7b52752

9 years agoIgnore small time changes in alarm manager.
Dianne Hackborn [Wed, 13 May 2015 21:03:20 +0000 (14:03 -0700)]
Ignore small time changes in alarm manager.

It turns out switching to the new kernel alarm
reporting causes lots and lots of spurious flags
that the clock has changed.  The alarm manager
would blindly trust these, thinking the world has
changed on it and recomputing everything and reporting
this to everyone else.  This was expensive.

We now verify that the time has changed sufficiently
that it is worth caring about.  This is basically the
same algorithm that battery stats was using to avoid
recording small clock changes, so we are really just
pushing this down into the alarm manager and can now
remove that from battery stats.

Also since we are getting these so much, make use of
the other information in about the wakeup that tells us
if an alarm went off to avoid doing anything if it didn't.

Change-Id: I6f4f4226db6eb2b38ca73860786e7cf7c9136cc3

9 years agoam 7238435e: (-s ours) resolved conflicts for merge of e869835d to lmp-mr1-ub-dev
John Reck [Thu, 14 May 2015 00:38:28 +0000 (00:38 +0000)]
am 7238435e: (-s ours) resolved conflicts for merge of e869835d to lmp-mr1-ub-dev

* commit '7238435e9b3f133965b63abc7b352b34f9401af5':
  DO NOT MERGE Backport of limited jank-tracking metrics

9 years agoMerge "Fix build." into mnc-dev
Dianne Hackborn [Thu, 14 May 2015 00:36:56 +0000 (00:36 +0000)]
Merge "Fix build." into mnc-dev

9 years agoMerge "Fix fingerprint for multiuser" into mnc-dev
Jorim Jaggi [Thu, 14 May 2015 00:36:02 +0000 (00:36 +0000)]
Merge "Fix fingerprint for multiuser" into mnc-dev

9 years agoFix build.
Dianne Hackborn [Thu, 14 May 2015 00:35:42 +0000 (17:35 -0700)]
Fix build.

Change-Id: I94c7e3033721c1d8024a212614752512e685289b

9 years agoMerge "Allow partial playback parameter settings in AudioTrack" into mnc-dev
Andy Hung [Thu, 14 May 2015 00:21:23 +0000 (00:21 +0000)]
Merge "Allow partial playback parameter settings in AudioTrack" into mnc-dev

9 years agoresolved conflicts for merge of e869835d to lmp-mr1-ub-dev
John Reck [Thu, 14 May 2015 00:16:31 +0000 (17:16 -0700)]
resolved conflicts for merge of e869835d to lmp-mr1-ub-dev

Change-Id: Ia183cafb1aa19dcbb6e3bbefceecec5df29663da

9 years agoMerge "Add support for static RadioCapabilities." into mnc-dev
Robert Greenwalt [Thu, 14 May 2015 00:06:57 +0000 (00:06 +0000)]
Merge "Add support for static RadioCapabilities." into mnc-dev

9 years agoAdd support for static RadioCapabilities.
Robert Greenwalt [Tue, 12 May 2015 00:54:13 +0000 (17:54 -0700)]
Add support for static RadioCapabilities.

Some RILs don't support RIL_REQUEST_GET_RADIO_CAPABILITY.  Add
code to RIL.java to notice a REQUEST_NOT_SUPPORTED response and
check config.xml (config_radio_access_family) for a static answer.

Also catching GENERIC_FAILURE responses because Hammerhead modem
returns that.  B 21079604 created for this.

If neither Modem nor config.xml provide data, uses RAF_UNKNOWN
so we don't lie about capabilities and also so we fail fast
(setPreferredNetwork won't work).

bug:20561357
Change-Id: I49e4527fe94919a7094bc7c1e100d20e8f833865

9 years agoam 3ccf0caf: am 7fc3b6c0: am abd8d422: am f5d6156c: Merge "Docs: NDK r10e changes...
David Friedman [Thu, 14 May 2015 00:00:10 +0000 (00:00 +0000)]
am 3ccf0caf: am 7fc3b6c0: am abd8d422: am f5d6156c: Merge "Docs: NDK r10e changes to publish to DAC." into lmp-docs

* commit '3ccf0caf015034976f8c654d89ac74619aa94bd0':
  Docs: NDK r10e changes to publish to DAC.

9 years agoMerge "Add back alpha atrace log" into mnc-dev
Chris Craik [Wed, 13 May 2015 23:53:47 +0000 (23:53 +0000)]
Merge "Add back alpha atrace log" into mnc-dev

9 years agoAdd back alpha atrace log
Chris Craik [Wed, 13 May 2015 23:33:04 +0000 (16:33 -0700)]
Add back alpha atrace log

bug:20922838

Change-Id: I70ccbffdd5f140cd1dd71fbf456fb5b085e74a4a

9 years agoam 7fc3b6c0: am abd8d422: am f5d6156c: Merge "Docs: NDK r10e changes to publish to...
David Friedman [Wed, 13 May 2015 23:46:36 +0000 (23:46 +0000)]
am 7fc3b6c0: am abd8d422: am f5d6156c: Merge "Docs: NDK r10e changes to publish to DAC." into lmp-docs

* commit '7fc3b6c00b55e15881d1f098666399b674a64e42':
  Docs: NDK r10e changes to publish to DAC.

9 years agoMerge "Access mock location is no longer a runtime permission - framework" into mnc-dev
Svet Ganov [Wed, 13 May 2015 23:45:22 +0000 (23:45 +0000)]
Merge "Access mock location is no longer a runtime permission - framework" into mnc-dev

9 years agoMerge "MediaPlayer/TimedMetaData: API updates related to timed metadata" into mnc-dev
Robert Shih [Wed, 13 May 2015 23:36:47 +0000 (23:36 +0000)]
Merge "MediaPlayer/TimedMetaData: API updates related to timed metadata" into mnc-dev

9 years agoFix fingerprint for multiuser
Jorim Jaggi [Wed, 13 May 2015 23:30:04 +0000 (16:30 -0700)]
Fix fingerprint for multiuser

Change-Id: Iab18c4de9764da1a65490b186b33535f8e79e1e5

9 years agoMerge "Call dispatchFinishTemporaryDetach before returning a transient view" into...
Alan Viverette [Wed, 13 May 2015 23:35:53 +0000 (23:35 +0000)]
Merge "Call dispatchFinishTemporaryDetach before returning a transient view" into mnc-dev

9 years agoam abd8d422: am f5d6156c: Merge "Docs: NDK r10e changes to publish to DAC." into...
David Friedman [Wed, 13 May 2015 23:30:41 +0000 (23:30 +0000)]
am abd8d422: am f5d6156c: Merge "Docs: NDK r10e changes to publish to DAC." into lmp-docs

* commit 'abd8d42225f58396abaef2cf0e8a604be111e683':
  Docs: NDK r10e changes to publish to DAC.

9 years agoMerge "Hide getPackageProcessState(), it is not ready yet." into mnc-dev
Dianne Hackborn [Wed, 13 May 2015 23:29:29 +0000 (23:29 +0000)]
Merge "Hide getPackageProcessState(), it is not ready yet." into mnc-dev

9 years agoMerge "Refactor StatusHints (1/3)" into mnc-dev
Ihab Awad [Wed, 13 May 2015 23:26:04 +0000 (23:26 +0000)]
Merge "Refactor StatusHints (1/3)" into mnc-dev

9 years agoMerge "Add IntentFilter auto verification - part 10" into mnc-dev
Fabrice Di Meglio [Wed, 13 May 2015 23:20:46 +0000 (23:20 +0000)]
Merge "Add IntentFilter auto verification - part 10" into mnc-dev

9 years agoMediaPlayer/TimedMetaData: API updates related to timed metadata
Robert Shih [Wed, 13 May 2015 22:02:25 +0000 (15:02 -0700)]
MediaPlayer/TimedMetaData: API updates related to timed metadata

- renamed MediaPlayer.*OnTimedMetaData* to *OnTimedMetaDataAvailable*
- added `final` modifier to TimedMetaData class
- added javadocs for TimedMetaData public methods
- renamed private members and cooresponding accessors for TimedMetaData
- reworded existing TimedMetaData javadoc

Bug: 21045118
Change-Id: If0113307fce08083226fc7f64c4fe6f93553d899

9 years agoAdd IntentFilter auto verification - part 10
Fabrice Di Meglio [Wed, 13 May 2015 23:17:11 +0000 (16:17 -0700)]
Add IntentFilter auto verification - part 10

- tune Intent resolution candidates filtering: remove the undefinedList
from the results and then add it again it there is no more candidates.

See bug #19628271

Change-Id: I9ab077f6a431367be8bab30c134d34e1e7ac51ed

9 years agoam f5d6156c: Merge "Docs: NDK r10e changes to publish to DAC." into lmp-docs
David Friedman [Wed, 13 May 2015 23:16:41 +0000 (23:16 +0000)]
am f5d6156c: Merge "Docs: NDK r10e changes to publish to DAC." into lmp-docs

* commit 'f5d6156ce8e56eb92abcf046fd8ff5a9647d38ae':
  Docs: NDK r10e changes to publish to DAC.

9 years agoRefactor StatusHints (1/3)
Ihab Awad [Wed, 13 May 2015 18:34:53 +0000 (11:34 -0700)]
Refactor StatusHints (1/3)

Refactor StatusHints to use the new Icon class.

Bug: 21040387
Change-Id: I3e7aae38127294b46859efb6a2aec71cf90e0e2a

9 years agoMerge "media: rename MediaCodec.setSurface to setOutputSurface" into mnc-dev
Lajos Molnar [Wed, 13 May 2015 23:01:27 +0000 (23:01 +0000)]
Merge "media: rename MediaCodec.setSurface to setOutputSurface" into mnc-dev

9 years agoMerge "Docs: NDK r10e changes to publish to DAC." into lmp-docs
David Friedman [Wed, 13 May 2015 23:00:37 +0000 (23:00 +0000)]
Merge "Docs: NDK r10e changes to publish to DAC." into lmp-docs

9 years agoDocs: NDK r10e changes to publish to DAC.
David Friedman [Mon, 11 May 2015 21:38:18 +0000 (14:38 -0700)]
Docs: NDK r10e changes to publish to DAC.

Change-Id: Id178523df1d5524bb25d43e304591526e6488b92

9 years agoAccess mock location is no longer a runtime permission - framework
Svet Ganov [Wed, 13 May 2015 17:40:31 +0000 (10:40 -0700)]
Access mock location is no longer a runtime permission - framework

The access mock location is no longer a runtime permission. It is a
signature protected one that apps cannot get but the fact they request
it means they want to inject location into the system. Now the user
gets to choose the current mock location app in developer options from
the apps that request the mock location permission. The access to mock
location is no longer guarded by the permisson but from a new app op
which is off by default and the settiings UI sets it to enabled only
for the currently selected mock location app.

bug:21078873

Change-Id: I19e3f9dc7c7de82eab46b30fec1abfbca54a0e59

9 years agoMerge "Address API feedback for PostMessage" into mnc-dev
Selim Gurun [Wed, 13 May 2015 22:36:59 +0000 (22:36 +0000)]
Merge "Address API feedback for PostMessage" into mnc-dev

9 years agoMerge "Fix build" into mnc-dev
Jorim Jaggi [Wed, 13 May 2015 22:36:00 +0000 (22:36 +0000)]
Merge "Fix build" into mnc-dev

9 years agoFix build
Jorim Jaggi [Wed, 13 May 2015 22:34:01 +0000 (15:34 -0700)]
Fix build

Change-Id: Ia9277c6c983758d301c89312e39b59a2db0b29c4

9 years agoMerge "Modify how USB connections are handled." into mnc-dev
Nick Kralevich [Wed, 13 May 2015 22:31:57 +0000 (22:31 +0000)]
Merge "Modify how USB connections are handled." into mnc-dev

9 years agoHide getPackageProcessState(), it is not ready yet.
Dianne Hackborn [Wed, 13 May 2015 22:10:24 +0000 (15:10 -0700)]
Hide getPackageProcessState(), it is not ready yet.

Change-Id: I188c647573207e89510174e3ad56ca0c19e5ece3

9 years agoAllow partial playback parameter settings in AudioTrack
Andy Hung [Wed, 13 May 2015 22:15:25 +0000 (15:15 -0700)]
Allow partial playback parameter settings in AudioTrack

Change-Id: Ifb12c85312e25aa74da47fe0eae2d5b1fa4bb23b

9 years agoMerge "Make sure the app can draw a frame before unlocking" into mnc-dev
Jorim Jaggi [Wed, 13 May 2015 22:13:26 +0000 (22:13 +0000)]
Merge "Make sure the app can draw a frame before unlocking" into mnc-dev

9 years agoMerge "Rename BOOL_SHOW_CDMA to BOOL_SHOW_CDMA_CHOICES, so the name makes more sense...
Junda Liu [Wed, 13 May 2015 22:13:23 +0000 (22:13 +0000)]
Merge "Rename BOOL_SHOW_CDMA to BOOL_SHOW_CDMA_CHOICES, so the name makes more sense." into mnc-dev

9 years agoRename BOOL_SHOW_CDMA to BOOL_SHOW_CDMA_CHOICES, so the name makes more sense.
Junda Liu [Wed, 13 May 2015 22:11:10 +0000 (15:11 -0700)]
Rename BOOL_SHOW_CDMA to BOOL_SHOW_CDMA_CHOICES, so the name makes more sense.

Bug: b/21028396
Change-Id: I4905a1d1db247955ae7fa00a7f5ddfd7337ba5a8

9 years agoMerge "Update IME focus when the active view is losing the focus." into mnc-dev
Yohei Yukawa [Wed, 13 May 2015 22:10:33 +0000 (22:10 +0000)]
Merge "Update IME focus when the active view is losing the focus." into mnc-dev

9 years agoMerge "Rename BOOL_SHOW_CDMA to BOOL_SHOW_CDMA_CHOICES, so the name makes more sense...
Junda Liu [Wed, 13 May 2015 22:09:20 +0000 (22:09 +0000)]
Merge "Rename BOOL_SHOW_CDMA to BOOL_SHOW_CDMA_CHOICES, so the name makes more sense." into mnc-dev

9 years agoMerge "Address API council feedback for setOffscreenPreRaster." into mnc-dev
Hui Shu [Wed, 13 May 2015 22:07:54 +0000 (22:07 +0000)]
Merge "Address API council feedback for setOffscreenPreRaster." into mnc-dev

9 years agoam a5b28b92: am 69355eaa: Merge "DO NOT MERGE Backport of limited jank-tracking metri...
John Reck [Wed, 13 May 2015 22:07:15 +0000 (22:07 +0000)]
am a5b28b92: am 69355eaa: Merge "DO NOT MERGE Backport of limited jank-tracking metrics" into lmp-mr1-dev

* commit 'a5b28b92b14d0949d43be6198fedc31872ad07f6':
  DO NOT MERGE Backport of limited jank-tracking metrics

9 years agoAdd null annotations for getting carrier config.
Jonathan Basseri [Tue, 5 May 2015 19:00:59 +0000 (12:00 -0700)]
Add null annotations for getting carrier config.

CarrierConfigManager can return null Bundles for carrier config, but
never returns null when getting default values. Add the appropriate
annotations.

Change-Id: Iffbed3b54ca7cc28cf8b04f133aacdf9e6e4fd20

9 years agoRename AudioState to CallAudioState
Yorke Lee [Wed, 13 May 2015 21:14:54 +0000 (14:14 -0700)]
Rename AudioState to CallAudioState

Deprecate AudioState class and make methods @SystemApi where
necessary to minimize impact to SystemApi
Replace usages of AudioState inside Telecom sub-systems
Fire both onCallAudioStateChanged and onAudioStateChanged callbacks
for backward compatibility
Support both setAudioState and setCallAudioState for all classes

Bug: 21040387
Bug: 21088300
Change-Id: I3ec7b3afdaa344c6d639d1c421f1842d67f7d0f7

9 years agoRename BOOL_SHOW_CDMA to BOOL_SHOW_CDMA_CHOICES, so the name makes more sense.
Junda Liu [Wed, 13 May 2015 21:57:48 +0000 (14:57 -0700)]
Rename BOOL_SHOW_CDMA to BOOL_SHOW_CDMA_CHOICES, so the name makes more sense.

Bug: b/21028396
Change-Id: I029671b6bcd03a07956ccf35f4e5fe03d16a2218

9 years agoMerge "Add phone account field for voicemail to distinguish the source." into mnc-dev
Nancy Chen [Wed, 13 May 2015 21:54:47 +0000 (21:54 +0000)]
Merge "Add phone account field for voicemail to distinguish the source." into mnc-dev

9 years agoam 69355eaa: Merge "DO NOT MERGE Backport of limited jank-tracking metrics" into...
John Reck [Wed, 13 May 2015 21:52:50 +0000 (21:52 +0000)]
am 69355eaa: Merge "DO NOT MERGE Backport of limited jank-tracking metrics" into lmp-mr1-dev

* commit '69355eaa1c1f4bfc961d5dd9fdb0f3817d36d5f0':
  DO NOT MERGE Backport of limited jank-tracking metrics

9 years agoMerge "TIF: API Review: android.media.tv" into mnc-dev
Jae Seo [Wed, 13 May 2015 21:43:47 +0000 (21:43 +0000)]
Merge "TIF: API Review: android.media.tv" into mnc-dev

9 years agoMerge "Use drawableStart in dialog list item so we can set padding" into mnc-dev
Alan Viverette [Wed, 13 May 2015 21:43:12 +0000 (21:43 +0000)]
Merge "Use drawableStart in dialog list item so we can set padding" into mnc-dev

9 years agomedia: rename MediaCodec.setSurface to setOutputSurface
Lajos Molnar [Wed, 13 May 2015 21:39:55 +0000 (14:39 -0700)]
media: rename MediaCodec.setSurface to setOutputSurface

Bug: 21045402
Change-Id: Ie57880af6ce6feea9713360b094f2b198d3c119e

9 years agoMerge "AAPT2: Fix issue where @null was wrongly encoded" into mnc-dev
Adam Lesinski [Wed, 13 May 2015 21:42:57 +0000 (21:42 +0000)]
Merge "AAPT2: Fix issue where @null was wrongly encoded" into mnc-dev

9 years agoMerge "Use platform delay for assist long press gesture" into mnc-dev
Jorim Jaggi [Wed, 13 May 2015 21:42:14 +0000 (21:42 +0000)]
Merge "Use platform delay for assist long press gesture" into mnc-dev

9 years agoMerge "DO NOT MERGE Backport of limited jank-tracking metrics" into lmp-mr1-dev
John Reck [Wed, 13 May 2015 21:42:08 +0000 (21:42 +0000)]
Merge "DO NOT MERGE Backport of limited jank-tracking metrics" into lmp-mr1-dev

9 years agoMerge "AAPT2: Debug: Dump only targetted style" into mnc-dev
Adam Lesinski [Wed, 13 May 2015 21:41:38 +0000 (21:41 +0000)]
Merge "AAPT2: Debug: Dump only targetted style" into mnc-dev

9 years agoMerge "AAPT2: inferred style parent processing" into mnc-dev
Adam Lesinski [Wed, 13 May 2015 21:40:06 +0000 (21:40 +0000)]
Merge "AAPT2: inferred style parent processing" into mnc-dev

9 years agoMerge "AAPT2: Support static lib referencing static lib" into mnc-dev
Adam Lesinski [Wed, 13 May 2015 21:38:01 +0000 (21:38 +0000)]
Merge "AAPT2: Support static lib referencing static lib" into mnc-dev

9 years agoMerge "New AndroidKeyStore API in android.security.keystore." into mnc-dev
Alex Klyubin [Wed, 13 May 2015 21:33:36 +0000 (21:33 +0000)]
Merge "New AndroidKeyStore API in android.security.keystore." into mnc-dev

9 years agoModify how USB connections are handled.
Nick Kralevich [Wed, 13 May 2015 18:54:03 +0000 (11:54 -0700)]
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

9 years agoMake sure the app can draw a frame before unlocking
Jorim Jaggi [Thu, 7 May 2015 18:41:41 +0000 (11:41 -0700)]
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

9 years agoUse platform delay for assist long press gesture
Jorim Jaggi [Wed, 13 May 2015 21:17:16 +0000 (14:17 -0700)]
Use platform delay for assist long press gesture

Bug: 20853645
Change-Id: I1f25a04bfc7d07077211743b9d258fd637a402e6

9 years agoAddress API feedback for PostMessage
Selim Gurun [Wed, 13 May 2015 17:15:55 +0000 (10:15 -0700)]
Address API feedback for PostMessage

Bug: 21043955

Add anchor tags, and hide the constructor for WebMessagePort.

Change-Id: Ibd2e15581c06be9015a3cd7c7741edf6657d4552

9 years agoMerge "Allowing profile to set a subset of keyguard restrictions." into mnc-dev
Kenny Guy [Wed, 13 May 2015 21:07:15 +0000 (21:07 +0000)]
Merge "Allowing profile to set a subset of keyguard restrictions." into mnc-dev

9 years agoMerge "Add default icon for permissions" into mnc-dev
Jason Monk [Wed, 13 May 2015 21:06:28 +0000 (21:06 +0000)]
Merge "Add default icon for permissions" into mnc-dev

9 years agoMerge "Determine if we have adoptable disks." into mnc-dev
Jeff Sharkey [Wed, 13 May 2015 20:57:01 +0000 (20:57 +0000)]
Merge "Determine if we have adoptable disks." into mnc-dev

9 years agoDetermine if we have adoptable disks.
Jeff Sharkey [Wed, 13 May 2015 20:54:30 +0000 (13:54 -0700)]
Determine if we have adoptable disks.

Bug: 19993667
Change-Id: I9b21b05736c22d34ca22f5ad6e1a6ebec440cfb6

9 years agoMerge "Revert "Anti-alias by default"" into mnc-dev
Chris Craik [Wed, 13 May 2015 20:47:46 +0000 (20:47 +0000)]
Merge "Revert "Anti-alias by default"" into mnc-dev

9 years agoMerge "Anti-Alias ColorDrawable" into mnc-dev
Chris Craik [Wed, 13 May 2015 20:44:48 +0000 (20:44 +0000)]
Merge "Anti-Alias ColorDrawable" into mnc-dev

9 years agoRevert "Anti-alias by default"
Chris Craik [Wed, 13 May 2015 20:09:50 +0000 (13:09 -0700)]
Revert "Anti-alias by default"

bug:20948129

Keep HIDDEN_DEFAULT_PAINT_FLAGS name.

This reverts commit 1b60cc0529161b5eca6407b551d67d355994c567.

Change-Id: I97cd9c556375c74c52b006bda4fc7b3a2cfa89e1

9 years agoMerge "Volume: Update divider color to match qs tile divider color." into mnc-dev
John Spurlock [Wed, 13 May 2015 20:39:54 +0000 (20:39 +0000)]
Merge "Volume: Update divider color to match qs tile divider color." into mnc-dev

9 years agoVolume: Update divider color to match qs tile divider color.
John Spurlock [Wed, 13 May 2015 20:31:34 +0000 (16:31 -0400)]
Volume: Update divider color to match qs tile divider color.

Bug: 21120949
Change-Id: I35ad4f1badbb109e49d5d5b452e3e11b641d7e14

9 years agoMerge "Volume: Use inactive slider tints when disabled." into mnc-dev
John Spurlock [Wed, 13 May 2015 20:35:09 +0000 (20:35 +0000)]
Merge "Volume: Use inactive slider tints when disabled." into mnc-dev

9 years agoVolume: Use inactive slider tints when disabled.
John Spurlock [Wed, 13 May 2015 20:23:14 +0000 (16:23 -0400)]
Volume: Use inactive slider tints when disabled.

Bug: 21119650
Change-Id: I14e10c83e9d73096775f92d5290306b76eba6af4

9 years agoMerge "Persist fingerprint names" into mnc-dev
Jorim Jaggi [Wed, 13 May 2015 20:32:30 +0000 (20:32 +0000)]
Merge "Persist fingerprint names" into mnc-dev

9 years agoMerge "Don't negate saving state" into mnc-dev
Todd Kennedy [Wed, 13 May 2015 20:27:16 +0000 (20:27 +0000)]
Merge "Don't negate saving state" into mnc-dev

9 years agoPersist fingerprint names
Jorim Jaggi [Tue, 12 May 2015 22:00:12 +0000 (15:00 -0700)]
Persist fingerprint names

Bug: 20469328
Change-Id: I8f4a988687bfb78c36cc7cf187103a9d93ed4535

9 years agoAnti-Alias ColorDrawable
Chris Craik [Wed, 13 May 2015 20:16:56 +0000 (13:16 -0700)]
Anti-Alias ColorDrawable

Change-Id: I4d0ee2a496de908b99b0f1d8bef1b6f861c94c6f

9 years agoMerge "Remove initiator name param." into mnc-dev
Julia Reynolds [Wed, 13 May 2015 20:14:41 +0000 (20:14 +0000)]
Merge "Remove initiator name param." into mnc-dev

9 years agoMerge "Start handshake before calling hostname verifier, part 2" into mnc-dev
Kenny Root [Wed, 13 May 2015 20:14:25 +0000 (20:14 +0000)]
Merge "Start handshake before calling hostname verifier, part 2" into mnc-dev

9 years agoMerge "Zen: Use shorter version of countdown condition summary in footer." into mnc-dev
John Spurlock [Wed, 13 May 2015 20:10:48 +0000 (20:10 +0000)]
Merge "Zen: Use shorter version of countdown condition summary in footer." into mnc-dev

9 years agoMerge "Hide API not ready for prime time." into mnc-dev
Jeff Sharkey [Wed, 13 May 2015 20:08:12 +0000 (20:08 +0000)]
Merge "Hide API not ready for prime time." into mnc-dev

9 years agoAdd default icon for permissions
Jason Monk [Wed, 13 May 2015 20:01:16 +0000 (16:01 -0400)]
Add default icon for permissions

Bug: 21119477
Change-Id: Ie982a1b42d2195ab79c33cf87756efb3bd9eab29

9 years agoHide API not ready for prime time.
Jeff Sharkey [Wed, 13 May 2015 19:52:06 +0000 (12:52 -0700)]
Hide API not ready for prime time.

Bug: 20642684
Change-Id: I133f023ba7d1d9572175a8f6a3e3c8314c5a897d

9 years agoStart handshake before calling hostname verifier, part 2
Kenny Root [Tue, 12 May 2015 22:13:50 +0000 (15:13 -0700)]
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

9 years agoMerge "MediaCodec: rename usePersistentInputSurface to setInputSurface" into mnc-dev
Chong Zhang [Wed, 13 May 2015 19:56:06 +0000 (19:56 +0000)]
Merge "MediaCodec: rename usePersistentInputSurface to setInputSurface" into mnc-dev

9 years agoNew AndroidKeyStore API in android.security.keystore.
Alex Klyubin [Wed, 13 May 2015 16:15:00 +0000 (09:15 -0700)]
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

9 years agoMerge "Ensure key algorithm name of HMAC keys is preserved." into mnc-dev
Alex Klyubin [Wed, 13 May 2015 19:47:37 +0000 (19:47 +0000)]
Merge "Ensure key algorithm name of HMAC keys is preserved." into mnc-dev

9 years agoZen: Use shorter version of countdown condition summary in footer.
John Spurlock [Wed, 13 May 2015 19:42:04 +0000 (15:42 -0400)]
Zen: Use shorter version of countdown condition summary in footer.

To try and keep to two-lines.

Bug: 21119801
Change-Id: I5a6760381a6b673b8481164f92cf6b7b236af349

9 years agoMerge "Rewriting should fail when any paths are null." into mnc-dev
Jeff Sharkey [Wed, 13 May 2015 19:39:25 +0000 (19:39 +0000)]
Merge "Rewriting should fail when any paths are null." into mnc-dev

9 years agoRewriting should fail when any paths are null.
Jeff Sharkey [Wed, 13 May 2015 19:38:16 +0000 (12:38 -0700)]
Rewriting should fail when any paths are null.

Bug: 21017105
Change-Id: I0c5e9c5bdf397d51e2799b06a52bc5bd0bdd09b0

9 years agoMerge "Updated storage notification icons." into mnc-dev
Jeff Sharkey [Wed, 13 May 2015 19:35:27 +0000 (19:35 +0000)]
Merge "Updated storage notification icons." into mnc-dev

9 years agoEnsure key algorithm name of HMAC keys is preserved.
Alex Klyubin [Wed, 13 May 2015 19:30:19 +0000 (12:30 -0700)]
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

9 years agoMerge "Zen: Serialize notify conditions calls, defer subscription." into mnc-dev
John Spurlock [Wed, 13 May 2015 19:06:09 +0000 (19:06 +0000)]
Merge "Zen: Serialize notify conditions calls, defer subscription." into mnc-dev

9 years agoMerge "Start handshake before calling hostname verifier" into mnc-dev
Kenny Root [Wed, 13 May 2015 19:04:08 +0000 (19:04 +0000)]
Merge "Start handshake before calling hostname verifier" into mnc-dev

9 years agoAddress API council feedback for setOffscreenPreRaster.
Hui Shu [Wed, 13 May 2015 19:01:42 +0000 (12:01 -0700)]
Address API council feedback for setOffscreenPreRaster.

BUG: 21043955
Change-Id: I6481f5f84c9e00c16caeb2d9e175aa869600c715

9 years agoStart handshake before calling hostname verifier
Kenny Root [Tue, 12 May 2015 22:13:50 +0000 (15:13 -0700)]
Start handshake before calling hostname verifier

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.

(cherry picked from commit 317c0a4959df0361431d5fbf7dacc162bfb48cd2 in
external/apache-http)

Bug: 14975169
Bug: 17332309
Bug: 17524215
Bug: 17812533
Bug: 18507278
Bug: 19069992
Bug: 19378885
Bug: 19414083
Bug: 19550311
Bug: 19731556
Bug: 19853723
Bug: 20908941
Bug: 21118659
Change-Id: Ie74ec12c8b131c7bf400a07fc91c78da4d5e470f

9 years agoMerge "Track app idle history and dump it" into mnc-dev
Amith Yamasani [Wed, 13 May 2015 18:52:29 +0000 (18:52 +0000)]
Merge "Track app idle history and dump it" into mnc-dev

9 years agoTrack app idle history and dump it
Amith Yamasani [Fri, 8 May 2015 23:36:21 +0000 (16:36 -0700)]
Track app idle history and dump it

"dumpsys usagestats history" will show the
active state of each app for the last 100 hours,
if the device hasn't rebooted.

Bug: 20066058
Change-Id: I703e5bc121298e4363c202da56fffb0b8534bcaf