commit 00c509995c971784957a2ebfe14e7c13a9adb507
author Vadim Tryshev <vadimt@google.com> Thu Jun 17 21:42:47 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jun 17 21:42:47 2021 +0000
tree 7e45f9957461a211f3a7a43e928a484a902f7159
parent c732386ad3747ded6096b375fb5960112a850144
parent 5e786cce6860c62bc59f7003cf7ddcad9de7ff6a

Merge "Improving diagnostics when Launcher dies while in ContentProvider call" into sc-dev am: 26cd946f29 am: 5e786cce68

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14991671

Change-Id: Id0165ac02718048839da1071ec179f8a96da7b5d

tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java

diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index f5c1efa..96e8222 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -39,6 +39,7 @@
 import android.graphics.Rect;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.DeadObjectException;
 import android.os.Parcelable;
 import android.os.RemoteException;
 import android.os.SystemClock;
@@ -269,6 +270,9 @@
         try (ContentProviderClient client = getContext().getContentResolver()
                 .acquireContentProviderClient(mTestProviderUri)) {
             return client.call(request, null, null);
+        } catch (DeadObjectException e) {
+            fail("Launcher crashed");
+            return null;
         } catch (RemoteException e) {
             throw new RuntimeException(e);
         }