Update LensPicker to gracefully handle app changes
- When I update apps and change the main launch activity, it tends to
crash LensPicker until I clear its shared_prefs. Making LensPicker
handle such changes more gracefully.
Change-Id: I5e7494d8211f5391b4cd6dad59e391ceab161443
Bug: 32019250
Test: Manually
diff --git a/src/com/android/support/car/lenspicker/LensPickerTrampolineActivity.java b/src/com/android/support/car/lenspicker/LensPickerTrampolineActivity.java
index 83c3caf..f089bf3 100644
--- a/src/com/android/support/car/lenspicker/LensPickerTrampolineActivity.java
+++ b/src/com/android/support/car/lenspicker/LensPickerTrampolineActivity.java
@@ -16,6 +16,7 @@
package com.android.support.car.lenspicker;
import android.app.Activity;
+import android.content.ActivityNotFoundException;
import android.content.ComponentName;
import android.content.Intent;
import android.content.SharedPreferences;
@@ -188,8 +189,14 @@
Log.d(TAG, "Launching last launched application.");
}
- LensPickerUtils.launch(this /* context */, mSharedPrefs, facetId, packageName,
+ try {
+ LensPickerUtils.launch(this /* context */, mSharedPrefs, facetId, packageName,
launchIntent);
+ } catch (ActivityNotFoundException e) {
+ // This can happen during development if someone changes the Activity used by an app.
+ Log.e(TAG, "Unable to launch activity! " + packageName, e);
+ return false;
+ }
return true;
}