summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2012-05-24 11:13:50 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-24 11:13:50 -0700
commit00b25c720ec7a6e3c9a8c69339191e1fbfe58f27 (patch)
tree3b2812c51a446960a038445c77332e5199b91155
parent5ec90301e338bf853e2a9fba0c41a315a3e3e3e2 (diff)
parenta51fa826438702d1513e8dcfaf25e68ba6d93db0 (diff)
downloadandroid_packages_apps_PackageInstaller-00b25c720ec7a6e3c9a8c69339191e1fbfe58f27.tar.gz
android_packages_apps_PackageInstaller-00b25c720ec7a6e3c9a8c69339191e1fbfe58f27.tar.bz2
android_packages_apps_PackageInstaller-00b25c720ec7a6e3c9a8c69339191e1fbfe58f27.zip
am a51fa826: Merge "Reduce strict Uri checking, again." into jb-dev
* commit 'a51fa826438702d1513e8dcfaf25e68ba6d93db0': Reduce strict Uri checking, again.
-rwxr-xr-xsrc/com/android/packageinstaller/InstallAppProgress.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/packageinstaller/InstallAppProgress.java b/src/com/android/packageinstaller/InstallAppProgress.java
index bb6fda2f..8bfcd4f1 100755
--- a/src/com/android/packageinstaller/InstallAppProgress.java
+++ b/src/com/android/packageinstaller/InstallAppProgress.java
@@ -162,7 +162,7 @@ public class InstallAppProgress extends Activity implements View.OnClickListener
mPackageURI = intent.getData();
final String scheme = mPackageURI.getScheme();
- if (!"file".equals(scheme)) {
+ if (scheme != null && !"file".equals(scheme)) {
throw new IllegalArgumentException("unexpected scheme " + scheme);
}