186531 Commits

Author SHA1 Message Date
Alex Klyubin
d23a1f706f Symmetric key generation for AndroidKeyStore.
This currently supports AES and HMAC with SHA-256.

Bug: 18088752
Change-Id: Ife55438cf4129b895295681bb35091cd37eb73fb
2015-03-27 15:57:53 -07:00
Elliott Hughes
6fd63402f5 Merge "Document that Time doesn't support pseudo-zones." 2015-03-27 22:45:09 +00:00
Adrian Roos
a6f428545c Merge "Add emergency assistance API and setting" 2015-03-27 22:18:40 +00:00
Elliott Hughes
5c955ee541 Document that Time doesn't support pseudo-zones.
Bug: 19110194
Change-Id: I653b7dc46d5f15da70435f6bddd49042f4d03b54
2015-03-27 15:18:12 -07:00
Yin-Chia Yeh
c889098e46 Merge "Camera: codegen doc update" 2015-03-27 21:50:42 +00:00
Yin-Chia Yeh
d49ebcc3ad Camera: codegen doc update
Bug: 19966527
Change-Id: I47c450d5661374c0a51d02bb79fccff1d26338f7
2015-03-27 14:48:45 -07:00
Alex Klyubin
d880dc2fb2 am 274a4ee3: Merge "Symmetric key import for AndroidKeyStore."
* commit '274a4ee3446e76a34a9cfe987e98f7bf4e53f78d':
  Symmetric key import for AndroidKeyStore.
2015-03-27 21:42:08 +00:00
Chad Brubaker
dbd9a4b651 Merge "Allow entropy to be provided to some operations" 2015-03-27 21:38:44 +00:00
Chad Brubaker
dae79e5408 Allow entropy to be provided to some operations
generateKey and begin can now optionally take an array of bytes to add
to the rng entropy of the device before the operation. If entropy is
specified and the device does not support add_rng_entropy or the call
fails then that device will not be used, leading to fallback or error
depending on the situation.

Change-Id: Id7d33e3cc959594dfa5483d002993ba35c1fb134
2015-03-27 14:28:35 -07:00
Adrian Roos
943eb8654f Add emergency assistance API and setting
Bug: 19841649
Change-Id: I5bc99df6d85eb84b253456e32ce52afd7592a95e
2015-03-27 21:26:46 +00:00
Bart Sears
c03cfc9d86 am d4c3ef87: am 4a26c391: Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev
* commit 'd4c3ef87f8aaef9eb5ec66856dffc9eca5537573':
  CEC: Explicitly turn on screen for remote control passthrough
2015-03-27 21:23:01 +00:00
Bart Sears
d4c3ef87f8 am 4a26c391: Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev
* commit '4a26c391d08dfa6a3c189293f0fc163b817b1b49':
  CEC: Explicitly turn on screen for remote control passthrough
2015-03-27 21:14:37 +00:00
John Spurlock
15427f80bb Merge "AudioService: Observe changes to output devices per-stream." 2015-03-27 21:13:41 +00:00
John Spurlock
0f09c3d0b6 Merge "Fix a few found doc problems." 2015-03-27 21:13:22 +00:00
Wenchao Tong
98170b0db1 Keep debug information in NetworkStats files
Create two special SETs.

SET_DBG_VPN_IN is used by individual applications to know
how much traffic of the NetworkIdentity was actually moved
from a VPN app.
SET_DBG_VPN_OUT is used by the VPN app to know how much
traffic of the NetworkIdentity was deducted.

A debug application can restore the raw stats by these
entries.
  raw_traffic = recorded_entry (TAG_NONE, SET_ALL)
              + recorded_entry (TAG_NONE, SET_DBF_VPN_OUT)
              - recorded_entry (TAG_NONE, SET_DBF_VPN_IN)

The two debug SETs are not returned by
NetworkStatsService.openSession(). These debug entries are
retrieved by NetworkStatsCollection.dump().

