OSDN Git Service
Robert Shih [Fri, 25 Jul 2014 18:08:50 +0000 (11:08 -0700)]
MediaPlayer: scanInternalSubtitleTracks in synchronous prepare
Bug:
16385674
Change-Id: I56d205ad2fe33bd64ea2251440c88fd4ecfa13ad
ram [Fri, 18 Jul 2014 12:08:15 +0000 (17:38 +0530)]
IMS: getPCSCF() API enhanced to support multiple APN types.
Change-Id: I014f341b93a9ea7280e04cdfc13418fe81c9fc8b
Signed-off-by: ram <ram.pl@samsung.com>
Alan Viverette [Thu, 24 Jul 2014 00:40:48 +0000 (00:40 +0000)]
Merge "Make lighting style and attribute public" into lmp-dev
Alan Viverette [Thu, 24 Jul 2014 00:31:00 +0000 (17:31 -0700)]
Make lighting style and attribute public
BUG:
15859361
Change-Id: I8a12b820687c546d7441a06161da5928b2ac52fb
Geoffrey Borggaard [Thu, 24 Jul 2014 00:24:17 +0000 (00:24 +0000)]
Merge "Fixes setting password through DevicePolicyManager" into lmp-dev
Geoffrey Borggaard [Fri, 18 Jul 2014 20:47:18 +0000 (16:47 -0400)]
Fixes setting password through DevicePolicyManager
LockPatternUtils wasn't taking the userId into account when
looking up the salt.
Bug:
16204999
Change-Id: I0626b5a0a55c244122c24fb4446f270918f3187c
Robert Greenwalt [Wed, 23 Jul 2014 19:45:20 +0000 (19:45 +0000)]
Merge "Reenable logging." into lmp-dev
Robert Greenwalt [Wed, 23 Jul 2014 19:42:47 +0000 (12:42 -0700)]
Reenable logging.
ConnectivityService has been rewritten for L and is in a stabilizing period.
We need the logging to track down bugs people report.
Restoring to Pre-L conditions.
If there's excess logging please report it - it probably indicates a bug.
Change-Id: I7baf891e3bf12e1545afeb92b8d5af0b01e12a7b
Tao Bai [Wed, 23 Jul 2014 19:19:52 +0000 (19:19 +0000)]
Merge "WebView permission change" into lmp-dev
Tao Bai [Wed, 16 Jul 2014 20:54:15 +0000 (13:54 -0700)]
WebView permission change
As requested by API council, the following were changed
- Changed the PermissionRequest to abstract.
- Used String for resources instead of long.
- Also remove the WebView.preauthorizePermission() which we didn't think
BUG:
15432556
Change-Id: I900a98b4e0288d2bcd8faf0bbcd84970600548a5
Eino-Ville Talvala [Tue, 15 Jul 2014 17:31:54 +0000 (10:31 -0700)]
Camera2: Fix callback operation
- Remove CloseableLock use; looks to be incompatible with invocations during callbacks
- Replace with basic interface lock to be thread-safe
- Add intermediate callback thread to legacy mode to match cross-process one-way Binder
semantics
Change-Id: Iecd4ff6cf260c5a13bd11b850177ccea93e25933
Craig Mautner [Wed, 23 Jul 2014 17:42:18 +0000 (10:42 -0700)]
Disable back button goes to recents behavior
Using a static final boolean to do this so if policy is changed it
can be enabled easily.
Also fix fetching task from wrong list. Was causing
ActivityNotFoundExceptions.
Fixes bug
16512561.
Change-Id: I9b47a86fd740d45104aa14712e71df830218c5a7
Prerepa Viswanadham [Wed, 23 Jul 2014 00:00:09 +0000 (17:00 -0700)]
Bug
15564216: Report Bluetooth tx/rx/idle activity info and energy reporting
Change-Id: I66fd83d8d59fbd93dec8886dfd313a81575e38a5
Nancy Chen [Wed, 23 Jul 2014 23:45:16 +0000 (23:45 +0000)]
Merge "Hide multiple-account information if there is only a single account" into lmp-dev
Nancy Chen [Tue, 22 Jul 2014 23:56:49 +0000 (16:56 -0700)]
Hide multiple-account information if there is only a single account
Adding an API method to telecomm to determine whether there is a single
account.
Bug:
16483795
Change-Id: If30d3a53458b4c784995f3f9e471c8163a8175a4
Gabriel Peal [Wed, 23 Jul 2014 20:02:19 +0000 (20:02 +0000)]
Merge changes I925c8738,I1a8ad5c2 into lmp-dev
* changes:
Added Action to PlaybackState
Added QueueState, playUri, and playFromSearch.
Gabriel Peal [Tue, 22 Jul 2014 16:39:06 +0000 (09:39 -0700)]
Added Action to PlaybackState
Added the ability to discover MediaBrowsers
Change-Id: I925c8738ac73afd0bee3dada2ee7ff2d5047e63f
Gabriel Peal [Tue, 22 Jul 2014 16:39:06 +0000 (09:39 -0700)]
Added QueueState, playUri, and playFromSearch.
Added QueueState to MediaSession/MediaController
Added play(Uri) and playFromSearch(String) to MediaController.TransportControls
Change-Id: I1a8ad5c22d05015ab6ff5700dc8a758455f1d89b
Ye Wen [Wed, 23 Jul 2014 18:53:02 +0000 (18:53 +0000)]
Merge "Infer legacy network type for ConnectivityManager.requestNetwork" into lmp-dev
Ye Wen [Mon, 21 Jul 2014 21:19:01 +0000 (14:19 -0700)]
Infer legacy network type for ConnectivityManager.requestNetwork
ConnectivityManager.requestNetwork pass TYPE_NONE to
sendRequestForNetwork which prevents it from being used with legacy API
requestRouteToHostAddress. This CL infers the legacy network type
automatically from the network capabilities.
b/
16324360
Change-Id: I591d38f875f42f56e8cfc157db2069c9eee0ee26
Jason Monk [Wed, 23 Jul 2014 18:44:53 +0000 (18:44 +0000)]
Merge "Make the 'locked' lock task not lock keyguard on exit" into lmp-dev
Matthew Williams [Wed, 23 Jul 2014 22:44:08 +0000 (22:44 +0000)]
Merge "Fix JobScheduler race condition" into lmp-dev
Matthew Williams [Wed, 23 Jul 2014 03:44:12 +0000 (20:44 -0700)]
Fix JobScheduler race condition
The loading of jobs from disk is now done sychronously.
Bug:
16372824
Change-Id: Ica0592d6de51e89662c9e49ed1eb59209b64356c
Shishir Agrawal [Mon, 21 Jul 2014 20:17:33 +0000 (13:17 -0700)]
Expose getCarrierPackageNamesForBroadcastIntent as a hidden @SystemApi
It will be required by setup wizard to delegate initialization to the carrier
app.
Change-Id: Icc0fc728e1e24235632ac38a482b06a7b829de78
John Reck [Wed, 23 Jul 2014 21:54:04 +0000 (14:54 -0700)]
Dump RenderThread stack on unresponsive
Bug:
16408405
Change-Id: I4ba4836fd1451fb8ba77c34cdb843d3cb4217bb8
ztenghui [Mon, 21 Jul 2014 22:59:06 +0000 (15:59 -0700)]
Add negative sign separation support in the pathData
bug:
14585171
Change-Id: I61dec27856be09c44bb1d32ff61b3c3cd458cc34
Alan Viverette [Wed, 23 Jul 2014 21:41:25 +0000 (21:41 +0000)]
Merge "Use activity for brightness dialog" into lmp-dev
destradaa [Wed, 23 Jul 2014 21:35:59 +0000 (21:35 +0000)]
Merge "Expose Gps Navigation Messages in the platform. b/
16405976" into lmp-dev
John Spurlock [Wed, 23 Jul 2014 15:09:02 +0000 (11:09 -0400)]
Doze: Manage screen state + brightness when teasing.
Bug:
15863249
Change-Id: I2e9574afd58594d1895777024529e90815c66913
Winson Chung [Wed, 23 Jul 2014 21:53:22 +0000 (21:53 +0000)]
Merge "Fixing issue with the lock-to-app setting not being refreshed when entering recents." into lmp-dev
Winson Chung [Wed, 23 Jul 2014 18:51:32 +0000 (11:51 -0700)]
Fixing issue with the lock-to-app setting not being refreshed when entering recents.
Change-Id: I8236aebc18a0d7194bfe50fe2c61659caa39b04c
RoboErik [Wed, 23 Jul 2014 21:04:58 +0000 (21:04 +0000)]
Merge "Change "Media output" to "Cast" for MR Button" into lmp-dev
RoboErik [Wed, 23 Jul 2014 21:00:05 +0000 (14:00 -0700)]
Change "Media output" to "Cast" for MR Button
We used Media output before settling on Cast as the official verb.
bug:
13300059
Change-Id: I1c497eb130d5324eec0c6aaceb8dbc88a92a6d7b
RoboErik [Wed, 23 Jul 2014 20:25:02 +0000 (13:25 -0700)]
Return appropriately scaled artwork to RemoteController
RemoteController has an api to set the artwork size. This adds compatibility
code to do the exclusion or scaling of artwork to be consistent with old APIs.
bug:
15618171
Change-Id: I8cc51750c03219d42d5f543419f8b46f9eb5b833
RoboErik [Wed, 23 Jul 2014 20:44:56 +0000 (20:44 +0000)]
Merge "Return appropriately scaled artwork to RemoteController" into lmp-dev
Jeff Sharkey [Wed, 23 Jul 2014 20:22:43 +0000 (13:22 -0700)]
Remove APK observers.
Most app installations have migrated to the new cluster-style layout
where each app is placed in a unique directory. There are now two
general issues with these observers:
We can't know when a push/sync has finished delivering all splits
for an app. Also, inotify isn't recursive, so we'd have to manage
watches for each app directory.
Change-Id: I3770fa9059ddf80f933a3804714f2e52591fce49
Yao Chen [Wed, 23 Jul 2014 20:25:08 +0000 (20:25 +0000)]
Merge "various fixes in MediaBrowserItem and MediaBrowserService" into lmp-dev
Jae Seo [Wed, 23 Jul 2014 20:02:14 +0000 (13:02 -0700)]
Fix build
Change-Id: Icc1bf76ef748b10cc7ea745bc37c4e7bc0d7ff43
Yao Chen [Wed, 23 Jul 2014 17:54:29 +0000 (10:54 -0700)]
various fixes in MediaBrowserItem and MediaBrowserService
Change-Id: I57f2a6728eea14ff6243fd68d21886599a5a12f4
Jason Monk [Wed, 23 Jul 2014 17:30:27 +0000 (13:30 -0400)]
Make the 'locked' lock task not lock keyguard on exit
While here also fix mIsLockTaskLocked to actually be set to a value
so that it can be used.
Bug:
16347391
Change-Id: I27416f4787b28d19d84f895889eea1d3202c1759
destradaa [Tue, 22 Jul 2014 01:01:47 +0000 (18:01 -0700)]
Expose Gps Navigation Messages in the platform.
b/
16405976
Change-Id: Ic982ea2467d116585780c20c2fa7e974e50f8345
Alan Viverette [Wed, 23 Jul 2014 18:27:19 +0000 (18:27 +0000)]
Merge "Ensure ripple mask gets updated in public constructor" into lmp-dev
Alan Viverette [Wed, 23 Jul 2014 18:25:28 +0000 (11:25 -0700)]
Ensure ripple mask gets updated in public constructor
Change-Id: I084ff0357c8e3cf08d3700d9c7dce42726b986f1
Jeff Davidson [Wed, 23 Jul 2014 17:14:53 +0000 (10:14 -0700)]
Implement VpnService.setBlocking().
Bug:
12879610
Change-Id: I3a0ad9eae5f7dd9c01f75b9da71810bad38f9fec
Brian Attwell [Wed, 23 Jul 2014 03:53:59 +0000 (20:53 -0700)]
Add PICK_JOIN_CONTACT_ACTION action contact
This ContactsContract change is needed by ag/509090
Bug:
16190113
Change-Id: I0f96286bdf45015148d2e84f7fe7aac5b23e1ba2
Wei Wang [Wed, 23 Jul 2014 18:41:10 +0000 (18:41 +0000)]
Merge "Fix parcel issues with empty service uuid. Added tests." into lmp-dev
Wei Wang [Wed, 23 Jul 2014 07:33:44 +0000 (00:33 -0700)]
Fix parcel issues with empty service uuid. Added tests.
b/
16490816
Change-Id: If26a4731f22e83df4f5ded2ad76901de6c49a010
Alan Viverette [Wed, 23 Jul 2014 01:42:11 +0000 (01:42 +0000)]
Merge "Remove dialog icons" into lmp-dev
Alan Viverette [Wed, 23 Jul 2014 01:41:37 +0000 (18:41 -0700)]
Remove dialog icons
BUG:
16493564
Change-Id: Ica59abb70a924cccd705172d323a535ef9b75cf1
Craig Mautner [Tue, 22 Jul 2014 23:47:26 +0000 (16:47 -0700)]
Refactor window manager screenshot
For readability, and add rotation compensation.
Fixes bug
16142514.
Change-Id: I1156ec2e0f052f6dec56457d56efe95368f60d91
Chris Craik [Wed, 23 Jul 2014 18:10:49 +0000 (18:10 +0000)]
Merge "Build layer damage bounds for shadows" into lmp-dev
Chris Craik [Wed, 16 Jul 2014 17:15:56 +0000 (10:15 -0700)]
Build layer damage bounds for shadows
bug:
15538815
Change-Id: I703afeb7e31c28002bd1aff9ce448ec8cdc4e70d
Dianne Hackborn [Wed, 23 Jul 2014 01:29:06 +0000 (01:29 +0000)]
Merge "Further fix on issue #
16013164" into lmp-dev
Dianne Hackborn [Tue, 22 Jul 2014 23:29:04 +0000 (16:29 -0700)]
Further fix on issue #
16013164
Dumb dumb dumb copy/paste error when moving the
uid checking up out of the function.
Change-Id: I01513ccd80750b724dbfa8d9d7d171819c6b959b
Dianne Hackborn [Wed, 23 Jul 2014 01:28:54 +0000 (01:28 +0000)]
Merge "Finish toast app op." into lmp-dev
Dianne Hackborn [Tue, 22 Jul 2014 23:22:37 +0000 (16:22 -0700)]
Finish toast app op.
It was half-done, the window manager would check it
when the window was added, but was not monitoring for changes
to its state like it does for the system alert op.
Change-Id: I0279c4ac6160062cd219372af4bd9d7e4e687460
Carlos Valdivia [Wed, 23 Jul 2014 00:33:51 +0000 (00:33 +0000)]
Merge "Allow authenticators to rename accounts." into lmp-dev
Chris Craik [Wed, 23 Jul 2014 00:25:21 +0000 (00:25 +0000)]
Merge "Make setter methods on Outline call setEmpty() based on params" into lmp-dev
Chris Craik [Mon, 21 Jul 2014 17:25:54 +0000 (10:25 -0700)]
Make setter methods on Outline call setEmpty() based on params
bug:
16142564
Additionally, better define behavior around null outline providers:
A view with an empty outline, and setClipToOutline=true will not be
rendered, though one with a null outline provider
(and thus no outline) will be.
Change-Id: Ic9549841b107b2eb51b417c66058a0cd69dd89eb
Sandeep Siddhartha [Wed, 23 Jul 2014 00:24:44 +0000 (00:24 +0000)]
Merge "Make hotword availability a callback" into lmp-dev
Alan Viverette [Wed, 23 Jul 2014 00:12:56 +0000 (17:12 -0700)]
Update spinner asset, fix default popup context and elevation
BUG:
15985882
Change-Id: Ica8c2597c35bd3012da11e315a93bbd1df2f3f38
Sandeep Siddhartha [Tue, 22 Jul 2014 16:49:49 +0000 (09:49 -0700)]
Make hotword availability a callback
This helps us make the list sound models operation an async one, it also helps us
with the case where a detector is invalidated, so the client doesn't have to keep checking the
state.
Synchronize DatabaseHelper methods on its instance so that other VoiceInteractionManagerService
calls aren't blocked on db writes/reads.
It's still possible for the list operation to be blocked on update and vice-versa
Change-Id: Ib8ec4ac5056b62d443038560ce31d0641b4627b0
Yao Chen [Wed, 23 Jul 2014 00:06:05 +0000 (00:06 +0000)]
Merge "Add thumbnail related api." into lmp-dev
Winson Chung [Wed, 23 Jul 2014 00:02:16 +0000 (17:02 -0700)]
Fixing animation when dismissing certain tasks.
Yao Chen [Tue, 22 Jul 2014 06:36:24 +0000 (23:36 -0700)]
Add thumbnail related api.
Change-Id: Ifcb06bbaf8f37df367f130124cbcef065fa25766
Chong Zhang [Tue, 22 Jul 2014 16:12:36 +0000 (09:12 -0700)]
update battery stats for audio/video
Bug:
12979595
Change-Id: I581376cb88a2d14dc4bad77d454b9bba73d0eb9b
Sreeram Ramachandran [Tue, 22 Jul 2014 23:45:05 +0000 (23:45 +0000)]
Merge "Cleanup: Delete dead code." into lmp-dev
Sreeram Ramachandran [Sun, 20 Jul 2014 06:21:46 +0000 (23:21 -0700)]
Cleanup: Delete dead code.
Bug:
15413389
Change-Id: I315468832ef18ffc84174e54774ab63b86d284dc
Andrew Lee [Tue, 22 Jul 2014 22:42:35 +0000 (22:42 +0000)]
Merge "Revert "Don't throw RemoteException in public RemoteCallVideoClient APIs."" into lmp-dev
Andrew Lee [Tue, 22 Jul 2014 22:42:10 +0000 (22:42 +0000)]
Revert "Don't throw RemoteException in public RemoteCallVideoClient APIs."
This reverts commit
080b1f58eb877e1ac375768c6f951cc61a3cdbae.
Change-Id: I0dc963b3f4efe1479a7a94b8d851b89d15480d17
Andrew Lee [Tue, 22 Jul 2014 19:09:38 +0000 (12:09 -0700)]
Don't throw RemoteException in public RemoteCallVideoClient APIs.
- Hide constructor.
- No longer implements IBinder.DeathRecipient.
- Catch RemoteExceptions instead of throwing RemoteExceptions.
Change-Id: Id666818b868c61f17b0701e4590d4e36f12c7b01
Christopher Tate [Tue, 22 Jul 2014 22:39:04 +0000 (22:39 +0000)]
Merge "Always check restore against the latest backend metadata" into lmp-dev
Winson Chung [Tue, 22 Jul 2014 19:27:13 +0000 (12:27 -0700)]
Intermediate refactoring to move towards in-app view transitions.
- Fixing bug where we weren't toggling to the right task when using affiliations
- Refactoring task rect calculation to allow full screen task view to be laid out for transitions
- Refactoring the view bounds animations into a separate class
- Refactoring the footer view (for lock-to-task) out of TaskView
- Refactoring some transform code out of TaskView
- Removing fullscreen overlay view
- Fixing case where extra invalidations and layouts were still happening in FixedSizeImageView
- Adding debug overlay to replace specific debug drawing code
Change-Id: Ibf98b6a0782a68cd84582203c807cece1ff3379f
Christopher Tate [Tue, 22 Jul 2014 19:54:52 +0000 (12:54 -0700)]
Always check restore against the latest backend metadata
Bug
16484934
Change-Id: I472a7db89a94b9804f6ea94c25da206dd111a497
Alex Klyubin [Mon, 21 Jul 2014 17:09:58 +0000 (10:09 -0700)]
Align PSKKeyManager with framework API style.
This CL adjusts android.net.PSKKeyManager as follows:
* Renamed to PskKeyManager to follow naming conventions.
* Changed from interface to abstract class with default
implementations for all methods.
Bug:
16403305
Bug:
15073623
Change-Id: Iefce26b394d4a753412315dad554b5342f3f0b44
Christopher Tate [Tue, 22 Jul 2014 23:44:04 +0000 (23:44 +0000)]
Merge "Handle single-package restores properly" into lmp-dev
Christopher Tate [Tue, 22 Jul 2014 23:24:28 +0000 (16:24 -0700)]
Handle single-package restores properly
Bug
16346405
Change-Id: I69e3288f5a9d68d818fad6a2cd4b27ad45c1007e
John Spurlock [Tue, 22 Jul 2014 23:39:58 +0000 (23:39 +0000)]
Merge "BatterySaver: Make the bars orange." into lmp-dev
John Spurlock [Tue, 22 Jul 2014 20:15:08 +0000 (16:15 -0400)]
BatterySaver: Make the bars orange.
Bug:
16203820
Change-Id: I85f700d30a90212202626fc10fb289aca7f2b688
Andrew Lee [Tue, 22 Jul 2014 23:34:03 +0000 (23:34 +0000)]
Merge "Don't throw RemoteException in public RemoteCallVideoClient APIs." into lmp-dev
Winson Chung [Tue, 22 Jul 2014 23:30:37 +0000 (16:30 -0700)]
Always enable HW layers on task views. (Bug
15986310)
- Use color filter to apply dim to the task view layer
- Fixing bug where you would see a flash of the task view when animating out of Recents.
RoboErik [Tue, 22 Jul 2014 22:58:22 +0000 (15:58 -0700)]
Move return out of debug conditional
Accidentally put the return for not sending volume changes into
the debug conditional.
bug:
16379124
Change-Id: I473f6fdf7577ca26559ab9b02f4dc0613ef702e3
Andrew Lee [Tue, 22 Jul 2014 19:09:38 +0000 (12:09 -0700)]
Don't throw RemoteException in public RemoteCallVideoClient APIs.
- Hide constructor.
- No longer implements IBinder.DeathRecipient.
- Catch RemoteExceptions instead of throwing RemoteExceptions.
Change-Id: Iaa049cab9e24120d3ea732e1ede78cc6fcd0ad71
Svet Ganov [Wed, 23 Jul 2014 17:11:53 +0000 (17:11 +0000)]
Merge "Adding shell commands for grant/revoke of bind app widget permisison." into lmp-dev
RoboErik [Mon, 21 Jul 2014 19:44:53 +0000 (12:44 -0700)]
Switch Session APIs over to AudioAttributes
The session apis were using audioStream in several places. This
updates them to use AudioAttributes instead.
bug:
16403289
Change-Id: Ic4da9ca5fbea2536e80c71503bd9a9bf7f346997
Svet Ganov [Tue, 22 Jul 2014 06:46:05 +0000 (23:46 -0700)]
Adding shell commands for grant/revoke of bind app widget permisison.
Testing the app widget APIs requires binding of widgets which is guarded
by a system signature permission or white listing. Since CTS tests can
not be signed with the platform certificate, they should be able to
temporariliy white list their package. This command adds the ability to
grant and revoke the provilege to bind app widgets to a given package.
Change-Id: I6de1bbf27ac684ec47e61157f19ec6d29e2db979
Dianne Hackborn [Wed, 23 Jul 2014 17:05:15 +0000 (17:05 +0000)]
Merge "Fix issue #
16467284: Make noteStartVideo and noteStartAudio nesting" into lmp-dev
Dianne Hackborn [Wed, 23 Jul 2014 05:54:55 +0000 (22:54 -0700)]
Fix issue #
16467284: Make noteStartVideo and noteStartAudio nesting
Also add new methods to clear these states, so we can avoid any
nesting issues from getting the tracking state stuck.
Change-Id: Iba0eaba2a9a186355c24d392f16118982c5331ed
Sander Alewijnse [Wed, 23 Jul 2014 16:59:08 +0000 (16:59 +0000)]
Merge "Add Device Policy API to disable screen capture." into lmp-dev
Sander Alewijnse [Wed, 9 Jul 2014 11:57:05 +0000 (12:57 +0100)]
Add Device Policy API to disable screen capture.
WindowManager will set secure flag on SurfaceControl for
all windows of a flagged user to prevent screen capture.
API is consistent with the camera disable API.
Change-Id: Ib180f67f1ad827b6f4aca2af615274256cce58f4
Chris Wren [Wed, 23 Jul 2014 12:41:50 +0000 (12:41 +0000)]
Merge "Revert "Honor the sort and group keys for notification ranking."" into lmp-dev
Chris Wren [Wed, 23 Jul 2014 12:41:37 +0000 (12:41 +0000)]
Revert "Honor the sort and group keys for notification ranking."
This reverts commit
df09d4c348f9f2aea10391b27d157d8b71a9e189.
Change-Id: Idbc9ed5c5c83cd0cad5a71872bcc203321a11e9e
Chris Wren [Thu, 17 Jul 2014 21:08:53 +0000 (17:08 -0400)]
Honor the sort and group keys for notification ranking.
Sort notifications naturally, then move group childen to be next their proxy.
The group proxy is the summary, or if no summary exists, the lowest-ranked
member of the group is chosen as the proxy.
Notifications with a sortKey but no group and placed into a synthetic
group that consists of all notifications from that package and user in
the same priority bucket that also have sortKeys.
Bug:
15190903
Change-Id: I377ed65b9592079446da4a4189f5ab49d28630ec
Narayan Kamath [Wed, 23 Jul 2014 10:24:50 +0000 (10:24 +0000)]
Merge "Add an internal API to get all asset locales." into lmp-dev
Narayan Kamath [Mon, 14 Jul 2014 15:28:24 +0000 (16:28 +0100)]
Add an internal API to get all asset locales.
This will allow us to not copy paste this code verbatim into
bundled apps.
bug:
10090157
(cherry picked from commit
9e6d9d4c812d01ac07180c5d6ab64c36fb9b2aa7)
Change-Id: I34690a2b6dad51f1592f37d3c2a8c81345632c2f
Narayan Kamath [Fri, 18 Jul 2014 15:09:36 +0000 (16:09 +0100)]
Remove copy of Locale.adjustLanguageCode.
(cherry picked from commit
1d31a5f8243fd6befb14d8a2ba25d28e006511f8)
Change-Id: I7b30a153a44dc1f99a9ddfe256b770d7305a74b7
Nicolas Prevot [Mon, 21 Jul 2014 15:28:21 +0000 (16:28 +0100)]
Fixing cross-user content.
Change-Id: I1f1beb514950f808ed9113357c3172bddcb06d9e
Jungshik Jang [Tue, 22 Jul 2014 07:56:52 +0000 (16:56 +0900)]
Add startTimerRecording api to IHdmiControlService.
In order to support timer recording we need separate API,
startTimerRecording. Also added HdmiTimerRecordingSources
which is used to help creating timer recording information
such as timing information and program information.
Besides, in order to distinguish one touch record
and timer recording, rename startRecord with startOneTouchRecording.
Bug:
16160962
Change-Id: I8c3d4034665a2f84ddf07135aee73e17ac17cd82
Narayan Kamath [Wed, 23 Jul 2014 10:24:47 +0000 (10:24 +0000)]
Merge "Remove copy of Locale.adjustLanguageCode." into lmp-dev
Bryan Mawhinney [Tue, 22 Jul 2014 11:50:09 +0000 (12:50 +0100)]
Store actions passed to MediaStyle.setShowActionsInCompactView in extras
So that they can be bridged appropriately by Android Wear
Change-Id: I3a21a74991c8067ece1a04fbd0b92dd21438e0fd