commit bb2aa63be4a9328403a4daa2f93b42a4a7b0b65d
author Jeff Sharkey <jsharkey@android.com> Fri Mar 01 17:20:51 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 01 17:20:51 2013 -0800
tree 082e5e3ccadd24a02b7edfba7d4655d3be3cd641
parent d4289c6e20c0a42deba796d02b5a9bc60c9a4e7c
parent a2e929e1df62947b7967258f21fd05b27a571878

am a2e929e1: Tighten enforcement of file modes.

* commit 'a2e929e1df62947b7967258f21fd05b27a571878':
  Tighten enforcement of file modes.

core/java/android/content/ContentProvider.java

diff --git a/core/java/android/content/ContentProvider.java b/core/java/android/content/ContentProvider.java
index b22179e..42618ac 100644
--- a/core/java/android/content/ContentProvider.java
+++ b/core/java/android/content/ContentProvider.java
@@ -238,7 +238,7 @@
         @Override
         public ParcelFileDescriptor openFile(Uri uri, String mode)
                 throws FileNotFoundException {
-            if (mode != null && mode.startsWith("rw")) enforceWritePermission(uri);
+            if (mode != null && mode.indexOf('w') != -1) enforceWritePermission(uri);
             else enforceReadPermission(uri);
             return ContentProvider.this.openFile(uri, mode);
         }
@@ -246,7 +246,7 @@
         @Override
         public AssetFileDescriptor openAssetFile(Uri uri, String mode)
                 throws FileNotFoundException {
-            if (mode != null && mode.startsWith("rw")) enforceWritePermission(uri);
+            if (mode != null && mode.indexOf('w') != -1) enforceWritePermission(uri);
             else enforceReadPermission(uri);
             return ContentProvider.this.openAssetFile(uri, mode);
         }