diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2013-03-01 17:20:51 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-01 17:20:51 -0800 |
| commit | bb2aa63be4a9328403a4daa2f93b42a4a7b0b65d (patch) | |
| tree | 082e5e3ccadd24a02b7edfba7d4655d3be3cd641 /core/java/android | |
| parent | d4289c6e20c0a42deba796d02b5a9bc60c9a4e7c (diff) | |
| parent | a2e929e1df62947b7967258f21fd05b27a571878 (diff) | |
am a2e929e1: Tighten enforcement of file modes.
* commit 'a2e929e1df62947b7967258f21fd05b27a571878':
Tighten enforcement of file modes.
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/content/ContentProvider.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/content/ContentProvider.java b/core/java/android/content/ContentProvider.java index b22179e71843..42618ac5daca 100644 --- a/core/java/android/content/ContentProvider.java +++ b/core/java/android/content/ContentProvider.java @@ -238,7 +238,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 { @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 @@ public abstract class ContentProvider implements ComponentCallbacks2 { @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); } |