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

Commit a11236bf authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Include enforcement state in dumpsys."

parents 5bd43d15 1c27576a

core/java/android/content/pm/PackageManager.java

+12 −0
Original line number Diff line number Diff line
@@ -1095,6 +1095,18 @@ public abstract class PackageManager { 
    /** {@hide} */

    public static final int ENFORCEMENT_YES = 1;



    /** {@hide} */

    public static String enforcementToString(int enforcement) {

        switch (enforcement) {

            case ENFORCEMENT_DEFAULT:

                return "DEFAULT";

            case ENFORCEMENT_YES:

                return "YES";

            default:

                return Integer.toString(enforcement);

        }

    }



    /**

     * Retrieve overall information about an application package that is

     * installed on the system.

services/java/com/android/server/pm/Settings.java

+6 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DISABLED 
import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER;

import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_ENABLED;

import static android.content.pm.PackageManager.ENFORCEMENT_DEFAULT;

import static android.Manifest.permission.READ_EXTERNAL_STORAGE;



import com.android.internal.util.FastXmlSerializer;

import com.android.internal.util.JournaledFile;
@@ -2558,6 +2559,10 @@ final class Settings { 
            if (p.perm != null) {

                pw.print("    perm="); pw.println(p.perm);

            }

            if (READ_EXTERNAL_STORAGE.equals(p.name)) {

                pw.print("    enforcement=");

                pw.println(PackageManager.enforcementToString(mReadExternalStorageEnforcement));

            }

        }

    }