195594 Commits

Author SHA1 Message Date
Alex Klyubin
a5e21f0ee2 Prefer GCM to CBC or CTR in documentation.
Bug: 21786749
Change-Id: If3824d1321ef1d8730d4384717b0c25d43518fe4
2015-06-17 11:24:45 -07:00
Selim Cinek
6857ffc940 Merge "Fixed a jump with the panel scrim" into mnc-dev 2015-06-17 18:23:08 +00:00
Eino-Ville Talvala
d3e39d16cb Camera2: Do not throw unexpected runtime exception to app
Use a generic CameraAccessException DEVICE_ERROR exception instead

Bug: 21869917
Change-Id: I73581b817cbdcbb4b876c234f050f725a459a29b
2015-06-17 11:18:43 -07:00
Jason Monk
f582027663 Merge "Don't reinflate signal icons unless we really need to." into mnc-dev 2015-06-17 18:17:18 +00:00
Junda Liu
a5aabfebca Merge "Add carrier config variable to hide sim lock setting ui." into mnc-dev 2015-06-17 18:11:03 +00:00
Alex Klyubin
83cc7a347f Improve documentation for keys requiring user auth.
Bug: 18088752
Change-Id: I24eeb33790a74d8d81d10fcdb1eb058d47144c44
2015-06-17 11:08:29 -07:00
Chien-Yu Chen
0782aab077 ImageReader: Fix format workarounds for legacy devices
Legacy shim overrides HAL_PIXEL_FORMAT_BLOB to
HAL_PIXEL_FORMAT_RGBA_8888. Make ImageReader aware of the
workaround when returning the format.

Remove the workaround in legacy shim that overrides YUV_420_888
to YV12 because allocating YUV_420_888 buffers with SW access
is supported on Flo.

Bug: 21707937
Change-Id: I84a8610c82ae986a0064873f611e4f257baf1774
2015-06-17 11:03:04 -07:00
Chien-Yu Chen
563d60e03f Merge "Camera2: Handle getting input surface failures" into mnc-dev 2015-06-17 18:02:31 +00:00
Zhijun He
0f70c41551 Merge "Camera2: fix high speed request builder creation issue" into mnc-dev 2015-06-17 18:00:17 +00:00
Alex Klyubin
4250c8d643 Merge "Expose AES GCM backed by Android Keystore." into mnc-dev 2015-06-17 17:58:35 +00:00
Yigit Boyar
5ddaa72b9a Merge "Handle negative view types properly in getScrapView" into mnc-dev 2015-06-17 17:58:27 +00:00
Junda Liu
e15cca771c Add carrier config variable to hide sim lock setting ui.
Bug: b/19623656
Change-Id: Iee9efcdefe5cdda2adae03f0852ff2b53e75698f
2015-06-17 10:57:23 -07:00
Alex Klyubin
2723d49a18 Merge "Drop support for P-192 EC keys." into mnc-dev 2015-06-17 17:54:36 +00:00
Paul McLean
d4bd4e7ffc Merge "Map >= 24bit encodings to ENCODING_PCM_FLOAT" into mnc-dev 2015-06-17 17:53:35 +00:00
Alex Klyubin
bf5c91c8cd Drop support for P-192 EC keys.
The minimum EC keys size is now 224 bit. This is because keymaster 1.0
does not support EC keys smaller than 224 bit.

Bug: 18088752
Change-Id: I8010ff2d6ccaeea7dcf86f697aee1d9ebd683cb2
2015-06-17 10:51:19 -07:00
Paul McLean
4e5e9e9405 Map >= 24bit encodings to ENCODING_PCM_FLOAT
Bug: 21851140
Change-Id: I8203281f5ca7d194e1bd2f417e75d3ef2fd561c7
2015-06-17 10:44:56 -07:00
Mady Mellor
5279d11f25 Merge "Drag to select text: add some slop for moving between lines" into mnc-dev 2015-06-17 17:36:31 +00:00
Mady Mellor
f05228822c Merge "Insertion cursor: add some slop for moving between lines" into mnc-dev 2015-06-17 17:00:10 +00:00
Jason Monk
f535cf0413 Don't reinflate signal icons unless we really need to.
Bug: 21791609
Change-Id: I5eb1b890f2298211b25afa0e2570f0ab49a45e0b
2015-06-17 12:52:43 -04:00
Alan Viverette
8d537051c1 Merge "Split control background into 40dp and 32dp diameter versions" into mnc-dev 2015-06-17 16:50:27 +00:00
Mady Mellor
ee3821e565 Insertion cursor: add some slop for moving between lines
Applying same method to insertion cursor as the text selection drag
handles to improve moving along lines.

Basically adds some slop above / below the current line and only
allows you to change lines if you move outside of that.

