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

Merge "Revert "Revert "Changed dpm shell commands to use 'cmd device_policy'""" into sc-dev

Browse Source
This commit is contained in:
Kholoud Mohamed
2021-04-28 08:59:23 +00:00
committed by Android (Google) Code Review
parent 7f10581412 4b2ce108a8
commit da3d4e8608
4 changed files with 199 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmds/dpm/Android.bp
View File

@@ -18,8 +18,7 @@ license {
],
}
java_binary {
sh_binary {
name: "dpm",
wrapper: "dpm",
srcs: ["**/*.java"],
src: "dpm",
}

4
cmds/dpm/dpm
View File

@@ -1,7 +1,5 @@
#!/system/bin/sh
# Script to start "dpm" on the device
#
base=/system
export CLASSPATH=$base/framework/dpm.jar
exec app_process $base/bin com.android.commands.dpm.Dpm "$@"
cmd device_policy "$@"

275
cmds/dpm/src/com/android/commands/dpm/Dpm.java
View File

@@ -1,275 +0,0 @@
/*
* Copyright (C) 2014 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.commands.dpm;
import android.app.ActivityManager;
import android.app.IActivityManager;
import android.app.admin.DevicePolicyManager;
import android.app.admin.IDevicePolicyManager;
import android.content.ComponentName;
import android.content.Context;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.UserHandle;
import com.android.internal.os.BaseCommand;
import java.io.PrintStream;
public final class Dpm extends BaseCommand {
/**
* Command-line entry point.
*
* @param args The command-line arguments
*/
public static void main(String[] args) {
(new Dpm()).run(args);
}
private static final String COMMAND_SET_ACTIVE_ADMIN = "set-active-admin";
private static final String COMMAND_SET_DEVICE_OWNER = "set-device-owner";
private static final String COMMAND_SET_PROFILE_OWNER = "set-profile-owner";
private static final String COMMAND_REMOVE_ACTIVE_ADMIN = "remove-active-admin";
private static final String COMMAND_CLEAR_FREEZE_PERIOD_RECORD = "clear-freeze-period-record";
private static final String COMMAND_FORCE_NETWORK_LOGS = "force-network-logs";
private static final String COMMAND_FORCE_SECURITY_LOGS = "force-security-logs";
private static final String COMMAND_MARK_PO_ON_ORG_OWNED_DEVICE =
"mark-profile-owner-on-organization-owned-device";
private IDevicePolicyManager mDevicePolicyManager;
private int mUserId = UserHandle.USER_SYSTEM;
private String mName = "";
private ComponentName mComponent = null;
@Override
public void onShowUsage(PrintStream out) {
out.println(
"usage: dpm [subcommand] [options]\n" +
"usage: dpm set-active-admin [ --user <USER_ID> | current ] <COMPONENT>\n" +
// STOPSHIP Finalize it
"usage: dpm set-device-owner [ --user <USER_ID> | current *EXPERIMENTAL* ] " +
"[ --name <NAME> ] <COMPONENT>\n" +
"usage: dpm set-profile-owner [ --user <USER_ID> | current ] [ --name <NAME> ] " +
"<COMPONENT>\n" +
"usage: dpm remove-active-admin [ --user <USER_ID> | current ] [ --name <NAME> ] " +
"<COMPONENT>\n" +
"\n" +
"dpm set-active-admin: Sets the given component as active admin" +
" for an existing user.\n" +
"\n" +
"dpm set-device-owner: Sets the given component as active admin, and its" +
" package as device owner.\n" +
"\n" +
"dpm set-profile-owner: Sets the given component as active admin and profile" +
" owner for an existing user.\n" +
"\n" +
"dpm remove-active-admin: Disables an active admin, the admin must have declared" +
" android:testOnly in the application in its manifest. This will also remove" +
" device and profile owners.\n" +
"\n" +
"dpm " + COMMAND_CLEAR_FREEZE_PERIOD_RECORD + ": clears framework-maintained " +
"record of past freeze periods that the device went through. For use during " +
"feature development to prevent triggering restriction on setting freeze " +
"periods.\n" +
"\n" +
"dpm " + COMMAND_FORCE_NETWORK_LOGS + ": makes all network logs available to " +
"the DPC and triggers DeviceAdminReceiver.onNetworkLogsAvailable() if needed.\n" +
"\n" +
"dpm " + COMMAND_FORCE_SECURITY_LOGS + ": makes all security logs available to " +
"the DPC and triggers DeviceAdminReceiver.onSecurityLogsAvailable() if needed."
+ "\n"
+ "usage: dpm " + COMMAND_MARK_PO_ON_ORG_OWNED_DEVICE + ": "
+ "[ --user <USER_ID> | current ] <COMPONENT>\n");
}
@Override
public void onRun() throws Exception {
mDevicePolicyManager = IDevicePolicyManager.Stub.asInterface(
ServiceManager.getService(Context.DEVICE_POLICY_SERVICE));
if (mDevicePolicyManager == null) {
showError("Error: Could not access the Device Policy Manager. Is the system running?");
return;
}
String command = nextArgRequired();
switch (command) {
case COMMAND_SET_ACTIVE_ADMIN:
runSetActiveAdmin();
break;
case COMMAND_SET_DEVICE_OWNER:
runSetDeviceOwner();
break;
case COMMAND_SET_PROFILE_OWNER:
runSetProfileOwner();
break;
case COMMAND_REMOVE_ACTIVE_ADMIN:
runRemoveActiveAdmin();
break;
case COMMAND_CLEAR_FREEZE_PERIOD_RECORD:
runClearFreezePeriodRecord();
break;
case COMMAND_FORCE_NETWORK_LOGS:
runForceNetworkLogs();
break;
case COMMAND_FORCE_SECURITY_LOGS:
runForceSecurityLogs();
break;
case COMMAND_MARK_PO_ON_ORG_OWNED_DEVICE:
runMarkProfileOwnerOnOrganizationOwnedDevice();
break;
default:
throw new IllegalArgumentException ("unknown command '" + command + "'");
}
}
private void runForceNetworkLogs() throws RemoteException, InterruptedException {
while (true) {
final long toWait = mDevicePolicyManager.forceNetworkLogs();
if (toWait == 0) {
break;
}
System.out.println("We have to wait for " + toWait + " milliseconds...");
Thread.sleep(toWait);
}
System.out.println("Success");
}
private void runForceSecurityLogs() throws RemoteException, InterruptedException {
while (true) {
final long toWait = mDevicePolicyManager.forceSecurityLogs();
if (toWait == 0) {
break;
}
System.out.println("We have to wait for " + toWait + " milliseconds...");
Thread.sleep(toWait);
}
System.out.println("Success");
}
private void parseArgs(boolean canHaveName) {
String opt;
while ((opt = nextOption()) != null) {
if ("--user".equals(opt)) {
String arg = nextArgRequired();
if ("current".equals(arg) || "cur".equals(arg)) {
mUserId = UserHandle.USER_CURRENT;
} else {
mUserId = parseInt(arg);
}
if (mUserId == UserHandle.USER_CURRENT) {
IActivityManager activityManager = ActivityManager.getService();
try {
mUserId = activityManager.getCurrentUser().id;
} catch (RemoteException e) {
e.rethrowAsRuntimeException();
}
}
} else if (canHaveName && "--name".equals(opt)) {
mName = nextArgRequired();
} else {
throw new IllegalArgumentException("Unknown option: " + opt);
}
}
mComponent = parseComponentName(nextArgRequired());
}
private void runSetActiveAdmin() throws RemoteException {
parseArgs(/*canHaveName=*/ false);
mDevicePolicyManager.setActiveAdmin(mComponent, true /*refreshing*/, mUserId);
System.out.println("Success: Active admin set to component " + mComponent.toShortString());
}
private void runSetDeviceOwner() throws RemoteException {
parseArgs(/*canHaveName=*/ true);
mDevicePolicyManager.setActiveAdmin(mComponent, true /*refreshing*/, mUserId);
try {
if (!mDevicePolicyManager.setDeviceOwner(mComponent, mName, mUserId)) {
throw new RuntimeException(
"Can't set package " + mComponent + " as device owner.");
}
} catch (Exception e) {
// Need to remove the admin that we just added.
mDevicePolicyManager.removeActiveAdmin(mComponent, UserHandle.USER_SYSTEM);
throw e;
}
mDevicePolicyManager.setUserProvisioningState(
DevicePolicyManager.STATE_USER_SETUP_FINALIZED, mUserId);
System.out.println("Success: Device owner set to package " + mComponent);
System.out.println("Active admin set to component " + mComponent.toShortString());
}
private void runRemoveActiveAdmin() throws RemoteException {
parseArgs(/*canHaveName=*/ false);
mDevicePolicyManager.forceRemoveActiveAdmin(mComponent, mUserId);
System.out.println("Success: Admin removed " + mComponent);
}
private void runSetProfileOwner() throws RemoteException {
parseArgs(/*canHaveName=*/ true);
mDevicePolicyManager.setActiveAdmin(mComponent, true /*refreshing*/, mUserId);
try {
if (!mDevicePolicyManager.setProfileOwner(mComponent, mName, mUserId)) {
throw new RuntimeException("Can't set component " + mComponent.toShortString() +
" as profile owner for user " + mUserId);
}
} catch (Exception e) {
// Need to remove the admin that we just added.
mDevicePolicyManager.removeActiveAdmin(mComponent, mUserId);
throw e;
}
mDevicePolicyManager.setUserProvisioningState(
DevicePolicyManager.STATE_USER_SETUP_FINALIZED, mUserId);
System.out.println("Success: Active admin and profile owner set to "
+ mComponent.toShortString() + " for user " + mUserId);
}
private void runClearFreezePeriodRecord() throws RemoteException {
mDevicePolicyManager.clearSystemUpdatePolicyFreezePeriodRecord();
System.out.println("Success");
}
private void runMarkProfileOwnerOnOrganizationOwnedDevice() throws RemoteException {
parseArgs(/*canHaveName=*/ false);
mDevicePolicyManager.markProfileOwnerOnOrganizationOwnedDevice(mComponent, mUserId);
System.out.println("Success");
}
private ComponentName parseComponentName(String component) {
ComponentName cn = ComponentName.unflattenFromString(component);
if (cn == null) {
throw new IllegalArgumentException ("Invalid component " + component);
}
return cn;
}
private int parseInt(String argument) {
try {
return Integer.parseInt(argument);
} catch (NumberFormatException e) {
throw new IllegalArgumentException ("Invalid integer argument '" + argument + "'", e);
}
}
}