diff options
| author | 2013-03-01 17:26:07 -0800 | |
|---|---|---|
| committer | 2013-03-01 17:26:07 -0800 | |
| commit | f9ed7dc96a242d2c583065dfb31a8dafc7825bd0 (patch) | |
| tree | 81d78a8cf5ca0a75e16277f4d7cb655c67a658be | |
| parent | 10dda9ca64e0d777709f7a9a6b9cae4f94a955f7 (diff) | |
| parent | 67f2957331a63474879f68bf1a8d17b60b2188cd (diff) | |
am 67f29573: am bb2aa63b: am a2e929e1: Tighten enforcement of file modes.
* commit '67f2957331a63474879f68bf1a8d17b60b2188cd':
Tighten enforcement of file modes.
| -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 23d8f46029db..612ff0b3beb7 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); } |