summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Tear down agents properly at EOD in full restore" into lmp-devChristopher Tate2014-07-171-1/+18
|\
| * Tear down agents properly at EOD in full restoreChristopher Tate2014-07-171-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The restore engine wasn't tearing down the bound agent after reaching the end of data for the app, and furthermore was allowing the restore operation to resume running the queue before all data had been delivered to the current target. Also make LocalTransport deliver data in 2K chunks rather than 32K, as a first step towards making its timing characteristics more like we'll see in networked situations. Finally, added a bunch of MORE_DEBUG output for finding odd bugs like this. Change-Id: Icdbe6a070af6cc7c708a938ad044108d40ebce9a
* | Merge "TIF: Add unblock content" into lmp-devYoungsang Cho2014-07-171-0/+20
|\ \
| * | TIF: Add unblock contentJaewan Kim2014-07-181-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a TV content is blocked by the parental control settings, TV input service will notify TV to request user's PIN code verification. If the verification succeeds, TV input service will be notified back that content is unblocked so it can keep playing the content. Bug: 13172379 Change-Id: I7b31d762eb54612c4d8779ee133211f32fb73b05
* | | Merge "TIF: Add onInputAdded and onInputRemoved" into lmp-devYoungsang Cho2014-07-181-14/+52
|\ \ \ | |/ / |/| |
| * | TIF: Add onInputAdded and onInputRemovedJaewan Kim2014-07-181-14/+52
| | | | | | | | | | | | | | | Bug: 16166859 Change-Id: I51bd87aded3e8619e36be200009e924e73cd348e
* | | Merge "Cancel notification group children when summary is canceled" into lmp-devChristoph Studer2014-07-171-9/+66
|\ \ \ | |/ / |/| |
| * | Cancel notification group children when summary is canceledChristoph Studer2014-07-161-9/+66
| | | | | | | | | | | | | | | Bug: 15865959 Change-Id: I29f8f5357f85eac3d4129ff9a15168f52caaa613
* | | Merge "TIF: Add a notification for surface change from TvView to ↵Youngsang Cho2014-07-171-0/+21
|\ \ \ | | | | | | | | | | | | TvInputService" into lmp-dev
| * | | TIF: Add a notification for surface change from TvView to TvInputServiceYoungsang Cho2014-07-171-0/+21
| | | | | | | | | | | | | | | | | | | | Bug: 15447352 Change-Id: I3e91609c5eb03be84cc7c88507457b9e74750de8
* | | | TIF: Add a method to get TvInputInfo for a given TV inputJae Seo2014-07-171-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is going to be needed by applications to get information about the inputs that are just added thus not included in the previously retrieved input list. Bug: 16166859, Bug: 15838097 Change-Id: Icecd03fcea208a0c4d41caab1eec64e574f40877
* | | | Merge "TIF: Add TvParentalControlManager" into lmp-devJae Seo2014-07-171-0/+17
|\ \ \ \
| * | | | TIF: Add TvParentalControlManagerJae Seo2014-07-171-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each TV input service is now required to query the system whether the user is allowed to watch the current program before showing it to the user if the parental control is turned on, which can be checked by calling TvParentalControlManager.isEnabled(). Whether the TV input service should block the content or not is determined by invoking TvParentalControlManager.isRatingBlocked() with the content rating for the current program. Then the TvParentalControlManager makes a judgment based on the user blocked ratings stored in the secure settings and returns the result. If the rating in question turns out to be blocked, the TV input service must immediately block the content and call this method with the content rating of the current program to prompt the PIN verification screen. Each TV input service also needs to continuously listen to any changes made to the parental control settings by registering a TvParentalControlManager.ParentalControlCallback() to the manager and immediately reevaluate the current program with the new parental control settings. Bug: 13172379 Change-Id: I8e1900d4b8d28c56798986d5c3906bd418ab97ac
* | | | | Merge "Test hotword flow" into lmp-devSandeep Siddhartha2014-07-171-7/+11
|\ \ \ \ \
| * | | | | Test hotword flowSandeep Siddhartha2014-07-171-7/+11
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | - Also fix a few StrictMode violations in DatabaseHelper Change-Id: I93f27407dae34cc0dca5e9f891d4ca718d6010a5
* | | | | TIF: one-to-many relationship for TvInputService to TvInputInfoWonsik Kim2014-07-182-114/+293
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The scope of this change is to provide a skeleton code for supporting multiple TV input per service. Bug: 16138420 Change-Id: Ic51355902d5e0424b8fc8a75c495d4781a7ed744
* | | | Properly end full restore attempt if getNextFullRestoreDataChunk() failsChristopher Tate2014-07-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Don't just drop the error return on the floor and retry (forever!). Change-Id: I5f0ef2d09ea286d813add69517f865e474341b43
* | | | Merge "Add MediaProjection APIs." into lmp-devMichael Wright2014-07-176-43/+568
|\ \ \ \
| * | | | Add MediaProjection APIs.Michael Wright2014-07-176-43/+568
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new MediaProjection infrastructure allows the system to hand out tokens granting the ability to capture the screen's contents, audio, etc. at a granular level. It's intended to be used both for screen casting, via the cast APIs, as well as screen sharing via third party applications. The screen sharing case is implemented, but all of audio capturing is still forthcoming. Change-Id: I4b24669bed7083e11413c10ed8d6b025f5375316
* | | | | Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast.Ben Murdoch2014-07-172-2/+32
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the WebViewUpdateService to receive notifications that an update has been installed and we need to trigger recreation of the relro file. bug: 16329377 Change-Id: I088e61487416add997995db304beca0cde71390c
* | | | Merge "Fix exceptions in ActivityRecognition platform stack." into lmp-devdestradaa2014-07-171-1/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Fix exceptions in ActivityRecognition platform stack.destradaa2014-07-171-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | b/16348349 Change-Id: I1f85283c86130b86389a1be7da49904658b0558c
* | | | Permit settings to "wipe" the persistent partitionAndres Morales2014-07-172-59/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One of the requirements is that when the user does a factory reset through settings, all data on the persistent partition should be cleared. This adds one last API method that allows settings to wipe the partition. Bug: 14288780 Change-Id: Ib87ee741d1e5195814516ae1d66eb7c4cf754dcf
* | | | Merge "Restore calling identity before checking permission" into lmp-devCraig Mautner2014-07-171-2/+2
|\ \ \ \
| * | | | Restore calling identity before checking permissionCraig Mautner2014-07-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the system service identity to check the CHANGE_CONFIGURATION permission isn't likely to catch a security violation. Changing back to the original caller and then checking permissions is preferred. Fixes bug 16215650. Change-Id: Iff08d04422bcc052a487194154f1fd0d727d38f4
* | | | | Merge "Split telephony restrictions into outgoing calls and sms" into lmp-devAmith Yamasani2014-07-171-2/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Split telephony restrictions into outgoing calls and smsAmith Yamasani2014-07-171-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DISALLOW_TELEPHONY renamed to DISALLOW_OUTGOING_CALLS and introduced DISALLOW_SMS. Outgoing emergency calls should always be permitted. Change-Id: I0a38ef6e2df9dcf62d16fd93622ad61f4327614f
* | | | | Merge "Support cluster-style installs for bundled apps." into lmp-devJeff Sharkey2014-07-171-28/+21
|\ \ \ \ \
| * | | | | Support cluster-style installs for bundled apps.Jeff Sharkey2014-07-171-28/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16319961 Change-Id: I499b904dfd56f236a1b574c29a44272ed814be0f
* | | | | | Support model deletionSandeep Siddhartha2014-07-172-12/+43
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the updateKeyphrase call is also used to clear out a sound model currently, this happens when the sound model passed in has no keyphrases. We can revisit if we need another deleteSoundModel method - Also fix an issue with the way we were writing keyphrase to the DB and when updating keyphrase, we actually addOrUpdate Change-Id: Ib7250c2fdafef6bc40387912a79366c334d73292
* | | | | Merge "resolved conflicts for merge of 0a931069 to lmp-dev" into lmp-devCraig Mautner2014-07-173-45/+57
|\ \ \ \ \
| * \ \ \ \ resolved conflicts for merge of 0a931069 to lmp-devCraig Mautner2014-07-173-45/+57
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: services/core/java/com/android/server/am/ActivityManagerService.java services/core/java/com/android/server/am/ActivityStackSupervisor.java Change-Id: I68e8290566b51fadb5671abdd9d05faf28502e22
| | * | | | am 65d7c332: Merge "Additional cleanup after stack deletion." into ↵Justin Koh2014-07-173-45/+57
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit '65d7c332d7b613f23a26066051cc7496e0efa994': Additional cleanup after stack deletion.
| | | * \ \ \ Merge "Additional cleanup after stack deletion." into klp-modular-devJustin Koh2014-07-163-45/+57
| | | |\ \ \ \
| | | | * | | | Additional cleanup after stack deletion.Craig Mautner2014-07-163-45/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove activity from PendingActivityLaunch list when it is removed from stack. This prevents the delayed launch causing IllegalArgumentException in b/16045752. - Move PendingActivityLaunch from ActivityManagerService to ActivityStackSupervisor. - Immediately call onTaskListEmptyLocked() in cases where no activities are found in stack. Fixes bug 16045752. Change-Id: Ia69a449e7f5e08ab6e36157d0fd793c4d2fdaca4
* | | | | | | | Add BackupAgent.onRestoreFinished() callbackChristopher Tate2014-07-171-19/+93
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The agent's onRestoreFinished() method is called after all available data has been delivered to the app, whether via the key/value restore API or the full-data file-at-a-time API. This gives the app a stable opportunity to do any postprocessing that might be appropriate. Also fixes a lingering bug in the framework's handling of backup agent lifetimes. In cases where an existing agent instances was being rebound, the framework was forgetting to notify the dependent that the agent was available. This was causing timeouts and restore failure. Bug 16241004 Change-Id: I3f52b299312d30d38b0cba63a2cfaeb934991ef2
* | | | | | | Merge "Create DPM APIs for cross profile callerId" into lmp-devAdam Connors2014-07-171-0/+81
|\ \ \ \ \ \ \
| * | | | | | | Create DPM APIs for cross profile callerIdAdam Connors2014-07-171-0/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Contact information in the managed profile is shown in the incoming call UI unless blocked using this API. TODO: Actually plumb this into the caller-id logic. Bug: 16301261 Change-Id: If03adc907d9558baa0a45a1833b857206b7bf96a
* | | | | | | | Merge "resolved conflicts for merge of 75f31740 to lmp-dev" into lmp-devCraig Mautner2014-07-171-9/+9
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ resolved conflicts for merge of 75f31740 to lmp-devCraig Mautner2014-07-171-9/+9
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | / / / | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: services/core/java/com/android/server/wm/WindowManagerService.java Change-Id: Ifdfe253c4b3410a6000fd5a7cdcd785adc80a47b
| | * | | | | | am 77cdac05: Merge "Wait for all windows to draw before turning screen on" ↵Justin Koh2014-07-171-8/+13
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-modular-dev * commit '77cdac05ba80925f6cdc4c349af0fa7567c36146': Wait for all windows to draw before turning screen on
| | | * | | | | Wait for all windows to draw before turning screen onCraig Mautner2014-07-161-8/+13
| | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was previously only waiting for windows on the primary display to draw which meant that windows on ActivityViews had not yet drawn. This fix checks redraws all outstanding Surfaces before unblanking the screen. Fixes bug 15092354. Change-Id: Id550db003a5f56931eb68464085596e47d25481d
* | | | | | | Ads per-user APIs to manage accounts through the AccountManagerAlexandra Gherghina2014-07-172-17/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16056552 Bug: 14642886 Change-Id: I17ff6c2515285e63c84cecf2f861d10666c393c5
* | | | | | | Merge "Keep track of user_setup_complete in DPMS" into lmp-devAmith Yamasani2014-07-171-0/+63
|\ \ \ \ \ \ \
| * | | | | | | Keep track of user_setup_complete in DPMSAmith Yamasani2014-07-161-0/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to ensure that some system app can't modify that state for purposes of changing the profile owner without user consent. Bug: 16207721 Change-Id: Ic5f454d7568cd824b83456eed0e2611779a9adf8
* | | | | | | | Merge "Allow app restrictions for uninstalled packages." into lmp-devKenny Guy2014-07-171-40/+17
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Allow app restrictions for uninstalled packages.Kenny Guy2014-07-171-40/+17
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop cleaning up app restrictions for packages that aren't installed. Remove app restriction file if restrictions is set to an empty or null bundle. All user types may now have restrictions if a profile or device owner is present. Bug: 15565914 Change-Id: I55f38ca0ad7794b9fc2967113973dc035a416558
* | | | | | | Use the WebView's loader library to load the real library.Torne (Richard Coles)2014-07-172-0/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Load libwebviewchromiumloader and use it to load the real WebView library, to enable sharing of the relro segment between different application processes without requiring that the library be preloaded in the zygote. A system service is added to track whether the relro segment file has been prepared, and block loading of the library until it has been. Bug: 13005501 Change-Id: I846b37c7b8e2a4eb8a39e4fd455bccbb2048c173
* | | | | | | Merge "Check for exported and category before starting activity." into lmp-devKenny Guy2014-07-171-2/+28
|\ \ \ \ \ \ \
| * | | | | | | Check for exported and category before starting activity.Kenny Guy2014-07-171-2/+28
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make LauncherAppService check that component passed to startActivityAsUser is exported and has the category Intent.CATEGORY_LAUNCHER before starting it. Bug: 15989072 Change-Id: I29d03fae49ff0ca8d7f7524f5e71895d62ff3cae