OSDN Git Service
Etan Cohen [Fri, 24 Apr 2015 20:43:36 +0000 (13:43 -0700)]
Merge commit '
9561e74' into merge2
Andy Hung [Fri, 24 Apr 2015 19:22:21 +0000 (19:22 +0000)]
Merge "Fix API level in documentation to refer to MNC"
Andy Hung [Fri, 24 Apr 2015 09:10:16 +0000 (02:10 -0700)]
Fix API level in documentation to refer to MNC
Change-Id: I2ab646fce1c3f58b11d88a47e733621d8f1fec79
Andy Hung [Fri, 24 Apr 2015 19:16:20 +0000 (19:16 +0000)]
Merge "Increase AudioTrack and AudioRecord max sample rate to 192kHz"
Tor Norbye [Fri, 24 Apr 2015 18:54:24 +0000 (18:54 +0000)]
Merge "Add permission requirement annotation for KeyGuard"
Santos Cordon [Fri, 24 Apr 2015 18:37:37 +0000 (18:37 +0000)]
Merge "Fix up DisconnectCause description."
Santos Cordon [Fri, 24 Apr 2015 18:26:01 +0000 (11:26 -0700)]
Fix up DisconnectCause description.
Change-Id: Ib2b52b6f8bc8fe945df3684f4e1ed9e04f78b061
Alex Klyubin [Fri, 24 Apr 2015 18:35:37 +0000 (18:35 +0000)]
am
edf5454a: am
3167fb4b: am
71223ebe: Merge "Reset AndroidKeyStore Mac and Cipher state when init fails."
* commit '
edf5454a14cc53de92eaf1ef15fcfb21d8caccca':
Reset AndroidKeyStore Mac and Cipher state when init fails.
Olawale Ogunwale [Fri, 24 Apr 2015 18:35:29 +0000 (18:35 +0000)]
am
3846d3a4: am
6d856bfb: am
cf7d2d95: Merge "[ActivityManager] Avoid orphan ContentProviderRecord."
* commit '
3846d3a4c5d79a9d7e86e43c64a5c21a29036de0':
[ActivityManager] Avoid orphan ContentProviderRecord.
Leon Scroggins III [Fri, 24 Apr 2015 18:22:00 +0000 (18:22 +0000)]
am
fddbcd85: (-s ours) am
8be18bbf: am
4c1f70db: am
b3523d7f: am
41c458c8: am
67326bcb: am
ea2dcda7: am
ee35410f: (-s ours) am
a7501119: am
69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
fddbcd857fda28213917ef81375514bffc4a6d68':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Leon Scroggins III [Fri, 24 Apr 2015 18:21:53 +0000 (18:21 +0000)]
am
38b84b6d: (-s ours) am
60d7c9fc: am
6db29a92: am
f828f43f: am
38cf068c: am
16ac8ad7: am
4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
38b84b6d765302c8325ad10109e43227ce8e8156':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Scott Rowe [Fri, 24 Apr 2015 18:21:42 +0000 (18:21 +0000)]
am
6a6bfe5e: am
6e5063fe: docs: Supported media protocols, codecs, formats for Android TV
* commit '
6a6bfe5e84b598f24d73138523d7f8d88729daed':
docs: Supported media protocols, codecs, formats for Android TV
Alex Klyubin [Fri, 24 Apr 2015 18:21:22 +0000 (18:21 +0000)]
am
3167fb4b: am
71223ebe: Merge "Reset AndroidKeyStore Mac and Cipher state when init fails."
* commit '
3167fb4b6e190705d21a76b34cc376a89675a6a0':
Reset AndroidKeyStore Mac and Cipher state when init fails.
Olawale Ogunwale [Fri, 24 Apr 2015 18:21:19 +0000 (18:21 +0000)]
am
6d856bfb: am
cf7d2d95: Merge "[ActivityManager] Avoid orphan ContentProviderRecord."
* commit '
6d856bfba5b6ae488d49c4909510cd87000cd922':
[ActivityManager] Avoid orphan ContentProviderRecord.
Leon Scroggins III [Fri, 24 Apr 2015 18:16:34 +0000 (18:16 +0000)]
am
8be18bbf: am
4c1f70db: am
b3523d7f: am
41c458c8: am
67326bcb: am
ea2dcda7: am
ee35410f: (-s ours) am
a7501119: am
69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
8be18bbfc23b768ae3022f988e586871754958ac':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Leon Scroggins III [Fri, 24 Apr 2015 18:16:29 +0000 (18:16 +0000)]
am
60d7c9fc: am
6db29a92: am
f828f43f: am
38cf068c: am
16ac8ad7: am
4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
60d7c9fcbcb80c556689f03c7b00984f94f9912b':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Alex Klyubin [Fri, 24 Apr 2015 18:11:50 +0000 (18:11 +0000)]
am
71223ebe: Merge "Reset AndroidKeyStore Mac and Cipher state when init fails."
* commit '
71223ebe1b2264b7463a02c8dafd779eb3b8c210':
Reset AndroidKeyStore Mac and Cipher state when init fails.
Olawale Ogunwale [Fri, 24 Apr 2015 18:11:29 +0000 (18:11 +0000)]
am
cf7d2d95: Merge "[ActivityManager] Avoid orphan ContentProviderRecord."
* commit '
cf7d2d95adb358a628c2622b43a999d3ab784406':
[ActivityManager] Avoid orphan ContentProviderRecord.
Scott Rowe [Fri, 24 Apr 2015 18:10:25 +0000 (18:10 +0000)]
am
6e5063fe: docs: Supported media protocols, codecs, formats for Android TV
* commit '
6e5063fe88b265c89b39401545925b9e0cbd8390':
docs: Supported media protocols, codecs, formats for Android TV
Alan Viverette [Fri, 24 Apr 2015 18:06:48 +0000 (18:06 +0000)]
Merge "Implement RTL support in framework ViewPager, DatePicker"
Scott Rowe [Fri, 20 Mar 2015 17:44:52 +0000 (10:44 -0700)]
docs: Supported media protocols, codecs, formats for Android TV
Change-Id: I8202ba148d35d73ee0940070090e0a29553f9202
(cherry picked from commit
f769caa8c15f9983188597e2436b011d23ff2561)
dcashman [Fri, 24 Apr 2015 17:57:27 +0000 (17:57 +0000)]
Merge "Remove line wrapping for publickey encoding."
Leon Scroggins III [Fri, 24 Apr 2015 17:54:57 +0000 (17:54 +0000)]
am
4c1f70db: am
b3523d7f: am
41c458c8: am
67326bcb: am
ea2dcda7: am
ee35410f: (-s ours) am
a7501119: am
69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
4c1f70db3dc37f818bdff09ec3e289b797acc397':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Leon Scroggins III [Fri, 24 Apr 2015 17:54:50 +0000 (17:54 +0000)]
am
6db29a92: am
f828f43f: am
38cf068c: am
16ac8ad7: am
4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
6db29a92452c2a837528d20d024dcacefd450c17':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Mark Renouf [Fri, 24 Apr 2015 17:54:33 +0000 (17:54 +0000)]
am
f237bce8: am
99d49300: am
55555a3d: Fixes rejected dismiss gestures (framework version of ag/677161)
* commit '
f237bce8c3bb4ac31a4c5eaa732de95d5b469f34':
Fixes rejected dismiss gestures (framework version of ag/677161)
dcashman [Fri, 24 Apr 2015 17:52:56 +0000 (10:52 -0700)]
Remove line wrapping for publickey encoding.
This adds unnecessary whitespace in packages.xml and is contrary to the approach
taken by certs. Remove it.
Change-Id: I217bb94af97c3b38dab1fd806ffe7b7600fa6fdd
Alex Klyubin [Fri, 24 Apr 2015 17:52:35 +0000 (17:52 +0000)]
Merge "Reset AndroidKeyStore Mac and Cipher state when init fails."
Alex Klyubin [Fri, 24 Apr 2015 17:47:17 +0000 (10:47 -0700)]
Reset AndroidKeyStore Mac and Cipher state when init fails.
For consistency, this also switches AndroidKeyStore's Mac init/reset
implementation to the same approach as used in Cipher.
Bug:
18088752
Change-Id: Id34caf7cfe04f2058e22d8632890f762927bb31c
Leon Scroggins III [Fri, 24 Apr 2015 17:43:38 +0000 (17:43 +0000)]
am
b3523d7f: am
41c458c8: am
67326bcb: am
ea2dcda7: am
ee35410f: (-s ours) am
a7501119: am
69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
b3523d7f8f8274a04145ca34eab9821aafb52d7a':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Leon Scroggins III [Fri, 24 Apr 2015 17:43:23 +0000 (17:43 +0000)]
am
f828f43f: am
38cf068c: am
16ac8ad7: am
4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
f828f43f97f4a018e2224e926b900713081a8c5b':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Olawale Ogunwale [Fri, 24 Apr 2015 17:42:58 +0000 (17:42 +0000)]
Merge "[ActivityManager] Avoid orphan ContentProviderRecord."
Mark Renouf [Fri, 24 Apr 2015 17:42:01 +0000 (17:42 +0000)]
am
99d49300: am
55555a3d: Fixes rejected dismiss gestures (framework version of ag/677161)
* commit '
99d4930064e7d155ce92746028cbafd46b14c6f4':
Fixes rejected dismiss gestures (framework version of ag/677161)
Wale Ogunwale [Fri, 24 Apr 2015 17:34:54 +0000 (17:34 +0000)]
Merge "Cleaned-up unused session argument."
Leon Scroggins III [Fri, 24 Apr 2015 17:33:04 +0000 (17:33 +0000)]
am
41c458c8: am
67326bcb: am
ea2dcda7: am
ee35410f: (-s ours) am
a7501119: am
69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
41c458c81125fb6e3fc9eb5304f0d3216a0a2d74':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Leon Scroggins III [Fri, 24 Apr 2015 17:32:59 +0000 (17:32 +0000)]
am
38cf068c: am
16ac8ad7: am
4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
38cf068c04e1ce244529b95f6cc6d7d6a88fab24':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Mark Renouf [Fri, 24 Apr 2015 17:31:31 +0000 (17:31 +0000)]
am
55555a3d: Fixes rejected dismiss gestures (framework version of ag/677161)
* commit '
55555a3dab1f3b99a3299b90851624e9dc10f3cc':
Fixes rejected dismiss gestures (framework version of ag/677161)
Leon Scroggins III [Fri, 24 Apr 2015 17:15:55 +0000 (17:15 +0000)]
am
67326bcb: am
ea2dcda7: am
ee35410f: (-s ours) am
a7501119: am
69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
67326bcba0f7287367dedba4caaf2a168a43f057':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Leon Scroggins III [Fri, 24 Apr 2015 17:15:43 +0000 (17:15 +0000)]
am
16ac8ad7: am
4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
16ac8ad7fac73524b5296f955884bd2aec405ded':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Chien-Yu Chen [Fri, 24 Apr 2015 17:14:48 +0000 (17:14 +0000)]
Merge "camera2: validate reprocess request's session"
Jae Seo [Fri, 24 Apr 2015 17:10:18 +0000 (17:10 +0000)]
Merge "TIF: Start using the @NonNull annotation"
Tor Norbye [Fri, 24 Apr 2015 17:08:10 +0000 (17:08 +0000)]
Merge "Add permission annotations to the Browser"
Wale Ogunwale [Fri, 24 Apr 2015 16:00:25 +0000 (09:00 -0700)]
Cleaned-up unused session argument.
Change-Id: Iff9d0df5f1643c581767a41a1ba4b1d43e5b45d8
Mark Renouf [Fri, 24 Apr 2015 15:47:27 +0000 (11:47 -0400)]
Fixes rejected dismiss gestures (framework version of ag/677161)
Gus's original change description:
This change modifies the logic in SwipeDismissLayout which determines
whether or not a gesture should be interpreted as a dismiss
gesture.
Previously, on the first touch move event, the gesture was classified
as a dismiss gesture if the X movement exceeded the touch slop
and the Y movement did not. At this point the gesture was not
intercepted and the underlying widget (in the case of the cue
card, the GridViewPager) received all subsequent move events.
In the case of a very fast gesture at a slight vertical angle, it was
easy for the total Y movement to exceed the touch slop.
This change only rejects the gesture if the Y movement exceeds
the X movement, which is consistent with how GridViewPager
distinguishes horizontal vs. vertical swipes.
This change also cancels the dismissal if the end of the gesture
is a leftwards flight.
BUG:
20542762
(Same as b/
20350515 but for Activity dismissal at the system level.)
Change-Id: I6e3fb646c42dda0d1c1f5552d91b27c6374fc08c
Nicolas Prevot [Fri, 24 Apr 2015 15:08:01 +0000 (15:08 +0000)]
Merge "Restrict setting the profile/device owner with a signature-level permission."
John Spurlock [Fri, 24 Apr 2015 14:50:08 +0000 (14:50 +0000)]
Merge "AudioService: Fix mConnectedDevices iteration issues."
John Reck [Fri, 24 Apr 2015 14:33:01 +0000 (14:33 +0000)]
Merge "Teach LA how to destroy"
John Reck [Fri, 24 Apr 2015 14:32:49 +0000 (14:32 +0000)]
Merge "Move LinearAlloc to libhuwi"
Keisuke Kuroyanagi [Fri, 24 Apr 2015 11:40:56 +0000 (11:40 +0000)]
Merge "Quit showing "SELECT ALL" for inappropriate fields."
Neil Fuller [Fri, 24 Apr 2015 11:11:14 +0000 (11:11 +0000)]
am
a921fa0f: am
ff1e7e01: am
0e29681f: Merge "Load ICU4J data on boot"
* commit '
a921fa0fc354fed48d29822109c573a124a95dfd':
Load ICU4J data on boot
Neil Fuller [Fri, 24 Apr 2015 11:01:29 +0000 (11:01 +0000)]
am
ff1e7e01: am
0e29681f: Merge "Load ICU4J data on boot"
* commit '
ff1e7e01f16173ae0ea1bd9e6738ff7b5ce33add':
Load ICU4J data on boot
Neil Fuller [Fri, 24 Apr 2015 10:50:52 +0000 (10:50 +0000)]
am
0e29681f: Merge "Load ICU4J data on boot"
* commit '
0e29681f98dad8df9f772d86a848190138245f3d':
Load ICU4J data on boot
Nicolas Prevot [Thu, 8 Jan 2015 15:37:12 +0000 (15:37 +0000)]
Restrict setting the profile/device owner with a signature-level permission.
Create the new permission MANAGE_PROFILE_OWNERS to restrict setting
the profile/device owner.
BUG:
19838376
Change-Id: Ib55a2db85fcb6f34e3b88c398683bddb0ad66868
Neil Fuller [Fri, 24 Apr 2015 10:30:16 +0000 (10:30 +0000)]
Merge "Load ICU4J data on boot"
Keisuke Kuroyanagi [Thu, 23 Apr 2015 06:25:46 +0000 (15:25 +0900)]
Quit showing "SELECT ALL" for inappropriate fields.
This blocks showing "SELECT ALL" in FloatingToolBar when
the input is empty or the field is a password field.
Bug:
20407551
Change-Id: Ia25700bbee4f78445776af46eb1369af6600d946
Gustav Sennton [Fri, 24 Apr 2015 09:27:14 +0000 (09:27 +0000)]
Merge "Add system API method for loading webview library from another package."
Abodunrinwa Toki [Fri, 24 Apr 2015 06:55:17 +0000 (06:55 +0000)]
Merge "TextView: Invalidate ActionMode content rect on scroll."
Andy Hung [Fri, 24 Apr 2015 01:13:15 +0000 (18:13 -0700)]
Increase AudioTrack and AudioRecord max sample rate to 192kHz
For pro-audio purposes.
Change-Id: Ie5de6736175879c074ed393a14ca88720de083c7
Jae Seo [Thu, 23 Apr 2015 17:53:58 +0000 (10:53 -0700)]
TIF: Start using the @NonNull annotation
Added the @NonNull annotation to the code where null check is required
Bug:
19941047
Change-Id: I9fd1f4c7ea4679c03bf831d90804488282a1c5d4
Ed Heyl [Fri, 24 Apr 2015 04:58:45 +0000 (04:58 +0000)]
Merge "Fix the build: Revert "Anti-alias by default""
Ed Heyl [Fri, 24 Apr 2015 04:57:24 +0000 (04:57 +0000)]
Fix the build: Revert "Anti-alias by default"
This reverts commit
d34b7329935a6f9ffdc9a40c01f7b558e07830d4.
Change-Id: I74e63570ce868e6d8c36fd2e1c864419bd6102e4
Dongwon Kang [Fri, 24 Apr 2015 04:57:05 +0000 (04:57 +0000)]
Merge "TIF: use <p> tag in a consistent way."
Dongwon Kang [Thu, 23 Apr 2015 08:01:17 +0000 (17:01 +0900)]
TIF: use <p> tag in a consistent way.
Bug:
20340510
Change-Id: I2422646f01542f571d033ee363df58e0906f3514
Dongwon Kang [Fri, 24 Apr 2015 04:42:54 +0000 (04:42 +0000)]
Merge "TIF: start using @Nullable annotation."
Jeff Sharkey [Fri, 24 Apr 2015 04:08:21 +0000 (04:08 +0000)]
Merge "Package and storage movement callbacks."
Chong Zhang [Fri, 24 Apr 2015 03:47:48 +0000 (03:47 +0000)]
Merge "MediaHTTPConnection: set connect time out"
Jeff Sharkey [Fri, 24 Apr 2015 02:36:02 +0000 (19:36 -0700)]
Package and storage movement callbacks.
Since package and primary storage movement can take quite awhile,
we want to have SystemUI surface progress and allow the Settings
app to be torn down while the movement proceeds in the background.
Movement requests now return a unique ID that identifies an ongoing
operation, and interested parties can observe ongoing progress and
final status. Internally, progress and status are overloaded so
the values 0-100 are progress, and any values outside that range
are terminal status.
Add explicit constants for special-cased volume UUIDs, and change
the APIs to accept VolumeInfo to reduce confusion. Internally the
UUID value "null" means internal storage, and "primary_physical"
means the current primary physical volume. These values are used
for both package and primary storage movement destinations.
Persist the current primary storage location in MountService
metadata, since it can be moved over time.
Surface disk scanned events with separate volume count so we can
determine when it's partitioned successfully. Also send broadcast
to support TvSettings launching into adoption flow.
Bug:
19993667
Change-Id: Ic8a4034033c3cb3262023dba4a642efc6795af10
Lajos Molnar [Fri, 24 Apr 2015 02:57:15 +0000 (02:57 +0000)]
Merge "media: deprecate correct codec color formats, add flexible formats"
Lajos Molnar [Fri, 24 Apr 2015 02:56:45 +0000 (02:56 +0000)]
Merge "media: add flexible YUV422, 444, and RGB/RGBA formats"
Lajos Molnar [Fri, 24 Apr 2015 02:25:43 +0000 (19:25 -0700)]
media: unhide and document already used fields
Bug:
18134807
Bug:
19300915
Bug:
11990564
Change-Id: Iaeab4a5359b946c4b1aeef6083d10045079b9720
Lajos Molnar [Fri, 24 Apr 2015 00:42:53 +0000 (17:42 -0700)]
media: deprecate correct codec color formats, add flexible formats
Change-Id: Ie79c4027fa969fe352da224b3f1844b0a7eaaeaa
Andy Hung [Fri, 24 Apr 2015 02:26:28 +0000 (02:26 +0000)]
Merge "Add getFormat to AudioTrack and AudioRecord"
Lajos Molnar [Thu, 23 Apr 2015 23:32:38 +0000 (16:32 -0700)]
media: add flexible YUV422, 444, and RGB/RGBA formats
These are used by Media.Image on getOutputImage.
Change-Id: I171c5b90423800eeab4e36625dcf727a2a2affcd
Tor Norbye [Fri, 24 Apr 2015 01:49:23 +0000 (18:49 -0700)]
Add permission annotations to the Browser
Change-Id: Ib75a846faa4f73468d4c7bc04092ec0e80414d67
Jinsuk Kim [Fri, 24 Apr 2015 01:45:28 +0000 (01:45 +0000)]
Merge "CEC: Check port id for ARC status update on hotplug"
John Spurlock [Fri, 24 Apr 2015 01:32:37 +0000 (21:32 -0400)]
AudioService: Fix mConnectedDevices iteration issues.
- Don't remove from the map while iterating.
- Use ArrayMap and tighten up all iterations to avoid unnecessary
allocations.
Bug:
20523001
Change-Id: I2587d0f9778b38d96afdfd0e61b00b06911837ae
Dongwon Kang [Thu, 23 Apr 2015 10:44:59 +0000 (19:44 +0900)]
TIF: start using @Nullable annotation.
Added @Nullable annotation when the javadoc sprcifies the return value
or argument can be null.
Bug:
19941047
Change-Id: I823189a242fae10ca14788fee9747bf5d59f5eb3
Jose Lima [Fri, 24 Apr 2015 01:23:33 +0000 (01:23 +0000)]
Merge "Add pre-order as a pricing type for ContentInfoExtender"
Chong Zhang [Fri, 24 Apr 2015 01:21:05 +0000 (18:21 -0700)]
MediaHTTPConnection: set connect time out
bug:
19890444
Change-Id: Ib669e6d1524620b37a683612369b405c8367f4a5
Andy Hung [Thu, 23 Apr 2015 01:30:51 +0000 (18:30 -0700)]
Add getFormat to AudioTrack and AudioRecord
This enables getting channel index masks and is future-friendly.
Change-Id: Ia0bb9a855e97e8279b2226cf75e0ddd03af3fb7f
Wei Jia [Fri, 24 Apr 2015 00:46:22 +0000 (00:46 +0000)]
Merge "MediaSync: fix message delay based on play time for pending audio frames."
Tor Norbye [Fri, 24 Apr 2015 00:30:56 +0000 (17:30 -0700)]
Add permission requirement annotation for KeyGuard
Change-Id: Ieb4a8c8d3da7090c6551cbae4db8944fbe462538
Santos Cordon [Fri, 24 Apr 2015 00:06:49 +0000 (00:06 +0000)]
Merge "Remove CallState and rename PRE_DIAL_WAIT"
Adrian Roos [Thu, 23 Apr 2015 23:56:31 +0000 (23:56 +0000)]
Merge "Fix disappearing status bar icons with SHOW_WHEN_LOCKED"
Yorke Lee [Thu, 23 Apr 2015 23:49:22 +0000 (23:49 +0000)]
Merge "Add TelecomManager.placeCall"
Yorke Lee [Thu, 23 Apr 2015 19:32:36 +0000 (12:32 -0700)]
Add TelecomManager.placeCall
Places a new outgoing call using the system telecom service
with the specified parameters.
Making emergency calls using this method requires that the
method-caller is either the user-selected default dialer app
or preloaded system dialer app.
Requires that the caller have the
{@link android.Manifest.permission#CALL_PHONE} permission.
Bug:
20348183
Change-Id: Ieedb5628e8c6be25137944e7c3639dc1d9bc61df
Glenn Kasten [Thu, 23 Apr 2015 23:42:47 +0000 (16:42 -0700)]
Fix build
Change-Id: I0f83f4d1df85f4b3c59cfff54b8c78ea4aefbd1d
Jose Lima [Thu, 23 Apr 2015 21:01:24 +0000 (14:01 -0700)]
Add pre-order as a pricing type for ContentInfoExtender
Change-Id: Ibf9e4f57b47e92789d3e0730c58b0bce14663fec
Ben Kwa [Thu, 23 Apr 2015 23:19:47 +0000 (23:19 +0000)]
Merge "Move extension checking code into FileUtils."
Andrew Solovay [Thu, 23 Apr 2015 23:16:25 +0000 (23:16 +0000)]
am
d25f1f78: am
090df87d: am
4dde4c9e: am
e45e41d7: am
44fa5e71: am
5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs
* commit '
d25f1f7877c8311dfdcbb6deb1c21b06f15f8914':
Docs: Correcting section on how to escape quotes in strings.
Andrew Solovay [Thu, 23 Apr 2015 23:16:19 +0000 (23:16 +0000)]
am
8ddc9672: am
8aff67ec: am
dad05551: am
24ccb900: am
7a866a88: am
09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs
* commit '
8ddc96724624ba4dfed000365f404b6113188ac0':
docs: Update to doc on listening for restrictions-changed intent
Svet Ganov [Thu, 23 Apr 2015 23:16:12 +0000 (23:16 +0000)]
am
2fd6dda0: (-s ours) am
f33489c6: am
d24cc193: am
db672b6c: am
00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev
* commit '
2fd6dda03ef8b63b33bd36f7cfcf1f6ee365d571':
DO NOT MERGE Don't take flags when creating app widget config activity.
Ben Kwa [Wed, 22 Apr 2015 22:43:17 +0000 (15:43 -0700)]
Move extension checking code into FileUtils.
Move code for checking file extensions and MIME types from
ExternalStorageProvider into android.os.FileUtils, so it can be used by
other clients (e.g. DownloadsProvider).
BUG=
20157955
Change-Id: Ib16a16af723c21fb8d2912c8917dfd68653ea6fa
Chris Craik [Thu, 23 Apr 2015 23:06:32 +0000 (23:06 +0000)]
Merge "Anti-alias by default"
John Reck [Thu, 23 Apr 2015 22:51:55 +0000 (15:51 -0700)]
Teach LA how to destroy
Change-Id: I57ab30b6d56370dade6987f442136ea5e5546c9b
Jinsuk Kim [Thu, 23 Apr 2015 23:02:57 +0000 (08:02 +0900)]
CEC: Check port id for ARC status update on hotplug
Fixes a bug that was updating ARC status on hotplug event
regardless of the port for which the event occurred.
Bug:
20520664
Change-Id: I17c4f391af4dd221215412ed9e3ff3d730bbf152
Svetoslav [Thu, 23 Apr 2015 23:00:06 +0000 (23:00 +0000)]
Merge "Clear binder identity before reaching into keyguard settings"
Svetoslav [Thu, 23 Apr 2015 22:55:03 +0000 (15:55 -0700)]
Clear binder identity before reaching into keyguard settings
Change-Id: I80eeaed235acc165ddd4799ba46700afea2dff55
Wei Jia [Thu, 23 Apr 2015 21:10:30 +0000 (14:10 -0700)]
MediaSync: fix message delay based on play time for pending audio frames.
Bug:
19666434
Change-Id: Ia9ad3858d4ddccf8aa476f2506785f1d76f90b32
John Reck [Thu, 23 Apr 2015 22:45:54 +0000 (15:45 -0700)]
Move LinearAlloc to libhuwi
Change-Id: I1d8c99bdeef22ca569e1743cff6108f478737bc8
Tony Mantler [Thu, 23 Apr 2015 22:40:09 +0000 (22:40 +0000)]
Merge "Move StorageMeasurement to SettingsLib"