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

Commit b2eae226 authored by Alex Johnston's avatar Alex Johnston Committed by Android (Google) Code Review
Browse files

Merge "dump factory reset protection policy" into tm-dev

parents c568c0d7 ca234fdd

core/java/android/app/admin/FactoryResetProtectionPolicy.java

+15 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.annotation.Nullable; 
import android.content.ComponentName;

import android.os.Parcel;

import android.os.Parcelable;

import android.util.IndentingPrintWriter;

import android.util.Log;

import android.util.TypedXmlPullParser;

import android.util.TypedXmlSerializer;
@@ -254,4 +255,18 @@ public final class FactoryResetProtectionPolicy implements Parcelable { 
        return !mFactoryResetProtectionAccounts.isEmpty() && mFactoryResetProtectionEnabled;

    }



    /**

     * @hide

     */

    public void dump(IndentingPrintWriter pw) {

        pw.print("factoryResetProtectionEnabled=");

        pw.println(mFactoryResetProtectionEnabled);



        pw.print("factoryResetProtectionAccounts=");

        pw.increaseIndent();

        for (int i = 0; i < mFactoryResetProtectionAccounts.size(); i++) {

            pw.println(mFactoryResetProtectionAccounts.get(i));

        }

        pw.decreaseIndent();

    }

}

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

+7 −0
Original line number Diff line number Diff line
@@ -1227,5 +1227,12 @@ class ActiveAdmin { 


        pw.print("mSsidDenylist=");

        pw.println(mSsidDenylist);



        if (mFactoryResetProtectionPolicy != null) {

            pw.println("mFactoryResetProtectionPolicy:");

            pw.increaseIndent();

            mFactoryResetProtectionPolicy.dump(pw);

            pw.decreaseIndent();

        }

    }

}