18794 Commits

Author SHA1 Message Date
Gabriel Peal
f364f94496 Added Action to PlaybackState
Added the ability to discover MediaBrowsers

Change-Id: I925c8738ac73afd0bee3dada2ee7ff2d5047e63f
2014-07-23 11:45:03 -07:00
Gabriel Peal
f0593bc17b Added QueueState, playUri, and playFromSearch.
Added QueueState to MediaSession/MediaController
Added play(Uri) and playFromSearch(String) to MediaController.TransportControls

Change-Id: I1a8ad5c22d05015ab6ff5700dc8a758455f1d89b
2014-07-23 11:45:03 -07:00
Jason Monk
8ed4d5ac66 Merge "Make the 'locked' lock task not lock keyguard on exit" into lmp-dev 2014-07-23 18:38:23 +00:00
Jeff Davidson
44e2be10f6 am fb28414b: am d0868c89: Implement VpnService.setBlocking().
* commit 'fb28414b5a1d32e023c74c755fa0283290414606':
  Implement VpnService.setBlocking().
2014-07-23 18:28:08 +00:00
Geoffrey Borggaard
7968b28ad8 Merge "Fixes setting password through DevicePolicyManager" into lmp-dev 2014-07-23 18:25:52 +00:00
Geoffrey Borggaard
987672d262 Fixes setting password through DevicePolicyManager
LockPatternUtils wasn't taking the userId into account when
looking up the salt.
Bug: 16204999

Change-Id: I0626b5a0a55c244122c24fb4446f270918f3187c
2014-07-23 20:03:51 +00:00
Jeff Davidson
6bbf39cf6b Implement VpnService.setBlocking().
Bug: 12879610
Change-Id: I3a0ad9eae5f7dd9c01f75b9da71810bad38f9fec
2014-07-23 11:18:57 -07:00
Matthew Williams
01ac45b6ff Fix JobScheduler race condition
The loading of jobs from disk is now done sychronously.

Bug: 16372824
Change-Id: Ica0592d6de51e89662c9e49ed1eb59209b64356c
2014-07-23 15:33:09 -07:00
Jason Monk
2961ce599e 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
2014-07-23 17:33:13 +00:00
destradaa
4b3e393127 Expose Gps Navigation Messages in the platform.
b/16405976

Change-Id: Ic982ea2467d116585780c20c2fa7e974e50f8345
2014-07-23 10:30:21 -07:00
RoboErik
397beaf432 am 67430c74: am 80380f82: Switch Session APIs over to AudioAttributes
* commit '67430c74d436e58d92b0d53ffdca1de5ded20c58':
  Switch Session APIs over to AudioAttributes
2014-07-23 17:20:01 +00:00
Dianne Hackborn
bfa2253e4b am 9566ecd9: am 79399931: Merge "Fix issue #16467284: Make noteStartVideo and noteStartAudio nesting" into lmp-dev
* commit '9566ecd9fbac848ba576282fd9ee315c33b28f0e':
  Fix issue #16467284: Make noteStartVideo and noteStartAudio nesting
2014-07-23 17:12:01 +00:00
Sander Alewijnse
8e1a01a49c am ce1088a6: am fcb490a2: Merge "Add Device Policy API to disable screen capture." into lmp-dev
* commit 'ce1088a641b0027df04e3388a73423294262d547':
  Add Device Policy API to disable screen capture.
2014-07-23 17:11:57 +00:00
RoboErik
9db9bf7034 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
2014-07-23 17:08:32 +00:00
Chris Wren
941d57ad86 am 43387c0c: am eb6f138b: Honor the sort and group keys for notification ranking.
* commit '43387c0c2cfc0b319f3a6884e5008f1d18e0c8b2':
  Honor the sort and group keys for notification ranking.
2014-07-23 14:28:54 +00:00
Chris Wren
1031c97485 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.

Expose a new API for listeners to get the group key for the notificaiton.

Bug: 15190903
Change-Id: I324ba0c394affdabb3588ca2ebafa7cf0acad2af
2014-07-23 09:45:25 -04:00
Chris Wren
9246171277 am 1ef27c1c: am 8980a58d: Merge "Revert "Honor the sort and group keys for notification ranking."" into lmp-dev
* commit '1ef27c1c9e9fb035951ca88881399fa3f57564df':
  Revert "Honor the sort and group keys for notification ranking."
