195118 Commits

Author SHA1 Message Date
Eric Laurent
7413ab6731 Merge "audioservice: remove BT SCO device when service is disconnected" into mnc-dev 2015-06-12 21:42:55 +00:00
Jeff Sharkey
8dd7ad7429 Merge "Send along the disk ID that we just scanned." into mnc-dev 2015-06-12 21:40:35 +00:00
Ruben Brunk
b44864e76b Fix legacy disconnect callback.
Bug: 21708377
Change-Id: I17e9fe0fda77e8f4cb00578d5d9658dc24cab543
2015-06-12 14:39:12 -07:00
Jeff Sharkey
e9b64f9735 Send along the disk ID that we just scanned.
Change-Id: I33f1a5363ed171f715b2f6c5690fcee586a8a58c
2015-06-12 14:38:50 -07:00
Eric Laurent
98859b256e audioservice: remove BT SCO device when service is disconnected
Bug: 21727956.
Change-Id: I9dd68ad83583cdbe7454724098c89daf70bee726
2015-06-12 14:35:59 -07:00
Doris Liu
0b9fd85f8f Merge "Change ActionBar animtion from/to ActionMode" into mnc-dev 2015-06-12 21:31:48 +00:00
Nick Chalko
7298749d48 Merge "Improve javadoc for onTune and notifyVideoAvailable." into mnc-dev 2015-06-12 21:31:30 +00:00
Alex Klyubin
acb7efd0d6 Document when self-signed certs have invalid signature.
This updates the Javadocs of Android Keystore to explain what key
authorizations are needed for the self-signed cert create at key
generation time to have a valid signature.

Bug: 18088752
Bug: 21777596
Change-Id: Id02425133f094a0c5a02e96f4c63aab7175cba5b
2015-06-12 14:29:07 -07:00
Chris Craik
eaef7b6cb1 Merge "Fix roundrect clipping / blending ordering" into mnc-dev 2015-06-12 21:23:23 +00:00
Stefan Kuhne
9326dc1407 Removing screen artifacts afer orientation change in sleep mode
Avoiding screen artifacts upon rotation change in sleep mode. This will
be done by postponing orientation changes until the entire UI got drawn.

Bug: 16849724
Change-Id: Ib1d818258d12f5c1909de4558af46aec27e29c75
2015-06-12 11:22:05 -10:00
Doris Liu
94283533ab Change ActionBar animtion from/to ActionMode
This CL changes the animation going from/to ActionMode per UX request.
The previous animation uses a combination of scale and translation
animation, whereas the new animation uses fade-out and then fade-in
(no cross-fade) for the action bar transition.

Bug: 20882034
Change-Id: I06286a215d058ed6f9f2023a4f0bcc60fa7ef46f
2015-06-12 14:21:30 -07:00
Chris Wren
6d8e413a63 remove setLatestEventInfo from USB
Bug: 18510449
Change-Id: I6b9ccaa0537c8044c5fa900ae4ea68b2676e1365
2015-06-12 17:10:01 -04:00
Tyler Gunn
8a90866a9a Merge "Correct issues with VideoProvider discovered via CTS tests." into mnc-dev 2015-06-12 21:04:04 +00:00
Andrew Solovay
ecc50268d7 am 6243dfd9: Merge "docs: Added AfW videos to "Android for Work" landing page" into mnc-preview-docs
* commit '6243dfd9ab25dfd11d0e09cbe02e8a863ddafe07':
  docs: Added AfW videos to "Android for Work" landing page
2015-06-12 20:48:58 +00:00
Andrew Solovay
6243dfd9ab Merge "docs: Added AfW videos to "Android for Work" landing page" into mnc-preview-docs 2015-06-12 20:37:45 +00:00
Chris Craik
a766cb2bce Put WebViews with on a HW layer if stencil/shader clipping is needed
bug:17322378
Change-Id: I0de574bf116b30e2ad4194366e19d47d49708902
2015-06-12 13:34:58 -07:00
Amith Yamasani
bc9b102453 Merge "Update network state of apps leaving the whitelist" into mnc-dev 2015-06-12 20:26:43 +00:00
Amith Yamasani
06f0806bd5 Update network state of apps leaving the whitelist
Bug: 21787562
Change-Id: I9f45acc58ba0b4b6cfed08aecbf081a5f57eb217
2015-06-12 13:23:33 -07:00
Christopher Tate
1c24a8cd31 Merge "If we're out of space, retry background dexopting later" into mnc-dev 2015-06-12 20:23:29 +00:00
Chris Craik
b1f990de40 Fix roundrect clipping / blending ordering
bug:21803918

