Merge "Added commands to set / get lock screen info" into ub-testdpc-sc

Author: TreeHugger Robot

app/src/main/java/com/afwsamples/testdpc/DevicePolicyManagerGateway.java

@@ -413,6 +413,17 @@ void setLocationEnabled(boolean enabled, @NonNull Consumer<Void> onSuccess,
      */
     boolean isLocationEnabled();
 
+    /**
+     * See {@link android.app.admin.DevicePolicyManager#setDeviceOwnerLockScreenInfo(ComponentName, CharSequence)}.
+     */
+    void setDeviceOwnerLockScreenInfo(CharSequence info, @NonNull Consumer<Void> onSuccess,
+            @NonNull Consumer<Exception> onError);
+
+    /**
+     * See {@link android.app.admin.DevicePolicyManager#getDeviceOwnerLockScreenInfo()}.
+     */
+    CharSequence getDeviceOwnerLockScreenInfo();
+
     /**
      * Used on error callbacks to indicate a {@link android.app.admin.DevicePolicyManager} method
      * call failed.

app/src/main/java/com/afwsamples/testdpc/DevicePolicyManagerGatewayImpl.java

@@ -814,6 +814,23 @@ public boolean isLocationEnabled() {
         return mLocationManager.isLocationEnabled();
     }
 
+    @Override
+    public void setDeviceOwnerLockScreenInfo(CharSequence info, Consumer<Void> onSuccess,
+            Consumer<Exception> onError) {
+        Log.d(TAG, "setDeviceOwnerLockScreenInfo(" + info + ")");
+        try {
+            mDevicePolicyManager.setDeviceOwnerLockScreenInfo(mAdminComponentName, info);
+            onSuccess.accept(null);
+        } catch (Exception e) {
+            onError.accept(e);
+        }
+    }
+
+    @Override
+    public CharSequence getDeviceOwnerLockScreenInfo() {
+        return mDevicePolicyManager.getDeviceOwnerLockScreenInfo();
+    }
+
     @Override
     public String toString() {
         return "DevicePolicyManagerGatewayImpl[" + mAdminComponentName + "]";

app/src/main/java/com/afwsamples/testdpc/ShellCommand.java

@@ -99,6 +99,10 @@ final class ShellCommand {
     private static final String CMD_GET_PERMISSION_GRANT_STATE = "get-permission-grant-state";
     private static final String CMD_SET_LOCATION_ENABLED = "set-location-enabled";
     private static final String CMD_IS_LOCATION_ENABLED = "is-location-enabled";
+    private static final String CMD_SET_DEVICE_OWNER_LOCKSCREEN_INFO
+            = "set-device-owner-lockscreen-info";
+    private static final String CMD_GET_DEVICE_OWNER_LOCKSCREEN_INFO
+            = "get-device-owner-lockscreen-info";
 
     // Commands for APIs added on Android S
     private static final String CMD_SET_PERMITTED_INPUT_METHODS_PARENT =
@@ -285,6 +289,12 @@ public void run() {
             case CMD_IS_LOCATION_ENABLED:
                 execute(() -> isLocationEnabled());
                 break;
+            case CMD_SET_DEVICE_OWNER_LOCKSCREEN_INFO:
+                execute(() -> setDeviceOwnerLockScreenInfo());
+                break;
+            case CMD_GET_DEVICE_OWNER_LOCKSCREEN_INFO:
+                execute(() -> getDeviceOwnerLockScreenInfo());
+                break;
             default:
                 mWriter.printf("Invalid command: %s\n\n", cmd);
                 showUsage();
@@ -394,6 +404,11 @@ private void showUsage() {
                 CMD_SET_LOCATION_ENABLED);
         mWriter.printf("\t%s - get whether location is enabled for the user\n",
                 CMD_IS_LOCATION_ENABLED);
+        mWriter.printf("\t%s [INFO] - set the device owner lock screen info (or reset when no INFO "
+                + "is passed)\n",
+                CMD_SET_DEVICE_OWNER_LOCKSCREEN_INFO);
+        mWriter.printf("\t%s - get the device owner lock screen info",
+                CMD_GET_DEVICE_OWNER_LOCKSCREEN_INFO);
 
         // Separator for S / pre-S commands - do NOT remove line to avoid cherry-pick conflicts
 
@@ -917,6 +932,18 @@ private void isLocationEnabled() {
         mWriter.printf("Location enabled: %b\n", enabled);
     }
 
+    private void setDeviceOwnerLockScreenInfo() {
+        final CharSequence info = mArgs.length > 0 ? mArgs[1] : "";
+        mDevicePolicyManagerGateway.setDeviceOwnerLockScreenInfo(info,
+                (v) -> onSuccess("Set lock screen info to '%s'", info),
+                (e) -> onError(e, "Error setting lock screen info to '%s'", info));
+    }
+
+    private void getDeviceOwnerLockScreenInfo() {
+        CharSequence info = mDevicePolicyManagerGateway.getDeviceOwnerLockScreenInfo();
+        mWriter.printf("Lock screen info: %s\n", info);
+    }
+
     private static String permittedToString(boolean permitted) {
         return permitted ? "PERMITTED" : "NOT PERMITTED";
     }

app/src/main/java/com/afwsamples/testdpc/policy/keyguard/LockScreenPolicyFragment.java

@@ -223,8 +223,9 @@ private void showSetTrustAgentFragment() {
 
     @TargetApi(VERSION_CODES.N)
     private void setLockScreenMessage(Preference preference, String newValue) {
-        getDpm().setDeviceOwnerLockScreenInfo(getAdmin(), newValue);
-        preference.setSummary(newValue);
+        getDpmGateway().setDeviceOwnerLockScreenInfo(newValue,
+                (v) -> preference.setSummary(newValue),
+                (e) -> onErrorLog("setDeviceOwnerLockScreenInfo", e));
     }
 
     private boolean updateKeyguardFeatures(int flag, boolean newValue) {
@@ -259,7 +260,7 @@ private void updateAggregates() {
     private void setupAll() {
         setup(Keys.LOCK_SCREEN_MESSAGE,
             Util.SDK_INT >= VERSION_CODES.N && isDeviceOwner()
-                        ? getDpm().getDeviceOwnerLockScreenInfo() : null);
+                        ? getDpmGateway().getDeviceOwnerLockScreenInfo() : null);
         setup(Keys.MAX_FAILS_BEFORE_WIPE, getDpm().getMaximumFailedPasswordsForWipe(getAdmin()));
         setup(Keys.MAX_TIME_SCREEN_LOCK,
                 TimeUnit.MILLISECONDS.toSeconds(getDpm().getMaximumTimeToLock(getAdmin())));