drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 1e5e3748: am 67f29573: am bb2aa63b: am a2e929e1: Tighten enforcement of file modes.

Browse Source 
* commit '1e5e3748d4d431e48bd4b6a461ab3a9127beff7d':
  Tighten enforcement of file modes.
This commit is contained in:
Jeff Sharkey
2013-03-01 17:28:32 -08:00
committed by Android Git Automerger
parent 8d5b88463b 1e5e3748d4
commit c807070cb5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/content/ContentProvider.java
View File

@ -238,7 +238,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
@Override @Override
public ParcelFileDescriptor openFile(Uri uri, String mode) public ParcelFileDescriptor openFile(Uri uri, String mode)
throws FileNotFoundException { throws FileNotFoundException {
if (mode != null && mode.startsWith("rw")) enforceWritePermission(uri); if (mode != null && mode.indexOf('w') != -1) enforceWritePermission(uri);
else enforceReadPermission(uri); else enforceReadPermission(uri);
return ContentProvider.this.openFile(uri, mode); return ContentProvider.this.openFile(uri, mode);
} }
@ -246,7 +246,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
@Override @Override
public AssetFileDescriptor openAssetFile(Uri uri, String mode) public AssetFileDescriptor openAssetFile(Uri uri, String mode)
throws FileNotFoundException { throws FileNotFoundException {
if (mode != null && mode.startsWith("rw")) enforceWritePermission(uri); if (mode != null && mode.indexOf('w') != -1) enforceWritePermission(uri);
else enforceReadPermission(uri); else enforceReadPermission(uri);
return ContentProvider.this.openAssetFile(uri, mode); return ContentProvider.this.openAssetFile(uri, mode);
} }