Commit Graph

46375 Commits

Author SHA1 Message Date
Mike Lockwood
549a8cb66d Merge "Make the MIDI Manager optional, enabled by "android.software.midi" feature" 2015-03-28 16:00:21 +00:00
Andreas Gampe
822b403b68 am 3fa46a0f: am d7fb6d26: am a01250c7: Merge "Frameworks/base: Change String == to equals in Preference"
* commit '3fa46a0f79f35ca32ce102d4bbb1138c517ee754':
  Frameworks/base: Change String == to equals in Preference
2015-03-28 05:18:14 +00:00
Andreas Gampe
2d3455993e am 1bca3532: am 0e6b4da5: am 5a15bf69: Merge "Frameworks/base: Fix request removal in VoiceInteractionSession"
* commit '1bca3532687675d81dea805b12577a6c3a00b4c3':
  Frameworks/base: Fix request removal in VoiceInteractionSession
2015-03-28 05:18:03 +00:00
Andreas Gampe
d7fb6d26d8 am a01250c7: Merge "Frameworks/base: Change String == to equals in Preference"
* commit 'a01250c7740aec4f2cfc92a82d5a10f05c3e7ce7':
  Frameworks/base: Change String == to equals in Preference
2015-03-28 05:03:25 +00:00
Andreas Gampe
0e6b4da5ca am 5a15bf69: Merge "Frameworks/base: Fix request removal in VoiceInteractionSession"
* commit '5a15bf69d8d2782d70c462f7fd8bd75e687260dc':
  Frameworks/base: Fix request removal in VoiceInteractionSession
2015-03-28 05:03:18 +00:00
Andreas Gampe
a01250c774 Merge "Frameworks/base: Change String == to equals in Preference" 2015-03-28 04:50:44 +00:00
Andreas Gampe
5a15bf69d8 Merge "Frameworks/base: Fix request removal in VoiceInteractionSession" 2015-03-28 04:50:08 +00:00
Christopher Tate
6e6af0d34e Merge "Add payload-size preflight stage to full transport backup" 2015-03-27 23:50:58 +00:00
Alex Klyubin
7760820ecc am 23c2b8e8: am d7e06104: am 36ee836d: Merge "Symmetric key generation for AndroidKeyStore."
* commit '23c2b8e81ec5a6e0c344f09e728d87300ac29bc2':
  Symmetric key generation for AndroidKeyStore.
2015-03-27 23:49:25 +00:00
Chad Brubaker
2fb1d0eb20 am db22c659: am 3e89fac5: am dbd9a4b6: Merge "Allow entropy to be provided to some operations"
* commit 'db22c6595c1b1949ff5473517609a7315b8e130f':
  Allow entropy to be provided to some operations
2015-03-27 23:49:17 +00:00
Alex Klyubin
d7e0610477 am 36ee836d: Merge "Symmetric key generation for AndroidKeyStore."
* commit '36ee836d2f6e6df59d6a20a69421639bacf25559':
  Symmetric key generation for AndroidKeyStore.
2015-03-27 23:26:08 +00:00
Chad Brubaker
3e89fac569 am dbd9a4b6: Merge "Allow entropy to be provided to some operations"
* commit 'dbd9a4b651aed25a50976ca0a68a979cc3f299fa':
  Allow entropy to be provided to some operations
2015-03-27 23:25:59 +00:00
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
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
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
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
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
Tim Volodine
6e3d794b90 Merge "Invoke geolocation permissions callback with denied state by default." 2015-03-27 16:45:26 +00:00
Alex Klyubin
545ebdefd2 Merge "Unhide public API about cleartext traffic policy." 2015-03-27 15:23:04 +00: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
Christopher Tate
11ae768cf1 Add payload-size preflight stage to full transport backup
We now peform a total-size preflight pass before committing data to the
wire.  This is to eliminate the large superfluous network traffic that
would otherwise happen if the transport enforces internal quotas: we
now instead ask the transport up front whether it's prepared to accept
a given payload size for the package.

From the app's perspective this preflight operation is indistinguishable
from a full-data backup pass.  If the app has provided its own full-data
handling in a subclassed backup agent, their usual file-providing code
path will be executed.  However, the files named for backup during this
pass are not opened and read; just measured for their total size.  As
far as component lifecycles, this measurement pass is simply another
call to the agent, immediately after it is bound, with identical
timeout semantics to the existing full-data backup invocation.

Once the app's file set has been measured the preflight operation
invokes a new method on BackupTransport, called checkFullBackupSize().
This method is called after performFullBackup() (which applies any
overall whitelist/blacklist policy) but before any data is delivered
to the transport via sendBackupData().  The return code from
checkFullBackupSize() is similar to the other transport methods:
TRANSPORT_OK to permit the full backup to proceed; or
TRANSPORT_REJECT_PACKAGE to indicate that the requested payload is
unacceptable; or TRANSPORT_ERROR to report a more serious overall
transport-level problem that prevents a full-data backup operation
from occurring right now.

The estimated payload currently does not include the size of the
source-package metadata (technically, the manifest entry in its
archive payload) or the size of any widget metadata associated with
the package's install.  In practice this means the preflighted size
underestimates by 3 to 5 KB.  In addition, the preflight API currently
cannot distinguish between payload sizes larger than 2 gigabytes;
any payload estimate larger than that is passed as Integer.MAX_VALUE
to the checkFullBackupSize() query.

