diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2013-02-28 15:57:36 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-03-31 05:16:25 -0700 |
| commit | 9a52b3bce708755755acb73ec961e7f0ac071050 (patch) | |
| tree | 0991026a403bfdfe146f5166bdd2ad4d58c3f047 | |
| parent | 313336ebbbdf256aabb3198f9294b447946bd01b (diff) | |
| download | frameworks_base-9a52b3bce708755755acb73ec961e7f0ac071050.zip frameworks_base-9a52b3bce708755755acb73ec961e7f0ac071050.tar.gz frameworks_base-9a52b3bce708755755acb73ec961e7f0ac071050.tar.bz2 | |
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 23d8f46..612ff0b 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); } |