diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-05-11 15:49:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-11 15:49:00 -0700 |
| commit | f2fe4cb11b2b93acf1a983e856efe26b6bb79683 (patch) | |
| tree | 08dd4a219ec6798d57998a0799952769570bf625 /services/java/com/android/server/pm/Settings.java | |
| parent | 07827454efef7f46d46e923a5091d8cf1e5d0d8c (diff) | |
| parent | cd5862586ab555b53ffd0a62488843838d1aa94d (diff) | |
| download | frameworks_base-f2fe4cb11b2b93acf1a983e856efe26b6bb79683.zip frameworks_base-f2fe4cb11b2b93acf1a983e856efe26b6bb79683.tar.gz frameworks_base-f2fe4cb11b2b93acf1a983e856efe26b6bb79683.tar.bz2 | |
am cd586258: Merge "Enforce READ_EXTERNAL through Settings.Secure." into jb-dev
* commit 'cd5862586ab555b53ffd0a62488843838d1aa94d':
Enforce READ_EXTERNAL through Settings.Secure.
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 da0ec33..8b901b7 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"); |