Also, don't consider rr clipped ops opaque, and put stage
checking behind a debug flag.

Change-Id: I9304ae571337a7cf835524682d1a590a21d30fa4
2015-06-12 13:20:37 -07:00
Christopher Tate
2c9655b3d4 If we're out of space, retry background dexopting later
Give it 4 hours to give the user time to do stuff, then retry;
repeat until we have space to work in.

Bug 20468442

Change-Id: Id4b11abcc38a9e2a50a062f0067a13ce0ae831ad
2015-06-12 13:06:45 -07:00
Alex Klyubin
6cb8e30bb7 Merge "Fix Android Keystore KeyPairGenerator for RSA PSS keys." into mnc-dev 2015-06-12 19:54:20 +00:00
Alex Klyubin
768695a899 Merge "Update Javadocs to reflect meaning of digest and padding NONE." into mnc-dev 2015-06-12 19:54:19 +00:00
Alex Klyubin
82d99f5b0b Merge "Obtain entropy later in crypto operations, when possible." into mnc-dev 2015-06-12 19:53:45 +00:00
Dianne Hackborn
e554cc9659 Merge "Implement some control over ALLOW_WHILE_IDLE alarms." into mnc-dev 2015-06-12 19:38:39 +00:00
Dianne Hackborn
3d1933c45f Implement some control over ALLOW_WHILE_IDLE alarms.
Since these alarms allow you to bypass the idle restrictions,
we don't want them to be so open-ended like other alarms.  This
implements a policy where the alarm manager will only deliver these
types of alarms every X minutes to each application.  For this
initial implementation, X is 1 minute under normal operation and
15 minutes when in idle mode.

To do this, I needed to introduce a new internal allow-while-idle
flag for system alarms, which applications can't get, and doesn't
have these new restrictions.

Also tweaked how the alarm manager handles the alarm window, so it
doesn't change if the alarm gets rescheduld; the window is now always
what as computed based on the time when the alarm was first
given to it.

Finally, fix TimeUtils to be able to correctly print times that
are > 999 days.

Change-Id: Ibad8c6a7c14b0624b54e82267be23224b4c31e84
2015-06-12 12:37:35 -07:00
Chris Wren
17de4b2a73 Merge "remove usage of deprecated method setLatestEventInfo" into mnc-dev 2015-06-12 19:28:54 +00:00
Alex Klyubin
7c475cc7c3 Fix Android Keystore KeyPairGenerator for RSA PSS keys.
This fixes a bug where key pair generation fails for RSA signing keys
which are not authorized for PKCS#1 signature padding, such as keys
authorized only for the RSA PSS signature padding scheme.

The issue was that the KeyPairGenerator was failing when attempting to
sign the self-signed certificate (needed by Android Keystore) using
PKCS#1 padding for which such keys are not authorized. The solution is
to not attempt to sign these certificates and instead use a fake
signature.

Bug: 21809600
Change-Id: I4f04fcf78174937046d2534e0485c6940eae673f
2015-06-12 12:22:58 -07:00
Rubin Xu
6161eb3494 Merge "Update doc of ACTION_PROVISION_MANAGED_DEVICE" into mnc-dev 2015-06-12 18:27:45 +00:00
Christopher Tate
3c45863649 Use HTTPS when fetching app link verification resources
Bug 20016932

Change-Id: I30b4e052795551f3048b3adf29cd89ec0501fce8
2015-06-12 11:25:52 -07:00
dcashman
465ef5c439 Don't use upgrade-key-sets check when scanning during boot.
Apps may specify upgrade-key-sets which are different than their current signing
keys to prevent a future upgrade with the current set of keys.  Every package is
re-scanned on boot, however, so the existing application would violate its own
recorded upgrade-key-sets.  Change the key verification check to ignore
upgrade-key-sets on boot.  Also default to the same-sig checks if the
upgrade-key-set meta-data has been corrupted.

