summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2012-05-23 19:30:46 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-05-23 19:30:46 -0700
commit6ea99d845b94c1e90320ffc5b3fbe96ce122f8e7 (patch)
tree852a0b48e5b7c34e1ff2b69cbc0b6a0400228ed3 /src
parent1a6e87f1a6c5e8ec5e7902ab86c68dd45f54399c (diff)
parentcd7ff382597a4242be6dc3cac1ba2dced84c5eba (diff)
downloadandroid_packages_apps_PackageInstaller-6ea99d845b94c1e90320ffc5b3fbe96ce122f8e7.tar.gz
android_packages_apps_PackageInstaller-6ea99d845b94c1e90320ffc5b3fbe96ce122f8e7.tar.bz2
android_packages_apps_PackageInstaller-6ea99d845b94c1e90320ffc5b3fbe96ce122f8e7.zip
Merge "Reduce strict Uri checking." into jb-dev
Diffstat (limited to 'src')
-rw-r--r--src/com/android/packageinstaller/PackageInstallerActivity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/packageinstaller/PackageInstallerActivity.java b/src/com/android/packageinstaller/PackageInstallerActivity.java
index c07ed4a7..3c5566e9 100644
--- a/src/com/android/packageinstaller/PackageInstallerActivity.java
+++ b/src/com/android/packageinstaller/PackageInstallerActivity.java
@@ -426,7 +426,7 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen
mPm = getPackageManager();
final String scheme = mPackageURI.getScheme();
- if (!"file".equals(scheme)) {
+ if (scheme != null && !"file".equals(scheme)) {
throw new IllegalArgumentException("unexpected scheme " + scheme);
}