198884 Commits

Author SHA1 Message Date
Dianne Hackborn
2712ce948a am 6e2fb78f: am e554cc96: Merge "Implement some control over ALLOW_WHILE_IDLE alarms." into mnc-dev
* commit '6e2fb78fbe3ce50182f0ad928748aeada57a44cf':
  Implement some control over ALLOW_WHILE_IDLE alarms.
2015-06-12 19:54:28 +00:00
Chris Wren
604f6cf113 am 63cae6c8: am 17de4b2a: Merge "remove usage of deprecated method setLatestEventInfo" into mnc-dev
* commit '63cae6c8caa77b6b1cdc45423ed6ec771f6c485b':
  remove usage of deprecated method setLatestEventInfo
2015-06-12 19:54:23 +00: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
Chris Tate
396b83b0c8 Merge "Fix overflow/underflow problem in comparison" 2015-06-12 19:52:45 +00:00
Dianne Hackborn
6e2fb78fbe am e554cc96: Merge "Implement some control over ALLOW_WHILE_IDLE alarms." into mnc-dev
* commit 'e554cc96597d4b738f14a1514772e4d49e78c542':
  Implement some control over ALLOW_WHILE_IDLE alarms.
2015-06-12 19:41:22 +00:00
Chris Wren
63cae6c8ca am 17de4b2a: Merge "remove usage of deprecated method setLatestEventInfo" into mnc-dev
* commit '17de4b2a73996366ff3d7759793a6809654caebe':
  remove usage of deprecated method setLatestEventInfo
2015-06-12 19:41:17 +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
b8fd9182d6 am 23d5a49b: am 6161eb34: Merge "Update doc of ACTION_PROVISION_MANAGED_DEVICE" into mnc-dev
* commit '23d5a49bf3a36f0431154ecc4d8776a3d44e94d0':
  Update doc of ACTION_PROVISION_MANAGED_DEVICE
2015-06-12 18:54:19 +00:00
Chris Craik
623b8b1d65 am 95dc7db4: am 816870bf: Merge "Revert to save-layer based alpha if layer would be too large" into mnc-dev
* commit '95dc7db4778b42a75517a9729e12b945bfc3817d':
  Revert to save-layer based alpha if layer would be too large
2015-06-12 18:40:59 +00:00
Rubin Xu
23d5a49bf3 am 6161eb34: Merge "Update doc of ACTION_PROVISION_MANAGED_DEVICE" into mnc-dev
* commit '6161eb3494837cb7031b940e02fcbf5449e5be77':
  Update doc of ACTION_PROVISION_MANAGED_DEVICE
2015-06-12 18:39:42 +00:00
Rubin Xu
6161eb3494 Merge "Update doc of ACTION_PROVISION_MANAGED_DEVICE" into mnc-dev 2015-06-12 18:27:45 +00:00
Chris Craik
95dc7db477 am 816870bf: Merge "Revert to save-layer based alpha if layer would be too large" into mnc-dev
* commit '816870bfd72d5d21a99ece0797c8b37382f16661':
  Revert to save-layer based alpha if layer would be too large
2015-06-12 18:24:15 +00: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
Yorke Lee
10a6c0ba70 am 66c24888: am f43b0e09: Merge "Fix typo in Call.Details.propertiesToString" into mnc-dev
* commit '66c24888cea49302f4a3f4f75ffe753086710e4c':
  Fix typo in Call.Details.propertiesToString
2015-06-12 18:18:02 +00:00
Amith Yamasani
db589a3d0d am dc0df828: am ffff74ab: Merge "Report app standby state to batterystats" into mnc-dev
* commit 'dc0df828a2d93828696cf6b09e02de0af5717cb4':
  Report app standby state to batterystats
2015-06-12 18:17:58 +00: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
66c24888ce am f43b0e09: Merge "Fix typo in Call.Details.propertiesToString" into mnc-dev
* commit 'f43b0e09dc6e0d4eb66f6d0e44372ed285a7a2b1':
  Fix typo in Call.Details.propertiesToString
2015-06-12 18:05:22 +00:00
Amith Yamasani
dc0df828a2 am ffff74ab: Merge "Report app standby state to batterystats" into mnc-dev
* commit 'ffff74abb13ad8c0e25175bd361d570a8e5e1406':
  Report app standby state to batterystats
2015-06-12 18:05:18 +00:00
Przemyslaw Szczepaniak
4dcde911de am 1bb6ee4a: am 7ae22652: Merge "Fixes for API Review: android.speech.tts" into mnc-dev
* commit '1bb6ee4a938a6d8a032f0f8947ff9a44bea999cd':
  Fixes for API Review: android.speech.tts