Bug 19846750

Change-Id: I44498201e2d4b07482dcb3ca8fa6935dddc467ca
2015-03-26 18:57:36 -07:00
Adam Lesinski
4b6bd8d36b Retrieve WiFi info outside of BatteryStatsImpl
In order to not deadlock the system, we need to retrieve
WiFi energy info outside of the BatteryStats lock. We do this,
then pass that data down to BatteryStatsImpl to process.

b/19729960

Change-Id: Ib8beba1d5ac81d89144d502c4b688d0a88c5b102
2015-03-26 17:49:51 -07:00
Aravind Akella
02bc1fe6b0 Merge "Pipe the packageName of the application from the java layer to SensorService." 2015-03-26 22:17:22 +00:00
Ricky Wai
9aaaa1ebb3 Add RawContactsEntity.CORP_CONTENT_URI
Bug: 19551325
Change-Id: I7b2801e4a80ac5da1f1d53e41043657d07874ae6
2015-03-26 18:48:13 +00:00
Alex Klyubin
7cb000ff56 Unhide public API about cleartext traffic policy.
Bug: 19215516
Change-Id: I5da81a36c2f3d0edcf715a5f1b14b0a56c7abc6d
2015-03-26 11:00:04 -07:00
James Cook
ccce81cf44 Merge "Fix undo of text pasted into TextView with TextWatcher" 2015-03-26 17:15:31 +00:00
Rubin Xu
6a38e43b8b Fix build breakage by ag/661236
Change-Id: Ia42440f238d76066f449dccc463b0485ab558c4d
2015-03-26 14:47:45 +00:00
Rubin Xu
a55c27a79b Merge "Change doc for device initializer agent extra's type." 2015-03-26 13:16:07 +00:00
Rubin Xu
44ef750bd4 Change doc for device initializer agent extra's type.
Change the DIA extra's type to ComponentName, making it consistent with
EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME.

Bug: 19891726
Change-Id: Ib41a9d22ff22e114cde80010fbc41db26f2b5f82
2015-03-26 12:11:04 +00:00
Adam Powell
9c66583379 Merge "Fix default gravity for View foreground drawables" 2015-03-26 02:17:49 +00:00
Adam Powell
6579f5090a Fix default gravity for View foreground drawables
Use the expected default gravity of Gravity.FILL as FrameLayout used
to do. Reset the bounds correctly when a new drawable is set.

Bug 19922909

Change-Id: I80181923c37e33ba308e364e322d84f3cc86e93b
2015-03-25 19:14:12 -07:00
Filip Gruszczynski
1c6bfd6944 am 70ef3af8: am 2493d947: am 9001f14b: Merge "Don\'t use windowOutsetBottom for insets, depend on display padding only." into lmp-mr1-modular-dev
* commit '70ef3af8d953091e3595de63a9a2f68a064c2352':
  Don't use windowOutsetBottom for insets, depend on display padding only.
2015-03-25 23:41:15 +00:00
Filip Gruszczynski
2493d94724 am 9001f14b: Merge "Don\'t use windowOutsetBottom for insets, depend on display padding only." into lmp-mr1-modular-dev
* commit '9001f14b205aba4d9fa236611b122492b92d3b4a':
  Don't use windowOutsetBottom for insets, depend on display padding only.
2015-03-25 22:43:02 +00:00
Filip Gruszczynski
9001f14b20 Merge "Don't use windowOutsetBottom for insets, depend on display padding only." into lmp-mr1-modular-dev 2015-03-25 22:37:38 +00:00
Alan Viverette
26c44eeecf Add accessibility action for making a node visible on screen
Bug: 19872425
Change-Id: I39c971f949d08d6573da2e5567dca1e187a17d7e
2015-03-25 14:54:13 -07:00
Aravind Akella
88445990b4 Pipe the packageName of the application from the java layer to SensorService.
Change-Id: I8610d676be0249e1047bb539bfeb76cc34538edf
2015-03-25 14:42:38 -07:00
Dianne Hackborn
73484d8b66 Merge "Battery stats: wakeup alarm tracking, general cleanup." 2015-03-25 21:27:54 +00:00
Alan Viverette
527b45376a am 3a79e434: am a0d3d003: am 5fc9b336: Merge "Consider RTL layout in DPAD navigation in Gallery"
* commit '3a79e434a6e840f47a47387743385a2cd5faab54':
  Consider RTL layout in DPAD navigation in Gallery
2015-03-25 21:08:51 +00:00
Chad Brubaker
b09f1083e1 am 6558d4e7: am ee468ea8: am 6326f964: Merge "Make application/client id an object"
* commit '6558d4e75e8a129b1b1a78824ed091962a2574ef':
  Make application/client id an object
2015-03-25 21:08:35 +00:00
Alex Klyubin
1d321fa14f am 2faa736e: am 6a7ac540: am a9f62866: Merge "Framework\'s NetworkSecurityPolicy delegates to libcore\'s one."
* commit '2faa736e7dfab88bfdf1ff7022397af182815503':
  Framework's NetworkSecurityPolicy delegates to libcore's one.
2015-03-25 21:07:48 +00:00