From b6aff1f56d55a36256446ec3970d92e9da39b98c Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Mon, 5 Oct 2020 16:08:35 -0700
Subject: [PATCH] Fix NPE inside RecentsOrientedState

Bug: 169963211
Change-Id: I86dd337dc1b862f3fa99b91b47fa250076233f96
---
 .../src/com/android/quickstep/util/RecentsOrientedState.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
index 5f0ef83382..bb84380edd 100644
--- a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
+++ b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
@@ -539,6 +539,7 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
      * @return "MyObject@1234"
      */
     private static String extractObjectNameAndAddress(String stringToExtract) {
-        return stringToExtract.substring(stringToExtract.lastIndexOf(DELIMITER_DOT));
+        int index = stringToExtract.lastIndexOf(DELIMITER_DOT);
+        return index >= 0 ? stringToExtract.substring(index) : "";
     }
 }