Merge "Tighten enforcement of file modes." into jb-mr2-dev

2013-03-01 00:44:41 +00:00
parent 51019a0fc7 ba761979ee
commit f5e0471703
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/content/ContentProvider.java
+++ b/core/java/android/content/ContentProvider.java
@@ -298,7 +298,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 {

        private void enforceFilePermission(String callingPkg, Uri uri, String mode)
                throws FileNotFoundException, SecurityException {
-            if (mode != null && mode.startsWith("rw")) {
+            if (mode != null && mode.indexOf('w') != -1) {
                if (enforceWritePermission(callingPkg, uri) != AppOpsManager.MODE_ALLOWED) {
                    throw new FileNotFoundException("App op not allowed");
                }