diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2013-02-28 15:57:36 -0800 |
|---|---|---|
| committer | Geremy Condra <gcondra@google.com> | 2013-03-01 16:17:09 -0800 |
| commit | a2e929e1df62947b7967258f21fd05b27a571878 (patch) | |
| tree | 3784adeaa80521d780ae44e80e2ca18afa4df3fb | |
| parent | c84b3603fa27db68516187cea19de1e6a021152d (diff) | |
| download | base-a2e929e1df62947b7967258f21fd05b27a571878.tar.gz | |
Tighten enforcement of file modes.
Bug: 8275867
Change-Id: I4da14f2dd0049aca69636999696c1f3c02b3b792
| -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); } |