drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Include enforcement state in dumpsys."

Browse Source
This commit is contained in:
Jeff Sharkey
2012-04-11 19:11:35 -07:00
committed by Android (Google) Code Review
parent 5bd43d1537 1c27576aff
commit a11236bf09
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/content/pm/PackageManager.java
View File

@ -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.

7
services/java/com/android/server/pm/Settings.java
View File

@ -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()) {