diff options
| author | Jon Miranda <jonmiranda@google.com> | 2019-08-05 15:02:12 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-05 15:02:12 -0700 |
| commit | 3edba34cb25bfef1cbec0e0dd495eb25abf580fb (patch) | |
| tree | d7139e2c7d81a7f7ca1739e61bb32124388f4653 /src/com/android/launcher3/BaseDraggingActivity.java | |
| parent | 91e7a72217a8e254d769cf4b2b78912f9990228f (diff) | |
| parent | ccf108c5f30e1c5c9251b2fd9d0a15811af53434 (diff) | |
| download | android_packages_apps_Trebuchet-3edba34cb25bfef1cbec0e0dd495eb25abf580fb.tar.gz android_packages_apps_Trebuchet-3edba34cb25bfef1cbec0e0dd495eb25abf580fb.tar.bz2 android_packages_apps_Trebuchet-3edba34cb25bfef1cbec0e0dd495eb25abf580fb.zip | |
Fix launcher crash when trying to open work profile promise icon. am: 0121d466ec
am: ccf108c5f3
Change-Id: I95441f44090f04f391ad436f9177f8cceb496d15
Diffstat (limited to 'src/com/android/launcher3/BaseDraggingActivity.java')
| -rw-r--r-- | src/com/android/launcher3/BaseDraggingActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/BaseDraggingActivity.java b/src/com/android/launcher3/BaseDraggingActivity.java index 8de00691e..f61051ff1 100644 --- a/src/com/android/launcher3/BaseDraggingActivity.java +++ b/src/com/android/launcher3/BaseDraggingActivity.java @@ -174,7 +174,7 @@ public abstract class BaseDraggingActivity extends BaseActivity getUserEventDispatcher().logAppLaunch(v, intent); getStatsLogManager().logAppLaunch(v, intent); return true; - } catch (ActivityNotFoundException|SecurityException e) { + } catch (NullPointerException|ActivityNotFoundException|SecurityException e) { Toast.makeText(this, R.string.activity_not_found, Toast.LENGTH_SHORT).show(); Log.e(TAG, "Unable to launch. tag=" + item + " intent=" + intent, e); } |