diff options
| author | Todd Kennedy <toddke@google.com> | 2016-03-11 00:16:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-03-11 00:16:13 +0000 |
| commit | fad9ed1396ea9f19d0a7192611ad5cf675d8bb73 (patch) | |
| tree | 3f2ec4b7ea7c62adce6cd58d5dfefb6738363201 /src | |
| parent | 2a55949c2d630c4a96b83c3fb4b8d65bb762c7dd (diff) | |
| parent | 87dcbc72c22e64c0b5007951984753ddd864c398 (diff) | |
| download | android_packages_apps_PackageInstaller-fad9ed1396ea9f19d0a7192611ad5cf675d8bb73.tar.gz android_packages_apps_PackageInstaller-fad9ed1396ea9f19d0a7192611ad5cf675d8bb73.tar.bz2 android_packages_apps_PackageInstaller-fad9ed1396ea9f19d0a7192611ad5cf675d8bb73.zip | |
Merge "Don't crash installer" into nyc-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/packageinstaller/PackageInstallerActivity.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/packageinstaller/PackageInstallerActivity.java b/src/com/android/packageinstaller/PackageInstallerActivity.java index cfa3dc24..21cc3411 100644 --- a/src/com/android/packageinstaller/PackageInstallerActivity.java +++ b/src/com/android/packageinstaller/PackageInstallerActivity.java @@ -467,6 +467,14 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen mReferrerURI = intent.getParcelableExtra(Intent.EXTRA_REFERRER); } + // if there's nothing to do, quietly slip into the ether + if (mPackageURI == null) { + Log.w(TAG, "Unspecified source"); + setPmResult(PackageManager.INSTALL_FAILED_INVALID_URI); + finish(); + return; + } + if (DeviceUtils.isWear(this)) { showDialogInner(DLG_NOT_SUPPORTED_ON_WEAR); return; |