commit f6c4a7acb1abf1fdba7b82c9d0b915d64d774e98
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Sat Oct 26 07:17:58 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Oct 26 07:17:58 2024 +0000
tree 008094bd6b3a49a91afcd9bb4023903d0d65e568
parent 7ba66be10ce5147d3dc429456352ec73ad3028a3
parent dd7d854c3a6fbf0141f8fbd29e973e7295f748c6

Merge "[PostBoot] Fix bug where post boot shader has a flicker" into main

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 8547eb4..983cf8d 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1345,7 +1345,8 @@
         if (requestArgs != null) {
             setWaitingForResult(requestArgs);
         }
-        mPendingActivityRequestCode = savedState.getInt(RUNTIME_STATE_PENDING_REQUEST_CODE);
+        mPendingActivityRequestCode = savedState.getInt(
+                RUNTIME_STATE_PENDING_REQUEST_CODE, mPendingActivityRequestCode);
 
         mPendingActivityResult = savedState.getParcelable(RUNTIME_STATE_PENDING_ACTIVITY_RESULT);