2014-07-23 12:59:09 +00:00
Chris Wren
636f360ba5 am 14d65e68: am df09d4c3: Honor the sort and group keys for notification ranking.
* commit '14d65e68ad753c2384785061ea6e470a995dcab6':
  Honor the sort and group keys for notification ranking.
2014-07-23 12:59:01 +00:00
Nicolas Prevot
2a9844c5cc am b5b6f33e: am ea6f0c52: Fixing cross-user content.
* commit 'b5b6f33e777a62fc400e21ab73c2a78ba1c974e9':
  Fixing cross-user content.
2014-07-23 12:58:43 +00:00
Jungshik Jang
cfd1fa6357 am c1d403f6: am da251030: Add startTimerRecording api to IHdmiControlService.
* commit 'c1d403f661b6c7b9339e983e7f89a4c7e287e72b':
  Add startTimerRecording api to IHdmiControlService.
2014-07-23 12:58:38 +00:00
Youngsang Cho
74065729c4 am 5b0fca67: am 76f8d671: Block logging watched histories for passthrough inputs
* commit '5b0fca67b75204fb886e541719e6f049ed932dc5':
  Block logging watched histories for passthrough inputs
2014-07-23 12:58:34 +00:00
Chris Wren
4a24fd3c7b 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
2014-07-23 10:36:57 +00:00
Nicolas Prevot
66adae84d7 Fixing cross-user content.
Change-Id: I1f1beb514950f808ed9113357c3172bddcb06d9e
2014-07-23 08:35:21 +00:00
Jungshik Jang
bffb0635aa 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
2014-07-23 16:12:10 +09:00
Sander Alewijnse
0c1dcfd161 Merge "Add Device Policy API to disable screen capture." into lmp-dev 2014-07-23 05:48:23 +00:00
Sander Alewijnse
d2a1eec400 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
2014-07-23 13:44:28 +00:00
Chris Wren
cf7ed58308 Revert "Honor the sort and group keys for notification ranking."
This reverts commit df09d4c348f9f2aea10391b27d157d8b71a9e189.

Change-Id: Idbc9ed5c5c83cd0cad5a71872bcc203321a11e9e
2014-07-23 12:41:37 +00:00
Youngsang Cho
008f6d4e32 Block logging watched histories for passthrough inputs
Added a system API TvContract.isChannelUriForPassthroughTvInput

Change-Id: I933482831ae2a8b4d6000c4d16520387b5b6a13f
2014-07-22 22:16:01 -07:00
Dianne Hackborn
ac725d37b8 am 2c89b4b3: am dc4a88f7: Merge "Further fix on issue #16013164" into lmp-dev
* commit '2c89b4b3ad6a9c88d5039296839b885843401d01':
  Further fix on issue #16013164
2014-07-23 01:35:43 +00:00
Dianne Hackborn
f9e523f4af am cf24cfb1: am 7aeb54cf: Merge "Finish toast app op." into lmp-dev
* commit 'cf24cfb1a1daf045601b1e13b0012a59b66f6572':
  Finish toast app op.
2014-07-23 01:35:38 +00:00
Dianne Hackborn
86848b9f11 am aacb2f77: am 4575f2a9: Merge "Use foreground broadcast to get device admin msg." into lmp-dev
* commit 'aacb2f778d71f2cd2b75e43b66f2de7ffc5d92c9':
  Use foreground broadcast to get device admin msg.
2014-07-23 01:35:34 +00:00
Adam Lesinski
65e91e5698 am c3b343ec: am f0ba6878: Merge "Add test UsageStats App" into lmp-dev
* commit 'c3b343ec2c02c94326fe0264d9829bcdf31fb34a':
  Add test UsageStats App
2014-07-23 01:31:35 +00:00
John Spurlock
c82bcdfd00 am 4368f19f: am 064c40c0: Merge "Wire up CATEGORY_ALARM and CATEGORY_EVENT." into lmp-dev
* commit '4368f19f5011891268da673dee4636cf61f3cae7':
  Wire up CATEGORY_ALARM and CATEGORY_EVENT.
2014-07-23 01:19:26 +00:00
Craig Mautner
acb2a9adf6 am 0ccbb629: am 21668519: Refactor window manager screenshot
* commit '0ccbb629079828bc63b1186946f6e2001fef8ea8':
  Refactor window manager screenshot
2014-07-23 00:53:56 +00:00
Craig Mautner
368c5adaf7 Refactor window manager screenshot
For readability, and add rotation compensation.

Fixes bug 16142514.

