Update LensPicker to gracefully handle app changesandroid-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-cts-release

- 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

1 files changed, 8 insertions, 1 deletions

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 @@ public class LensPickerTrampolineActivity extends Activity {
             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;
     }