PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix issue where System UI crashing resulted in no unlock animation." into tm-qpr-dev am: 778f8c1833

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

Change-Id: I493e20cb3d0b8e1094050af07256051f34b9d3bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-07-27 21:52:30 +00:00
committed by Automerger Merge Worker
parent f163a413f7 778f8c1833
commit 88cbc4e055
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/SystemUiProxy.java
+6 -8
View File
@@ -96,7 +96,7 @@ public class SystemUiProxy implements ISystemUiProxy, DisplayController.DisplayI
private IPipAnimationListener mPipAnimationListener; private IPipAnimationListener mPipAnimationListener;
private ISplitScreenListener mSplitScreenListener; private ISplitScreenListener mSplitScreenListener;
private IStartingWindowListener mStartingWindowListener; private IStartingWindowListener mStartingWindowListener;
private ILauncherUnlockAnimationController mPendingLauncherUnlockAnimationController; private ILauncherUnlockAnimationController mLauncherUnlockAnimationController;
private IRecentTasksListener mRecentTasksListener; private IRecentTasksListener mRecentTasksListener;
private final ArrayList<RemoteTransitionCompat> mRemoteTransitions = new ArrayList<>(); private final ArrayList<RemoteTransitionCompat> mRemoteTransitions = new ArrayList<>();
private IOnBackInvokedCallback mBackToLauncherCallback; private IOnBackInvokedCallback mBackToLauncherCallback;
@@ -189,10 +189,8 @@ public class SystemUiProxy implements ISystemUiProxy, DisplayController.DisplayI
if (mStartingWindowListener != null && mStartingWindow != null) { if (mStartingWindowListener != null && mStartingWindow != null) {
setStartingWindowListener(mStartingWindowListener); setStartingWindowListener(mStartingWindowListener);
} }
if (mPendingLauncherUnlockAnimationController != null if (mSysuiUnlockAnimationController != null && mLauncherUnlockAnimationController != null) {
&& mSysuiUnlockAnimationController != null) { setLauncherUnlockAnimationController(mLauncherUnlockAnimationController);
setLauncherUnlockAnimationController(mPendingLauncherUnlockAnimationController);
mPendingLauncherUnlockAnimationController = null;
} }
for (int i = mRemoteTransitions.size() - 1; i >= 0; --i) { for (int i = mRemoteTransitions.size() - 1; i >= 0; --i) {
registerRemoteTransition(mRemoteTransitions.get(i)); registerRemoteTransition(mRemoteTransitions.get(i));
@@ -757,11 +755,11 @@ public class SystemUiProxy implements ISystemUiProxy, DisplayController.DisplayI
controller.dispatchSmartspaceStateToSysui(); controller.dispatchSmartspaceStateToSysui();
} }
} catch (RemoteException e) { } catch (RemoteException e) {
Log.w(TAG, "Failed call setStartingWindowListener", e); Log.w(TAG, "Failed call setLauncherUnlockAnimationController", e);
} }
} else {
mPendingLauncherUnlockAnimationController = controller;
} }
mLauncherUnlockAnimationController = controller;
} }
/** /**