Change-Id: I1156ec2e0f052f6dec56457d56efe95368f60d91
2014-07-23 00:45:58 +00:00
Carlos Valdivia
1321d01b50 am 8725abad: am 26680d5c: Merge "Allow authenticators to rename accounts." into lmp-dev
* commit '8725abadce9cda4894780eaa24781a1f878512d5':
  Allow authenticators to rename accounts.
2014-07-23 00:45:49 +00:00
Sandeep Siddhartha
e40a8685ec am 7573ba5f: am 82d56d82: Merge "Make hotword availability a callback" into lmp-dev
* commit '7573ba5f00c5c7470942bae5d5c8a0cecd002333':
  Make hotword availability a callback
2014-07-23 00:37:03 +00:00
Sreeram Ramachandran
3e47b60378 am a4a22918: am bfea100c: Merge "Cleanup: Delete dead code." into lmp-dev
* commit 'a4a229185c60f4abf6674adc6a49e5ab7000fb16':
  Cleanup: Delete dead code.
2014-07-22 23:53:25 +00:00
Christopher Tate
a5e44a8cf8 am 8b9f6619: am ef76d6a4: Merge "Handle single-package restores properly" into lmp-dev
* commit '8b9f6619830d5291b16d13ce211a5b7542417907':
  Handle single-package restores properly
2014-07-22 23:53:21 +00:00
RoboErik
c231679abc am 390f77b3: am befdf350: Move return out of debug conditional
* commit '390f77b31b6c0cf71578e636154715fe462bcd93':
  Move return out of debug conditional
2014-07-22 23:07:30 +00:00
RoboErik
b7c014c291 Move return out of debug conditional
Accidentally put the return for not sending volume changes into
the debug conditional.

bug:16379124
Change-Id: I473f6fdf7577ca26559ab9b02f4dc0613ef702e3
2014-07-22 23:00:14 +00:00
Christopher Tate
574d5e1c8e am 96448307: am 258e43ce: Merge "Always check restore against the latest backend metadata" into lmp-dev
* commit '96448307e6a14aa593adb19a0d2ab62a2b96b6ae':
  Always check restore against the latest backend metadata
2014-07-22 22:47:06 +00:00
John Spurlock
79cac9d0f0 Merge "Wire up CATEGORY_ALARM and CATEGORY_EVENT." into lmp-dev 2014-07-22 22:02:49 +00:00
John Spurlock
333f8dd78f Wire up CATEGORY_ALARM and CATEGORY_EVENT.
And remove the alarm package whitelist now that deskclock
uses a category.

Bug:16406214
Change-Id: I6ca400376a9df7646889e394e53e4d491c56a46c
2014-07-22 21:06:34 -04:00
Robin Lee
ea697d7269 am 51533e26: am 96251e35: Stop double-loading device admins
* commit '51533e265dc5081d70c010d6f17e36f6b72dc8e5':
  Stop double-loading device admins
2014-07-22 21:53:45 +00:00
Alexandra Gherghina
a461c35ef5 am 6ec756fd: am 5f9a77e5: Do Not Merge Per-user API for master sync
* commit '6ec756fd1503ea88bd1ca031eeef733e2a44bfac':
  Do Not Merge Per-user API for master sync
2014-07-22 21:47:05 +00:00
Robin Lee
9c2be6c7ba Stop double-loading device admins
loadSettingsLocked() was being called twice for USER_OWNER at
systemReady(), doubling the number of admin entries at every boot.

Also guards against double-adding admins which appear twice in the
same XML file, favouring more recently-refreshed entries for
backward compatibility.

Previously an application calling in with 'refreshing = true' would
double-insert whatever admin was being refreshed into its user's list
of device admins. This is fixed too.

@bug 16416936

Change-Id: Idd147aa130e6bce7bcc40532f0a7fb07117b3151
2014-07-22 21:35:09 +00:00
Sandeep Siddhartha
f63bc523ea 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
2014-07-22 17:11:52 -07:00
Alexandra Gherghina
0e9ac20d7e Do Not Merge Per-user API for master sync
Change-Id: I6a8088eb3bfddae4c8e38904dd26baf3c7c09c9e
(cherry picked from commit 222aea8bd997807784dc99ca53f63280d384fdf0)
2014-07-22 20:15:45 +00:00
Sreeram Ramachandran
e0d713afdc am bae0d23d: am 4463fd65: Merge "Fix WiFi-Direct." into lmp-dev
* commit 'bae0d23df8e1461168e229e170247433a3a3ab38':
  Fix WiFi-Direct.
2014-07-22 18:57:59 +00:00