Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94d2cf97 authored by Jason Monk's avatar Jason Monk
Browse files

Change clearDeviceOwnerApp to take a package 

If the caller is sharing uid, then the package from getPackage()
may not be the desired one.  This also matches better with the
other device owner calls.

Change-Id: I14f2ec4bff0717273f626072dabad0d2c76068a5
parent 5d140e4b

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -5197,7 +5197,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);

core/java/android/app/admin/DevicePolicyManager.java

+4 −2
Original line number Diff line number Diff line
@@ -1839,11 +1839,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");

            }