18604 Commits

Author SHA1 Message Date
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
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
Jeff Davidson
6bbf39cf6b Implement VpnService.setBlocking().
Bug: 12879610
Change-Id: I3a0ad9eae5f7dd9c01f75b9da71810bad38f9fec
2014-07-23 11:18:57 -07: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
Dianne Hackborn
4bd39ec448 Merge "Fix issue #16467284: Make noteStartVideo and noteStartAudio nesting" into lmp-dev 2014-07-22 16:29:55 +00:00
Dianne Hackborn
10eaa8574b 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
2014-07-23 17:05:04 +00: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
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
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
551caf64a0 Merge "Further fix on issue #16013164" into lmp-dev 2014-07-22 16:21:19 +00:00
Dianne Hackborn
b64afe1706 Further fix on issue #16013164
Dumb dumb dumb copy/paste error when moving the
uid checking up out of the function.

Change-Id: I01513ccd80750b724dbfa8d9d7d171819c6b959b
2014-07-22 18:26:29 -07: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
Dianne Hackborn
e39e5bff29 Merge "Finish toast app op." into lmp-dev 2014-07-22 16:29:55 +00:00
Dianne Hackborn
4eee3cb1df 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
2014-07-22 18:27:26 -07: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
Carlos Valdivia
75111d83e6 Merge "Allow authenticators to rename accounts." into lmp-dev 2014-07-22 16:21:19 +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
Sreeram Ramachandran
71f6ad31cf Merge "Cleanup: Delete dead code." into lmp-dev 2014-07-22 16:21:19 +00:00
Sreeram Ramachandran
03666c705d Cleanup: Delete dead code.
Bug: 15413389
Change-Id: I315468832ef18ffc84174e54774ab63b86d284dc
2014-07-22 15:46:34 -07:00
Christopher Tate
dcb7a9511c Merge "Always check restore against the latest backend metadata" into lmp-dev 2014-07-22 16:29:55 +00:00
Christopher Tate
f7cbb1fc25 Always check restore against the latest backend metadata
Bug 16484934

Change-Id: I472a7db89a94b9804f6ea94c25da206dd111a497
2014-07-22 15:12:02 -07:00
Christopher Tate
a4e4d68f08 Handle single-package restores properly
Bug 16346405

Change-Id: I69e3288f5a9d68d818fad6a2cd4b27ad45c1007e
2014-07-22 23:42:48 +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
Dianne Hackborn
db0f364c05 Merge "Use foreground broadcast to get device admin msg." into lmp-dev 2014-07-22 16:13:36 +00:00
Dianne Hackborn
8ddeee98b8 Use foreground broadcast to get device admin msg.
Using a background broadcast is bad, it can take a long
time to get the message back, either accidentally (backed up
behind other broadcasts) or from a deliberately malicious
admin.

Change-Id: Ib7491f8e27dacdc002562aef027ee4664e78e97b
2014-07-22 18:27:52 -07:00
Adam Lesinski
59abf5305b Merge "Add test UsageStats App" into lmp-dev 2014-07-22 16:21:19 +00:00
Adam Lesinski
e159e2e0b8 Add test UsageStats App
Also fixed UsageStatsService to do the right thing
when AppOps returns MODE_DEFAULT.

Change-Id: I0bdb28350fb2528daf2859cdcbbf9ca48d96dde9
2014-07-22 18:21:58 -07: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
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
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
Carlos Valdivia
f193b9a61d Allow authenticators to rename accounts.
Bug: 16390602

Change-Id: I4f7250726a2c7677e0ccaa6e5f995153893d8360
2014-07-21 13:56:45 -07:00
Sreeram Ramachandran
a77760d74a Fix WiFi-Direct.
Add a new command to let netd know about routes on a p2p interface.

Bug: 15413694

Change-Id: I36effc438d5ac193a77174493bf196cb68a5b97a
2014-07-22 11:24:29 -07:00
Craig Mautner
dc00cbe2c1 Create API for launching from recents
Relaunch apps from recents using the same uid and package as was used
in the original launch.

Fixes bug 16358208.

Change-Id: I340800bfee79926b197929360d69f1d570bbf1eb
2014-07-22 18:13:34 +00:00
Craig Mautner
f14e5a2fad Add empty ArrayList check.
Fixes bug 15768779.

Change-Id: I3e4c48aa0fff99025e9ba1725e3d1f3523749dbd
2014-07-22 18:09:45 +00:00
destradaa
c79dd82e55 Merge "Add uncertainty for GPS received TOW field. b/16463499" into lmp-dev 2014-07-22 16:13:36 +00:00
Geoff Mendal
af13b025e9 Merge commit 'e959e4a0' into lmp-dev
Conflicts:
	services/core/java/com/android/server/wm/WindowManagerService.java
2014-07-22 10:14:35 -07:00
destradaa
81cabb8a7f Add uncertainty for GPS received TOW field.
b/16463499

Change-Id: I5dde8a2737d9345eb7f77edc64ab7286254a65e4
2014-07-22 10:03:28 -07:00
Justin Koh
e959e4a017 am a63272b4: Merge "Revert "Wait for all windows to draw before turning screen on"" into klp-modular-dev
* commit 'a63272b4b5eff16f4d6fae4730b8a7087563181c':
  Revert "Wait for all windows to draw before turning screen on"
2014-07-22 16:31:06 +00:00
Sandeep Siddhartha
6daae96226 AlwaysOnHotwordDetector needs to reflect enrollment changes
Add a callback for when any sound model change happens. This helps the VIS
to re-check the availability and either enroll the user, or start/stop recognition.

Also shut down any active recognition when VIS dies, or a different hotword detector instance is obtained from VIS.

Change-Id: I03f94e78c6ee307afe822a84aebc7e74c64de7b4
2014-07-22 09:16:18 -07:00
Justin Koh
a63272b4b5 Merge "Revert "Wait for all windows to draw before turning screen on"" into klp-modular-dev 2014-07-17 21:09:48 +00:00
Justin Koh
528b4b7572 Revert "Wait for all windows to draw before turning screen on"
This reverts commit 0a589b929e18d05d1345d97283c3025058ddca18.

Change-Id: Ia73555cd7797b5d172f33db9f46ebc211af6fc1e
2014-07-22 00:26:23 +00:00
Prashant Malani
162d943350 am 9353e1a2: Merge "Make the booting flag update unconditional" into klp-modular-dev
* commit '9353e1a2b2e8f02377c3f73565964ffb0927c776':
  Make the booting flag update unconditional
2014-07-17 19:55:32 +00:00
Craig Mautner
807badbebc Merge "Convert from elapsed time to absolute time." into lmp-dev 2014-07-21 15:42:19 +00:00
Craig Mautner
494f6bdd9a Convert from elapsed time to absolute time.
Using uptime to determine most recent task doesn't work across
reboots.

Fixes bug 16370277.

Change-Id: Icef3342aba3fc009c307175b7524530c4cb617d2
2014-07-22 06:10:02 +00:00
Jungshik Jang
b35fba0265 Merge "Follow up send message errors of hdmi_cec.h in service side" into lmp-dev 2014-07-17 21:11:29 +00:00