Fix issue where System UI crashing resulted in no unlock animation.
Fixes: 235254892 Test: adb shell am crash com.android.systemui Test: adb shell am crash com.google.android.apps.nexuslauncher Change-Id: Ia9644f8d1d5ffc9b162ce1608f8dd9ea9e1e3622
This commit is contained in:
@@ -96,7 +96,7 @@ public class SystemUiProxy implements ISystemUiProxy, DisplayController.DisplayI
|
||||
private IPipAnimationListener mPipAnimationListener;
|
||||
private ISplitScreenListener mSplitScreenListener;
|
||||
private IStartingWindowListener mStartingWindowListener;
|
||||
private ILauncherUnlockAnimationController mPendingLauncherUnlockAnimationController;
|
||||
private ILauncherUnlockAnimationController mLauncherUnlockAnimationController;
|
||||
private IRecentTasksListener mRecentTasksListener;
|
||||
private final ArrayList<RemoteTransitionCompat> mRemoteTransitions = new ArrayList<>();
|
||||
private IOnBackInvokedCallback mBackToLauncherCallback;
|
||||
@@ -189,10 +189,8 @@ public class SystemUiProxy implements ISystemUiProxy, DisplayController.DisplayI
|
||||
if (mStartingWindowListener != null && mStartingWindow != null) {
|
||||
setStartingWindowListener(mStartingWindowListener);
|
||||
}
|
||||
if (mPendingLauncherUnlockAnimationController != null
|
||||
&& mSysuiUnlockAnimationController != null) {
|
||||
setLauncherUnlockAnimationController(mPendingLauncherUnlockAnimationController);
|
||||
mPendingLauncherUnlockAnimationController = null;
|
||||
if (mSysuiUnlockAnimationController != null && mLauncherUnlockAnimationController != null) {
|
||||
setLauncherUnlockAnimationController(mLauncherUnlockAnimationController);
|
||||
}
|
||||
for (int i = mRemoteTransitions.size() - 1; i >= 0; --i) {
|
||||
registerRemoteTransition(mRemoteTransitions.get(i));
|
||||
@@ -757,11 +755,11 @@ public class SystemUiProxy implements ISystemUiProxy, DisplayController.DisplayI
|
||||
controller.dispatchSmartspaceStateToSysui();
|
||||
}
|
||||
} catch (RemoteException e) {
|
||||
Log.w(TAG, "Failed call setStartingWindowListener", e);
|
||||
Log.w(TAG, "Failed call setLauncherUnlockAnimationController", e);
|
||||
}
|
||||
} else {
|
||||
mPendingLauncherUnlockAnimationController = controller;
|
||||
}
|
||||
|
||||
mLauncherUnlockAnimationController = controller;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user