188258 Commits

Author SHA1 Message Date
Andy Hung
c7f2f2ffe1 Merge "Default to minimum buffer size for AudioTrack.Builder" 2015-04-13 23:37:26 +00:00
Andy Hung
4bd513e6ed Default to minimum buffer size for AudioTrack.Builder
Expose AudioTrack.getNativeFrameCount as public to allow apps to
retrive the size of the buffer created.

Change-Id: Ifc07196d65d6a68657fd879bcc1819c2077de202
2015-04-13 16:25:51 -07:00
John Spurlock
cbcf902a4a Merge "Zen: Support external condition providers." 2015-04-13 23:14:04 +00:00
Adrian Roos
4b825c0781 Merge "Actually relabel emergency affordance" 2015-04-13 23:10:48 +00:00
Adrian Roos
7a1091f23f Actually relabel emergency affordance
Bug: 19574098
Change-Id: Icf1b4b85ef74e927bdc970fb88c56bfe6dab47d0
2015-04-13 15:42:48 -07:00
Rubin Xu
c06bbbfe7a Merge "Grant cert installer access to installKeyPair()" 2015-04-13 22:29:12 +00:00
Christopher Tate
9310e4285b Avoid zero-payload backups in local transport
The local debugging transport now implements
BackupTransport.checkFullBackupSize() to detect and reject backup attempts
for which no actual file content will be committed.  The documentation for
checkFullBackupSize() has also been expanded to document the transport's
responsibilities in this regard.

The local transport now lazy-creates the destination file when data is
first delivered for an approved backup operation, rather than doing it
proactively in performBackup(), to ensure that changes in the datastore
are only attempted after the transport has positive confirmation that
data is indeed flowing.

Change-Id: I6e47a7e72cd938fc0ed31da4bc490540c71f9e65
2015-04-13 22:13:23 +00:00
Svetoslav
2f77da0781 Merge "Improve permission group handling." 2015-04-13 21:38:47 +00:00
Svetoslav
afd1fc3ccc Improve permission group handling.
1. Don't ignore permissions in an unknown group.

2. Ignore permission groups for legacy apps as the meaning
   of a permission group is redefined.

Change-Id: Ifd0e0928cfd8540f3abc39a8834e84c3f18149be
2015-04-13 14:32:57 -07:00
Andy Hung
ec9f15a9e4 Merge "Increase AudioRecord sample rate limit to 96kHz" 2015-04-13 21:18:07 +00:00
Andy Hung
5076ea90af Increase AudioRecord sample rate limit to 96kHz
Change-Id: I3e296a30b828cbea9fd2eab2b8db81833c20d7cf
2015-04-13 14:14:11 -07:00
Yorke Lee
e5a87c53a5 Merge "Hide Voicemails.{insert, deleteAll, setStatus}" 2015-04-13 21:13:55 +00:00
Doris Liu
be16bf4be1 Merge "Fix duration scale attribute for AnimatorSet" 2015-04-13 20:58:25 +00:00
Yin-Chia Yeh
7d43893bb9 Merge "Camera: update AE/AWB lock spec" 2015-04-13 20:01:43 +00:00
Yin-Chia Yeh
7e3e431934 Camera: update AE/AWB lock spec
Codegen doc update.

Bug: 20039760
Change-Id: I92786f1e4366185029aca63794e58374c92bc948
2015-04-13 12:59:39 -07:00
Chris Craik
f518a3ab70 Merge "Deprecate and disable legacy caching APIs" 2015-04-13 19:46:32 +00:00
Sudheer Shanka
98680e969b Merge "Clear defaults of an application installed in multiple users." 2015-04-13 19:45:46 +00:00
Craig Lafayette
ef8fcb52dc Merge "Send device initializer status." 2015-04-13 19:44:42 +00:00
Alan Viverette
0381d0b665 Merge "Allow null layers in LayerDrawable" 2015-04-13 19:28:49 +00:00
Alan Viverette
0cdd4a93a4 Merge "Fix control alignment for single- and multi-select dialogs" 2015-04-13 19:28:00 +00:00
John Reck
073f36c6c1 Merge "Change how Java Bitmaps are accessed in a few places" 2015-04-13 19:20:59 +00:00
Glenn Kasten
bed238fcea Merge "Android MIDI User Guide draft of 4/10/2015" 2015-04-13 18:59:15 +00:00
Phil Burk
1b83e3f75e Android MIDI User Guide draft of 4/10/2015
Change-Id: I80db2c29af581ff3d9d6bd87f5f79c1fde5c3055
Signed-off-by: Glenn Kasten <gkasten@google.com>
2015-04-13 11:54:57 -07:00
Alex Klyubin
d78c2a90d5 Merge "Unhide the new AndroidKeyStore API." 2015-04-13 18:38:12 +00:00
Kenny Guy
e13b15c810 Merge "Add foreground profile changed to user switch observer." 2015-04-13 18:36:23 +00:00
Alex Klyubin
9b3e005a4e Unhide the new AndroidKeyStore API.
Bug: 18088752
Change-Id: I93f87cbb1cd04a4a2e34f3d544d678c92cf052ee
2015-04-13 11:34:04 -07:00
Doris Liu
a7e8cfe978 Fix duration scale attribute for AnimatorSet
Bug: 20160979
Change-Id: I876771a037d2c254fc53ad0bfa4880e69e427090
2015-04-13 11:29:19 -07:00
Jeff Brown
fb1e9b7978 Merge "Set initial screen brightness earlier in the boot process." 2015-04-13 18:20:00 +00:00
Chris Craik
5a6bbae6fc Deprecate and disable legacy caching APIs
bug:20159889

