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

Commit 4f0c028a authored by Felipe Leme's avatar Felipe Leme Committed by Android (Google) Code Review
Browse files

Merge "Added DeviceAdminInfo to dumpsys device_policy." into main

parents 4b87a42e 0bef5e6e

core/java/android/app/admin/DeviceAdminInfo.java

+5 −0
Original line number Diff line number Diff line
@@ -558,6 +558,11 @@ public final class DeviceAdminInfo implements Parcelable { 
    }



    public void dump(Printer pw, String prefix) {

        pw.println("mVisible: " + mVisible);

        pw.println("mUsesPolicies: " + mUsesPolicies);

        pw.println("mSupportsTransferOwnership: " + mSupportsTransferOwnership);

        pw.println("mHeadlessDeviceOwnerMode: " + mHeadlessDeviceOwnerMode);



        pw.println(prefix + "Receiver:");

        mActivityInfo.dump(pw, prefix + "  ");

    }

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

+8 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import android.text.TextUtils; 
import android.util.ArrayMap;

import android.util.ArraySet;

import android.util.IndentingPrintWriter;

import android.util.PrintWriterPrinter;



import com.android.internal.util.Preconditions;

import com.android.internal.util.XmlUtils;
@@ -1484,5 +1485,12 @@ class ActiveAdmin { 
            pw.print("mProvisioningContext=");

            pw.println(mProvisioningContext);

        }



        if (info != null) {

            pw.println("DeviceAdminInfo:");

            pw.increaseIndent();

            info.dump(new PrintWriterPrinter(pw), "");

            pw.decreaseIndent();

        }

    }

}