Bug: 21306433
Change-Id: I6c7f3a496fbd1ea66936832f96325736cea872aa
2015-06-17 09:48:38 -07:00
Seigo Nonaka
ec928651cc Allow apps to hide the soft keyboard even in a transient state.
Since I69b88989ae4d0fe056e9ab8d67d0a955dd10e6d9, we have
asserted that the following test cases can pass with CTS.

    assertTrue(imm.showSoftInput(
            view, InputMethodManager.SHOW_IMPLICIT));
    assertTrue(imm.hideSoftInputFromWindow(token, 0));

This CL fixes the test failure caused by
I33dc6278fd892f26e56352722bf9449b8b102030 in the above
CTS case.

Note that the test failure occurs only when the application
tries to close the software keyboard during IMMS#mInputShown
and IMMS#mImeWindowVis are in a transiently inconsistent
state.

Bug: 21727232
Change-Id: I195a9f9644583cb1172f48801e87273ad8def850
2015-06-18 01:48:09 +09:00
Mady Mellor
f9f8aebdc6 Drag to select text: add some slop for moving between lines
It's pretty easy to accidentally move to a different line when
selecting text. This CL makes an adjustment so that if the user
is on a line, they must move above the top of it + slop to move
up a line, and they must move below the bottom of it + slop to move
down a line. This applies the changes to the drag accelerator.

This CL also makes an adjustment to not apply the finger offset
to the drag accelerator until the user has moved lines, this was
causing an issue where it would immediately include the above line
when initiating the selection.

Bug: 21306433
Bug: 21303943
Change-Id: Id240136493f62524fe6445d8bd65479084fe8126
2015-06-17 09:46:01 -07:00
Quddus Chong
5c7b9495fb am 93bd8134: am eae09b4a: Merge "docs: Updated Android TV landing page and Live TV training to support channels. bug: 21786387" into mnc-preview-docs
* commit '93bd81346de88f850f4e4002229a3119c97d8ddb':
  docs: Updated Android TV landing page and Live TV training to support channels. bug: 21786387
2015-06-17 16:36:17 +00:00
Jeff Tinker
314b7f3af3 Improve robustness of MediaDrm after mediaserver crash
If DEAD_OBJECT is returned from binder calls due to
mediaserver crash, throw new MediaDrmResetException.
This allows the app to detect the condition and handle
it properly.

bug: 20614102
Change-Id: Id08b08fb612672fd94383f0470f5fa3f267b944f
2015-06-17 09:32:58 -07:00
Mady Mellor
13e54ff0eb Merge "Text selection: add some slop for moving between lines" into mnc-dev 2015-06-17 16:30:19 +00:00
Mady Mellor
cc65c37f10 Text selection: add some slop for moving between lines
It's pretty easy to accidentally move to a different line when
selecting text. This CL makes an adjustment so that if the user
is on a line, they must move above the top of it + slop to move
up a line, and they must move below the bottom of it + slop to move
down a line.

This CL also makes a small modification to check if the layout is
null and return early which simplifies some of the following code.

Bug: 21306433
Change-Id: I4a854e644faafaf1e159201ae1f2838862f16b25
2015-06-17 09:25:19 -07:00
Alex Klyubin
00af27b7d9 Expose AES GCM backed by Android Keystore.
Bug: 18088752
Bug: 21786749
Change-Id: Ica90491037d2920f7635195894ba18882fc4406d
2015-06-17 09:24:06 -07:00
Quddus Chong
93bd81346d am eae09b4a: Merge "docs: Updated Android TV landing page and Live TV training to support channels. bug: 21786387" into mnc-preview-docs
* commit 'eae09b4a642bb30d5fd8ff90796e410197d71c95':
  docs: Updated Android TV landing page and Live TV training to support channels. bug: 21786387
2015-06-17 16:23:38 +00:00
Zhijun He
a002fb4df4 Camera2: fix high speed request builder creation issue
The metadata local copy was mutated (swapped) to an empty copy after use,
we need make a copy every time.

Bug: 21442271
Change-Id: I8a71663ba964288bdd1d7f50b42db762d28d89c0
2015-06-17 09:23:22 -07:00
Geoff Mendal
71e5d535a8 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-17 16:19:17 +00:00
Geoff Mendal
aa19f8fb1a Import translations. DO NOT MERGE
Change-Id: I4ac364b0a987a0546be8c0c9b606ee7ad85a7320
Auto-generated-cl: translation import
2015-06-17 09:14:37 -07:00
Quddus Chong
eae09b4a64 Merge "docs: Updated Android TV landing page and Live TV training to support channels. bug: 21786387" into mnc-preview-docs 2015-06-17 16:13:21 +00:00
Leon Scroggins III
2a6d6e5047 Fixes for Region_writeToParcel.
Check the return value of Parcel::writeInplace. If it is NULL, there
was a failure, so do not attempt to write to it. Instead, report the
error and return false.

If SkRegion::writeToMemory claims to have written a different amount of
memory than it claimed it needed, report that error as well.

Change uses of NULL in this function to nullptr.