2015-06-12 17:58:30 +00: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
Wei Wang
abb46992eb am 2f263d1f: am ebf6fc60: Merge "Stops BLE scan when scan only mode is disabled." into mnc-dev
* commit '2f263d1fa7352b45d86db2203d2546bdb27437c3':
  Stops BLE scan when scan only mode is disabled.
2015-06-12 17:45:45 +00:00
Przemyslaw Szczepaniak
1bb6ee4a93 am 7ae22652: Merge "Fixes for API Review: android.speech.tts" into mnc-dev
* commit '7ae22652a5c48f0d2590b8caf2ea9e040c2f0023':
  Fixes for API Review: android.speech.tts
2015-06-12 17:45:30 +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
Wei Wang
2f263d1fa7 am ebf6fc60: Merge "Stops BLE scan when scan only mode is disabled." into mnc-dev
* commit 'ebf6fc60b51ecf27f0a8f2c062a4644a4174b187':
  Stops BLE scan when scan only mode is disabled.
2015-06-12 17:32:54 +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
Jeff Sharkey
551ca4ffc4 am 05107ddf: am 54b65ff3: Merge "Annotate ContentProviderClient arguments." into mnc-dev
* commit '05107ddf2069f3ea0d8ef01d20d6bc4d65addc7a':
  Annotate ContentProviderClient arguments.
2015-06-12 17:31:46 +00:00
Dianne Hackborn
ccd6d0c14d am d55860d9: am 8a435ced: Merge "Fix APIs." into mnc-dev
* commit 'd55860d990587509f0e9624c44494172f3e24714':
  Fix APIs.
2015-06-12 17:31:21 +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
05107ddf20 am 54b65ff3: Merge "Annotate ContentProviderClient arguments." into mnc-dev
* commit '54b65ff3004a1585867e8c3c4d267b381123e179':
  Annotate ContentProviderClient arguments.
2015-06-12 17:09:41 +00:00
Jeff Sharkey
54b65ff300 Merge "Annotate ContentProviderClient arguments." into mnc-dev 2015-06-12 16:57:56 +00:00
Chet Haase
2af689dfb7 am b5ac26ea: am 3d1f7c26: Merge "Clarify Drawable.getOpacity() docs" into mnc-dev
* commit 'b5ac26ead2bc6ee1162371aab0557c5c77a765a1':
  Clarify Drawable.getOpacity() docs
2015-06-12 16:50:55 +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
Dianne Hackborn
d55860d990 am 8a435ced: Merge "Fix APIs." into mnc-dev
* commit '8a435ced674562b827f91800317a89056e050b15':
  Fix APIs.
2015-06-12 16:47:44 +00: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
Chet Haase
b5ac26ead2 am 3d1f7c26: Merge "Clarify Drawable.getOpacity() docs" into mnc-dev
* commit '3d1f7c26be89a252c6e83c0b813df27295d06212':
  Clarify Drawable.getOpacity() docs
2015-06-12 16:34:27 +00:00
Svetoslav
16c31a77f7 am 49717697: am 34c7bd7c: am 74e04083: am 07264d93: am 18fb1c92: (-s ours) am bf0652ee: DO NOT MERGE Don\'t take flags when creating app widget config activity.
* commit '497176975f59a939f12feefb31f2f02560b6f265':
  DO NOT MERGE Don't take flags when creating app widget config activity.
2015-06-12 16:29:03 +00:00
Chet Haase
3d1f7c26be Merge "Clarify Drawable.getOpacity() docs" into mnc-dev 2015-06-12 16:24:31 +00:00
Alex Klyubin
88fc537102 am d3f2657e: am 738241f9: Merge "Document that DownloadManager supports HTTPS." into mnc-dev
* commit 'd3f2657ee3655eb07d3772d6ce0b7fdbfe2cf48d':
  Document that DownloadManager supports HTTPS.
2015-06-12 16:22:43 +00:00
Chet Haase
96a443b58d Clarify Drawable.getOpacity() docs
Docs for translucent-vs-transparent-vs-opaque were confusing, especially since
the definition for those constants in PixelFormat are not the same as how they're
actually used in Drawable. This fix simply adds clarifying text to the method
comment for getOpacity().

Issue #21158891  Better document Drawable#getOpacity

Change-Id: I94725592f85e5d7874e3a3ac1c5bab969163fbf0
2015-06-12 17:21:31 +01:00