diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2013-04-03 23:28:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-03 23:28:07 +0000 |
| commit | 0f8e8b03ebb35040c299079adc1c351f37ce4885 (patch) | |
| tree | 19158f23cbd5b9dff30b7f6bedea8bba81f9ecb7 /core/java/android/net/Uri.java | |
| parent | 0d17aaa543f393c6c792f0b0d8ec5cb38ff1f71e (diff) | |
| parent | a14acd20b8d563319ea1a5974dca0e9a29f0aaef (diff) | |
| download | frameworks_base-0f8e8b03ebb35040c299079adc1c351f37ce4885.zip frameworks_base-0f8e8b03ebb35040c299079adc1c351f37ce4885.tar.gz frameworks_base-0f8e8b03ebb35040c299079adc1c351f37ce4885.tar.bz2 | |
Merge "Warn when exposing file:// Uris beyond a process." into jb-mr2-dev
Diffstat (limited to 'core/java/android/net/Uri.java')
| -rw-r--r-- | core/java/android/net/Uri.java | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/core/java/android/net/Uri.java b/core/java/android/net/Uri.java index cc6903d..4b022d9 100644 --- a/core/java/android/net/Uri.java +++ b/core/java/android/net/Uri.java @@ -20,6 +20,7 @@ import android.os.Environment; import android.os.Parcel; import android.os.Parcelable; import android.os.Environment.UserEnvironment; +import android.os.StrictMode; import android.util.Log; import java.io.File; import java.io.IOException; @@ -2326,4 +2327,16 @@ public abstract class Uri implements Parcelable, Comparable<Uri> { return this; } } + + /** + * If this is a {@code file://} Uri, it will be reported to + * {@link StrictMode}. + * + * @hide + */ + public void checkFileUriExposed(String location) { + if ("file".equals(getScheme())) { + StrictMode.onFileUriExposed(location); + } + } } |