Bug: 19536273
Change-Id: I03ef9f7667f5f2f48cbe3f6b11447fe7ead8ad3b
2015-03-27 13:49:13 -07:00
Bart Sears
4a26c391d0 Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev 2015-03-27 20:48:38 +00:00
Wenchao Tong
041ca26d02 Merge "Create a Benchmark test for NetworkStats." 2015-03-27 20:43:34 +00:00
Mike Lockwood
5781cd5b21 Make the MIDI Manager optional, enabled by "android.software.midi" feature
Change-Id: I76d442ea28beea4b9e2876bfef501d8f61403702
2015-03-27 13:23:41 -07:00
Alex Klyubin
274a4ee344 Merge "Symmetric key import for AndroidKeyStore." 2015-03-27 19:21:13 +00:00
John Reck
edc524c905 Add GraphicsStatsService
More S's for More Speed

Split JankTracker's backing data from the
class to allow for data relocation to/from ashmem regions

Pack the jank tracking data to fit in 256 bytes

Change-Id: Ife86a64b71a328fbd0c8075fe6a0404e081f725b
2015-03-27 11:50:56 -07:00
Chris Wren
a2e94c8543 Merge "add a metrics logger" 2015-03-27 18:36:33 +00:00
Andres Morales
fb5dcacf41 Merge "Add system prop to track if oem unlock is allowed" 2015-03-27 18:18:30 +00:00
Raph Levien
71cbc72e70 Record hyphens from Minikin and draw them
This patch plumbs up hyphens computed in Minikin's LineBreaker,
records them in a new column in StaticLayout, and draws them.
DynamicLayout mirrors the new column, and TextLine is also changed to
make sure the hyphen is only drawn for the last run in a line.

There is a rather primitive mechanism for loading hyphenation
patterns, for testing only at this point.

Change-Id: Ib208568c0f6cff12cf834047500ec1da9ea9f430
2015-03-27 11:13:25 -07:00
Wale Ogunwale
843bfb9e47 Fix not persisting activities with FLAG_ACTIVITY_RETAIN_IN_RECENTS.
Bug: 17566588
Change-Id: Ifd64b0f5da68a79918820f120f09480aab25da73
2015-03-27 11:10:06 -07:00
Alan Viverette
acc6241da9 Merge "Only verify resolved theme attributes" 2015-03-27 18:03:08 +00:00
Adrian Roos
0043caf5bc Merge "Properly unregister TrustAgentWrapper's broadcast receiver" 2015-03-27 18:00:07 +00:00
Alan Viverette
ee7c65d539 Only verify resolved theme attributes
Bug: 19962473
Change-Id: I62eb2faea7b09fd483194b41e815179cb2141fcb
2015-03-27 10:57:34 -07:00
Alan Viverette
92d8b334e4 Merge "Clean up lint warnings in Resources" 2015-03-27 17:46:50 +00:00
Alan Viverette
a8636c9414 Clean up lint warnings in Resources
Change-Id: I28dff6f293c5b6c24fc451f282d11d648042d5dd
2015-03-27 10:44:39 -07:00
Chris Wren
161155145e add a metrics logger
Change-Id: I5b1dccb5d103ece3112acf38889bae16273b092f
2015-03-27 13:42:28 -04:00
ztenghui
0b9f855f8d Merge "Use AVD for checkbox animation." 2015-03-27 17:28:12 +00:00
Kris Giesing
7a2721bd59 Merge "Allow override of Motoya with full NotoSans" 2015-03-27 17:20:33 +00:00
Abodunrinwa Toki
1e650e26a7 Merge "New floating toolbar implementation for secondary action mode views." 2015-03-27 17:16:59 +00:00
Skuhne
4bc50fd772 Merge "Unopened tasks should show the fullscreen item in recents" 2015-03-27 17:08:27 +00:00
Tim Volodine
6e3d794b90 Merge "Invoke geolocation permissions callback with denied state by default." 2015-03-27 16:45:26 +00:00
Abodunrinwa Toki
0c7ed2886e New floating toolbar implementation for secondary action mode views.
Change-Id: I04d179576290f1b107b3777287d81f149e16e658
2015-03-27 15:48:13 +00:00
Alex Klyubin
545ebdefd2 Merge "Unhide public API about cleartext traffic policy." 2015-03-27 15:23:04 +00:00
Skuhne
5c143e7ead Unopened tasks should show the fullscreen item in recents
BUG: 19947524
Change-Id: I83d2143f312ed016264c8bc54fda31720100ff1f
2015-03-27 07:15:16 -07:00
Flavio Lerda
0f9d0fa125 Merge "Dump sharedLibraryFiles in a readable way." 2015-03-27 13:00:46 +00:00
Raph Levien
63fa14bdfb Merge "Calculate line breaks using Minikin" 2015-03-27 05:59:15 +00:00
Raph Levien
c94f742f7e Calculate line breaks using Minikin
This patch moves the calculation of line breaks for StaticLayout into
the new LineBreaker class provided by Minikin. This specific patch
should preserve existing functionality, but perhaps performance is
better, and the movement opens the door to much more sophisticated
line-breaking.

