summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2012-05-23 19:35:52 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-23 19:35:52 -0700
commit5ec90301e338bf853e2a9fba0c41a315a3e3e3e2 (patch)
tree852a0b48e5b7c34e1ff2b69cbc0b6a0400228ed3
parent81d0df3d6e79a9045fe2df2c91b6ccd59879c22e (diff)
parent6ea99d845b94c1e90320ffc5b3fbe96ce122f8e7 (diff)
downloadandroid_packages_apps_PackageInstaller-5ec90301e338bf853e2a9fba0c41a315a3e3e3e2.tar.gz
android_packages_apps_PackageInstaller-5ec90301e338bf853e2a9fba0c41a315a3e3e3e2.tar.bz2
android_packages_apps_PackageInstaller-5ec90301e338bf853e2a9fba0c41a315a3e3e3e2.zip
am 6ea99d84: Merge "Reduce strict Uri checking." into jb-dev
* commit '6ea99d845b94c1e90320ffc5b3fbe96ce122f8e7': Reduce strict Uri checking.
-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);
}