diff --git a/packages/SystemUI/src/com/android/systemui/recent/Recents.java b/packages/SystemUI/src/com/android/systemui/recent/Recents.java index 0cc09c8bb3711..116d755da7c80 100644 --- a/packages/SystemUI/src/com/android/systemui/recent/Recents.java +++ b/packages/SystemUI/src/com/android/systemui/recent/Recents.java @@ -61,6 +61,11 @@ public class Recents extends SystemUI implements RecentsComponent { @Override protected void onBootCompleted() { + if (mUseAlternateRecents) { + if (mAlternateRecents != null) { + mAlternateRecents.onBootCompleted(); + } + } mBootCompleted = true; } diff --git a/packages/SystemUI/src/com/android/systemui/recents/AlternateRecentsComponent.java b/packages/SystemUI/src/com/android/systemui/recents/AlternateRecentsComponent.java index bb19415499bf4..2f6d58fecd6ad 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/AlternateRecentsComponent.java +++ b/packages/SystemUI/src/com/android/systemui/recents/AlternateRecentsComponent.java @@ -153,6 +153,7 @@ public class AlternateRecentsComponent implements ActivityOptions.OnAnimationSta Messenger mService = null; Messenger mMessenger; RecentsMessageHandler mHandler; + boolean mBootCompleted = false; boolean mServiceIsBound = false; boolean mToggleRecentsUponServiceBound; RecentsServiceConnection mConnection = new RecentsServiceConnection(); @@ -182,6 +183,10 @@ public class AlternateRecentsComponent implements ActivityOptions.OnAnimationSta bindToRecentsService(false); } + public void onBootCompleted() { + mBootCompleted = true; + } + /** Shows the recents */ public void onShowRecents(boolean triggeredFromAltTab, View statusBarView) { if (Console.Enabled) { @@ -208,7 +213,7 @@ public class AlternateRecentsComponent implements ActivityOptions.OnAnimationSta if (Console.Enabled) { Console.log(Constants.Log.App.RecentsComponent, "[RecentsComponent|hideRecents]"); } - if (mServiceIsBound) { + if (mServiceIsBound && mBootCompleted) { // Notify recents to close it try { Bundle data = new Bundle(); @@ -278,7 +283,7 @@ public class AlternateRecentsComponent implements ActivityOptions.OnAnimationSta /** Updates each of the task animation rects. */ void updateAnimationRects() { - if (mServiceIsBound) { + if (mServiceIsBound && mBootCompleted) { Resources res = mContext.getResources(); int statusBarHeight = res.getDimensionPixelSize( com.android.internal.R.dimen.status_bar_height);