Change-Id: Ib25bb6bceaee27b4d04a64e8ad298db9977b2719
2015-04-13 11:13:52 -07:00
Alan Viverette
147931e3f9 Merge "Fix date picker dialog size" 2015-04-13 18:13:48 +00:00
Alan Viverette
7a583e7bb3 Allow null layers in LayerDrawable
Bug: 20098214
Change-Id: I80285ddda7101ab7403048d38f9c40af6b692a1a
2015-04-13 11:03:55 -07:00
Kenny Guy
429796226a Add foreground profile changed to user switch observer.
Called when the focused activity changes from one profile
to another to allow sys ui to vary display based on the
current profile.
This reverts commit 735a3f90598be31bca5d551d781280a205a5f27f.
Resubmitting with fix for build break in another package.

Bug: 19531782
Change-Id: I98cd2968ade3b1d23feb90d98057f306695d569e
2015-04-13 18:03:05 +00:00
Alex Klyubin
fbf1472d61 resolved conflicts for merge of a978a3d6 to master
Change-Id: Ifd7ca9e1dfa0d50a87f2bafef377fcaeb5d9f6d5
2015-04-13 10:54:53 -07:00
Alex Klyubin
a978a3d6e9 am f265bdbf: am d1af38a4: Merge "Use JCA names for block modes, paddings, and digests."
* commit 'f265bdbfc70411c08b4aa7d17125cf1b5e9b14e8':
  Use JCA names for block modes, paddings, and digests.
2015-04-13 17:31:40 +00:00
Alex Klyubin
f265bdbfc7 am d1af38a4: Merge "Use JCA names for block modes, paddings, and digests."
* commit 'd1af38a4783c1c0d1a5b7c76a7583beb02a88462':
  Use JCA names for block modes, paddings, and digests.
2015-04-13 17:22:07 +00:00
Tim Kilbourn
62d1d9efe7 Merge "Save search context when dispatching onSearchRequested." 2015-04-13 17:03:25 +00:00
Alex Klyubin
d1af38a478 Merge "Use JCA names for block modes, paddings, and digests." 2015-04-13 17:01:30 +00:00
Alex Klyubin
5927c9f1b1 Use JCA names for block modes, paddings, and digests.
This replaces int-based enums from KeyStoreKeyConstraints with
String values commonly used in JCA API.

As part of under the hood refactoring:
* KeyStoreKeyCharacteristics and KeyStoreKeyConstraints have been
  merged into KeyStoreKeyProperties.
* KeymasterUtils methods operating on KeymasterArguments and
  KeymasterCharacteristics have been moved to their respective
  classes.

Bug: 18088752
Change-Id: I9c8b984cb3c28184adb617e34d87f2837bd1d3a1
2015-04-13 09:59:04 -07:00
George Mount
90941c0f84 Merge "Improve javadoc on SharedElementCallback." 2015-04-13 16:53:43 +00:00
George Mount
59cf0831d9 Merge "Fix transition not properly removing targets on completion." 2015-04-13 16:52:59 +00:00
John Reck
a771b9861d Change how Java Bitmaps are accessed in a few places
Stop assuming that a Java Bitmap has a SkBitmap* that
has some externally managed lifecycle, and instead switch
a bunch of users to accessing the bitmap by providing
their own SkBitmap* on which to set the (ref counted!)
SkPixelRef* instead

Change-Id: I0fd9e193968b41e5597784140d56b4885906864a
2015-04-13 09:50:42 -07:00
Tim Kilbourn
6a975b3c35 Save search context when dispatching onSearchRequested.
The InputDevice used to trigger the search is saved in a SearchEvent
so an application implementing onSearchRequested determine the device
triggering the search.

Bug: 15374820
Change-Id: If2cd14f77ce572a5ee131697cd63145fbea63f27
2015-04-13 09:39:24 -07:00
Fyodor Kupolov
05ce40e1af Merge "Use UserHandle instead of int for public APIs" 2015-04-13 16:33:10 +00:00
Fyodor Kupolov
385de624aa Use UserHandle instead of int for public APIs
Bug: 20049349
Change-Id: If5671fb47aa9a3cffebff16787daeae9ca7361e8
2015-04-13 09:31:16 -07:00
Kenny Guy
48a09a0678 Merge "Revert "Add foreground profile changed to user switch observer."" 2015-04-13 16:13:33 +00:00
Kenny Guy
735a3f9059 Revert "Add foreground profile changed to user switch observer."
This reverts commit 99b9030a3ececd9b88e5011c98be0a5b9499c776.

Change-Id: If152904f298ecd9e6fd5d038797d061a5c85eec8
2015-04-13 16:12:55 +00:00
John Spurlock
39581cc16d Zen: Support external condition providers.
- Manage provider subscriptions for external condition providers
   within ZenModeConditions.
 - Move "is automatic rule active" check into common location.
 - Add constant for external rule setting configuration page.
 - Consolidate log tags.
 - Reset rule snoozing on boot.

Bug: 20064962
Change-Id: Ida207dbf363f61e1727974e611f43f27c23accfb
2015-04-13 12:12:46 -04:00
Kenny Guy
d10bd48522 Merge "Add foreground profile changed to user switch observer." 2015-04-13 14:41:37 +00:00
Sudheer Shanka
d957f80ced Clear defaults of an application installed in multiple users.
Bug: 19120156
Change-Id: I6c85b62d121df84e5f86dd359e8555376fea9701
2015-04-13 15:26:59 +01:00
Geoff Mendal
fb18a0b5af Merge "Import translations. DO NOT MERGE" 2015-04-13 14:24:49 +00:00