Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change clearDeviceOwnerApp to take a package"

Browse Source
This commit is contained in:
Jason Monk
2014-06-18 19:50:18 +00:00
committed by Android (Google) Code Review
parent 58f90ab1ee 94d2cf9725
commit 7ccf51dd79
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -5220,7 +5220,7 @@ package android.app.admin {
method public void addPersistentPreferredActivity(android.content.ComponentName, android.content.IntentFilter, android.content.ComponentName);
method public void addUserRestriction(android.content.ComponentName, java.lang.String);
method public void clearCrossProfileIntentFilters(android.content.ComponentName);
method public void clearDeviceOwnerApp();
method public void clearDeviceOwnerApp(java.lang.String);
method public void clearPackagePersistentPreferredActivities(android.content.ComponentName, java.lang.String);
method public void clearUserRestriction(android.content.ComponentName, java.lang.String);
method public android.os.UserHandle createAndInitializeUser(android.content.ComponentName, java.lang.String, java.lang.String, android.content.ComponentName, android.os.Bundle);

6
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -1840,11 +1840,13 @@ public class DevicePolicyManager {
* This function should be used cautiously as once it is called it cannot
* be undone. The device owner can only be set as a part of device setup
* before setup completes.
*
* @param packageName The package name of the device owner.
*/
public void clearDeviceOwnerApp() {
public void clearDeviceOwnerApp(String packageName) {
if (mService != null) {
try {
mService.clearDeviceOwner(mContext.getPackageName());
mService.clearDeviceOwner(packageName);
} catch (RemoteException re) {
Log.w(TAG, "Failed to clear device owner");
}