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

Merge "Remove unused non-public method."

Browse Source
This commit is contained in:
Pavel Grafov
2020-08-26 15:00:48 +00:00
committed by Android (Google) Code Review
parent 9fa9c1f83b ab1020f856
commit 6f3dd02a00
3 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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.

1
core/java/android/app/admin/IDevicePolicyManager.aidl
View File

@@ -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);

8
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -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");