Change-Id: Iafccb9da4e3559bbeaeb2c7c85f86ddfd8ae2fa1
2015-03-26 22:52:32 -07:00
Svetoslav
7119be2531 Merge "Handle dynamic enable/disable of runtime permissions support." 2015-03-27 04:06:08 +00:00
Svetoslav
cf959f6e72 Handle dynamic enable/disable of runtime permissions support.
This change adds support for the case where we change the state
of runtime permissions support via the system property. This
was not working properly before because we did not handle system
app permissions properly.:

Change-Id: I66c5e6c823b8521999972b0432b1daaba38c9709
2015-03-26 21:01:57 -07:00
Deepanshu Gupta
22ed799622 am c1c3b88e: am 80d5c425: am fb37c97c: am 61bb0b4f: am 4e6ae02a: am 17bb697b: am ec8df9af: Fix tests for Java 6.
* commit 'c1c3b88ebd853425e931a5c07a045bae6ac1085f':
  Fix tests for Java 6.
2015-03-27 03:29:15 +00:00
Christopher Tate
60b3be3ab5 am 9c36cf41: am 9837c51a: am 63862a20: am 7b73a788: am dbe0dd16: When scanning unbundled apps, only install the expected APK tree
* commit '9c36cf4195158b94600a5e1125835627629087e8':
  When scanning unbundled apps, only install the expected APK tree
2015-03-27 03:29:02 +00:00
Deepanshu Gupta
c1c3b88ebd am 80d5c425: am fb37c97c: am 61bb0b4f: am 4e6ae02a: am 17bb697b: am ec8df9af: Fix tests for Java 6.
* commit '80d5c4250f6a7b55b34bb033620df54cdbb31499':
  Fix tests for Java 6.
2015-03-27 03:15:31 +00:00
Christopher Tate
9c36cf4195 am 9837c51a: am 63862a20: am 7b73a788: am dbe0dd16: When scanning unbundled apps, only install the expected APK tree
* commit '9837c51acc274531a4109b9973a7d7927787da6c':
  When scanning unbundled apps, only install the expected APK tree
2015-03-27 03:15:27 +00:00
Deepanshu Gupta
80d5c4250f am fb37c97c: am 61bb0b4f: am 4e6ae02a: am 17bb697b: am ec8df9af: Fix tests for Java 6.
* commit 'fb37c97c251cc9bef81dbf5b9acc58328656a980':
  Fix tests for Java 6.
2015-03-27 03:05:16 +00:00
Christopher Tate
9837c51acc am 63862a20: am 7b73a788: am dbe0dd16: When scanning unbundled apps, only install the expected APK tree
* commit '63862a2052d41db4543a6a15713f5146b76d65cc':
  When scanning unbundled apps, only install the expected APK tree
2015-03-27 03:05:09 +00:00
Deepanshu Gupta
fb37c97c25 am 61bb0b4f: am 4e6ae02a: am 17bb697b: am ec8df9af: Fix tests for Java 6.
* commit '61bb0b4f58f794ff468f2cfaf958cb5cc0b09026':
  Fix tests for Java 6.
2015-03-27 02:58:47 +00:00