diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-05-11 14:04:41 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2012-05-11 15:31:39 -0700 |
| commit | f53857716a0db805c51c0cae93550d90e32e4749 (patch) | |
| tree | f08bea9fbd41f3299a42c68740d286d614e37f65 /services/java/com/android/server/pm/Settings.java | |
| parent | 0891a89790777e2f88f413351fafe49dda36714f (diff) | |
| download | frameworks_base-f53857716a0db805c51c0cae93550d90e32e4749.zip frameworks_base-f53857716a0db805c51c0cae93550d90e32e4749.tar.gz frameworks_base-f53857716a0db805c51c0cae93550d90e32e4749.tar.bz2 | |
Enforce READ_EXTERNAL through Settings.Secure.
Always defers to user-defined setting, when present.
Bug: 6389556
Change-Id: I079d2a41b772facfdac74eefc4c8072fc9284f97
Diffstat (limited to 'services/java/com/android/server/pm/Settings.java')
| -rw-r--r-- | services/java/com/android/server/pm/Settings.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/services/java/com/android/server/pm/Settings.java b/services/java/com/android/server/pm/Settings.java index d0eda2d..ffb69fa 100644 --- a/services/java/com/android/server/pm/Settings.java +++ b/services/java/com/android/server/pm/Settings.java @@ -111,7 +111,7 @@ final class Settings { int mInternalSdkPlatform; int mExternalSdkPlatform; - boolean mReadExternalStorageEnforced = PackageManager.DEFAULT_ENFORCE_READ_EXTERNAL_STORAGE; + Boolean mReadExternalStorageEnforced; /** Device identity for the purpose of package verification. */ private VerifierDeviceIdentity mVerifierDeviceIdentity; @@ -1147,8 +1147,7 @@ final class Settings { serializer.endTag(null, "verifier"); } - if (mReadExternalStorageEnforced - != PackageManager.DEFAULT_ENFORCE_READ_EXTERNAL_STORAGE) { + if (mReadExternalStorageEnforced != null) { serializer.startTag(null, TAG_READ_EXTERNAL_STORAGE); serializer.attribute( null, ATTR_ENFORCEMENT, mReadExternalStorageEnforced ? "1" : "0"); |