Bug: 21785716
Change-Id: I5c0c1e2017ec780a745a74488620bfe95b052269
2015-06-12 11:18:50 -07:00
Chris Craik
816870bfd7 Merge "Revert to save-layer based alpha if layer would be too large" into mnc-dev 2015-06-12 18:16:53 +00:00
Chris Craik
4e9d9b2a59 Revert to save-layer based alpha if layer would be too large
bug:21011574
Change-Id: I323f2398188ffc2bbed6a98578d25d7e5f6c337d
2015-06-12 11:07:23 -07:00
Yorke Lee
f43b0e09dc Merge "Fix typo in Call.Details.propertiesToString" into mnc-dev 2015-06-12 17:53:41 +00:00
Amith Yamasani
ffff74abb1 Merge "Report app standby state to batterystats" into mnc-dev 2015-06-12 17:52:55 +00:00
Nick Chalko
1bccd280f5 Improve javadoc for onTune and notifyVideoAvailable.
Bug: 21276782
Change-Id: If445379e83dbde8daaa4be7819b9399bfe1d96a0
2015-06-12 10:52:38 -07:00
Rich Slogar
afb19e27cc am 726db0af: Merge "docs: sdk tools 24.3.2 download updates" into mnc-preview-docs
* commit '726db0aff535e7e734426c6c33ae2c5443e34fa5':
  docs: sdk tools 24.3.2 download updates
2015-06-12 17:40:29 +00:00
Alex Klyubin
a72b55195c Obtain entropy later in crypto operations, when possible.
This makes Android Keystore crypto operations defer pulling entropy
from provided SecureRandom until KeyStore.finish, where appropriate.
Such as when performing asymmetric encryption or generating
signatures.

Bug: 18088752
Change-Id: I4a897754e9a846214cf0995c5514f98cf0edd76b
2015-06-12 10:35:46 -07:00
Przemyslaw Szczepaniak
7ae22652a5 Merge "Fixes for API Review: android.speech.tts" into mnc-dev 2015-06-12 17:34:13 +00:00
Przemyslaw Szczepaniak
f77b2de1a9 Fixes for API Review: android.speech.tts
Bug: 21571893
Change-Id: Icd25f4aa9a465050c7410c7bfec004a71ba24548
2015-06-12 18:32:13 +01:00
Rich Slogar
726db0aff5 Merge "docs: sdk tools 24.3.2 download updates" into mnc-preview-docs 2015-06-12 17:26:58 +00:00
Wei Wang
ebf6fc60b5 Merge "Stops BLE scan when scan only mode is disabled." into mnc-dev 2015-06-12 17:20:34 +00:00
Yorke Lee
be2a4a248c Fix typo in Call.Details.propertiesToString
Change-Id: I7bb52138912fddef20862f5f7a29a8ec2e0a1d66
2015-06-12 10:10:55 -07:00
Jeff Sharkey
54b65ff300 Merge "Annotate ContentProviderClient arguments." into mnc-dev 2015-06-12 16:57:56 +00:00
Jeff Sharkey
73ed509d44 Annotate ContentProviderClient arguments.
Explicitly mark if they're @Nullable or @NonNull.

Bug: 21560515
Change-Id: Id0a208a38c5a9ea19dddbe60c65d285645d08bb0
2015-06-12 09:49:31 -07:00
Tyler Gunn
84f381b4eb Correct issues with VideoProvider discovered via CTS tests.
While authoring the CTS tests I discovered a few issues with the
VideoProvider.
1. The VideoProvider's default handler should be on the main Looper,
similar to other Telecom components.
2. When calling IVideoCallbacks, the try/catch for RemoteExceptions was
around the for-loop which iterates over the various VideoCallbacks.  If
one was to fail, the other VideoCallbacks would not be called.
3. The mVideoCallbacks hashmap should use a ConcurrentHashMap; in CTS
tests I ran into a few concurrency exceptions related to the various
InCallServices registering callbacks while other methods on the provider
were being called.

Bug: 21802841
Change-Id: Ib0d46daf03554309044e9efaa991a15cb2c4b46b
2015-06-12 09:39:47 -07:00
Dianne Hackborn
8a435ced67 Merge "Fix APIs." into mnc-dev 2015-06-12 16:34:38 +00:00
Diego Perez
ce5a79dacf am d717682d: am 5c597c1d: am a8854564: am ce4a9d91: Merge "New custom widgets library" into lmp-mr1-dev
* commit 'd717682df97e812d4a25f93b0c9e84548767d8e1':
  New custom widgets library
2015-06-12 16:29:59 +00:00
Diego Perez
5a53816b0d am c051c556: am e10e8005: am 68155986: am f5a99437: Merge "Fix crash when shadowSize is 0" into lmp-mr1-dev
* commit 'c051c556669f88e284f2922f8d28fad2138598ae':
  Fix crash when shadowSize is 0
2015-06-12 16:29:54 +00:00
Prashant Malani
a8cff2acb7 am 327b481f: (-s ours) am 786cd12f: (-s ours) Merge "DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"" into lmp-mr1-modular-dev
* commit '327b481f1f2499eaa5ab938e63a2c12c21fe7482':
  DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"
2015-06-12 16:29:47 +00:00