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

Commit ab1020f8 authored by Pavel Grafov's avatar Pavel Grafov
Browse files

Remove unused non-public method. 

Bug: 165552960
Test: builds
Change-Id: I9febd312e34d6114131ab0c888484edcf570ad4f
Merged-In: I9febd312e34d6114131ab0c888484edcf570ad4f
(cherry picked from commit 812a2052fb4b1f67b87f8886bafad7a9c03d2574)
parent 7bf97892

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

+0 −15
Original line number Diff line number Diff line
@@ -9750,21 +9750,6 @@ public class DevicePolicyManager { 
        }

    }













    /**













     * @hide













     * Return if this user is a system-only user. An admin can manage a device from a system only













     * user by calling {@link #ACTION_PROVISION_MANAGED_SHAREABLE_DEVICE}.













     * @param admin Which device owner this request is associated with.













     * @return if this user is a system-only user.













     */













    public boolean isSystemOnlyUser(@NonNull ComponentName admin) {













        try {













            return mService.isSystemOnlyUser(admin);













        } catch (RemoteException re) {













            throw re.rethrowFromSystemServer();













        }













    }



























    /**















     * Called by device owner, or profile owner on organization-owned device, to get the MAC















     * address of the Wi-Fi device.

































core/java/android/app/admin/IDevicePolicyManager.aidl



+0
−1




























Original line number
Diff line number
Diff line








@@ -345,7 +345,6 @@ interface IDevicePolicyManager {













    void setKeepUninstalledPackages(in ComponentName admin, in String callerPackage, in List<String> packageList);















    List<String> getKeepUninstalledPackages(in ComponentName admin, in String callerPackage);















    boolean isManagedProfile(in ComponentName admin);













    boolean isSystemOnlyUser(in ComponentName admin);















    String getWifiMacAddress(in ComponentName admin);















    void reboot(in ComponentName admin);

















































services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java



+0
−8




























Original line number
Diff line number
Diff line








@@ -12051,14 +12051,6 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













        return isManagedProfile(mInjector.userHandleGetCallingUserId());















    }



























    @Override













    public boolean isSystemOnlyUser(ComponentName admin) {













        Objects.requireNonNull(admin, "ComponentName is null");













        final CallerIdentity identity = getCallerIdentity(admin);













        Preconditions.checkCallAuthorization(isDeviceOwner(identity));













        return UserManager.isSplitSystemUser() && identity.getUserId() == UserHandle.USER_SYSTEM;













    }



























    @Override















    public void reboot(ComponentName admin) {















        Objects.requireNonNull(admin, "ComponentName is null");