BUG:21271229
BUG:20666821
Change-Id: Ia6160f74f30bf42f5ff97f716dadb01d1f0d6961
2015-06-17 11:56:43 -04:00
Andy Hung
2d2d89363f AudioTrack.Builder should throw exception on failure.
Should throw UnsupportedOperationException instead of returning
an uninitialized track object.

Bug: 21890643
Change-Id: I34df73b316fcb490be05eb3beff06b795645fd4c
2015-06-17 08:43:43 -07:00
Chris Wren
3d2b621204 Merge "high-frequency notification stats." into mnc-dev 2015-06-17 15:43:41 +00:00
Chris Wren
5eab2b72af high-frequency notification stats.
Aggregate and then periodically report stats that are high-frequency
because they are driven by app behavior, not user behavior.

Reuse the NotificationUsageStats facility.
Remove redundant stats.
Lessen memory foot print.
Enable in-memeory aggregates with small, bounded memory footprint.

Bug: 20258744
Change-Id: I87e391419c53917fa13c68a56f8cdb40a7c8e548
2015-06-17 11:42:45 -04:00
Andy Hung
e244922aba AudioRecord.Builder should throw exception on failure.
Should throw UnsupportedOperationException instead of returning
an uninitialized record object.

Bug: 21890643
Change-Id: I9c05a4cff9f5e1d5513c76acace09699a567008f
2015-06-17 08:40:53 -07:00
Chris Manton
ca16a79b18 Add keys to handle GSM and CDMA roaming/non roaming overrides
bug: 20828356

Change-Id: Icb5ad25e213771554915bd9479a4a66b4f4a6906
2015-06-17 08:25:48 -07:00
Luan Nguyen
e58848086a am 0752aa54: am 5cef09b0: Merge "docs: Update JavaDoc links for Watch Face class." into mnc-preview-docs
* commit '0752aa54a03b39e2a16e6f40e4d7cf912a29bd08':
  docs: Update JavaDoc links for Watch Face class.
2015-06-17 15:14:32 +00:00
Luan Nguyen
1824ea1b1c am ce26f291: am 5980ae8f: Merge "docs: Update JavaDoc reference links for Create Wearable Apps class" into mnc-preview-docs
* commit 'ce26f2911361fe1da9d3f350e2785657d6d5e685':
  docs: Update JavaDoc reference links for Create Wearable Apps class
2015-06-17 15:14:27 +00:00
Luan Nguyen
871c5cb52d am 474b4775: am d548b29d: Merge "docs: Update JavaDoc ref links for UI training." into mnc-preview-docs
* commit '474b4775edb0154ad8f5b85a53fb2c689de69b40':
  docs: Update JavaDoc ref links for UI training.
2015-06-17 15:14:22 +00:00
Benjamin Franz
1046ba518b Add DISALLOW_CREATE_WINDOWS to Device Owner only user restrictions
Even though the documentation of DISALLOW_CREATE_WINDOWS says it is for
Device Owners and Profile Owners on User 0 only, it was previously not
part of DEVICE_OWNER_USER_RESTRICTIONS and was therefore callable from
a profile owner on a managed profile or secondary user.

Bug: 19726884
Change-Id: If6443eacbc28b7ee6c0845754923573a79f8bde3
2015-06-17 16:13:31 +01:00
Luan Nguyen
0752aa54a0 am 5cef09b0: Merge "docs: Update JavaDoc links for Watch Face class." into mnc-preview-docs
* commit '5cef09b07521cf14eb6a9c9dc59276b9b6482bef':
  docs: Update JavaDoc links for Watch Face class.
2015-06-17 15:03:04 +00:00
Luan Nguyen
ce26f29113 am 5980ae8f: Merge "docs: Update JavaDoc reference links for Create Wearable Apps class" into mnc-preview-docs
* commit '5980ae8f06d5a56a5bfc763729533d975079b801':
  docs: Update JavaDoc reference links for Create Wearable Apps class
2015-06-17 15:02:59 +00:00
Luan Nguyen
474b4775ed am d548b29d: Merge "docs: Update JavaDoc ref links for UI training." into mnc-preview-docs
* commit 'd548b29def4006c0a19df090189198e51715bccd':
  docs: Update JavaDoc ref links for UI training.
2015-06-17 15:02:55 +00:00
Luan Nguyen
5cef09b075 Merge "docs: Update JavaDoc links for Watch Face class." into mnc-preview-docs 2015-06-17 14:55:45 +00:00
Luan Nguyen
5980ae8f06 Merge "docs: Update JavaDoc reference links for Create Wearable Apps class" into mnc-preview-docs 2015-06-17 14:54:51 +00:00
Luan Nguyen
d548b29def Merge "docs: Update JavaDoc ref links for UI training." into mnc-preview-docs 2015-06-17 14:54:30 +00:00
Geoff Mendal
641234c172 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-17 13:58:40 +00:00