diff options
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 12 | ||||
| -rw-r--r-- | services/java/com/android/server/pm/Settings.java | 7 |
2 files changed, 18 insertions, 1 deletions
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index b06b4a57d3e0..5d890d485fe6 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -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. diff --git a/services/java/com/android/server/pm/Settings.java b/services/java/com/android/server/pm/Settings.java index bb7f4fc5ccdf..bb73b294cfc0 100644 --- a/services/java/com/android/server/pm/Settings.java +++ b/services/java/com/android/server/pm/Settings.java @@ -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,9 +2559,13 @@ 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)); + } } } - + void dumpSharedUsersLPr(PrintWriter pw, String packageName, DumpState dumpState) { boolean printedSomething = false; for (SharedUserSetting su : mSharedUsers.values()) { |