SysUI: Handle KgdExtView callbacks on UI thread

These callbacks can happen off the UI thread and some of the actions
we perform require us to be on the UI thread.

Change-Id: Ic3d7007b2df0630d4bdd511d34acde20c1a16a34

1 files changed, 25 insertions, 7 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
index 688ed65..1536137 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -1193,18 +1193,30 @@ public class NotificationPanelView extends PanelView implements
         @Override
         public boolean requestDismiss() {
             if (hasExternalKeyguardView()) {
-                mStatusBar.setBarState(StatusBarState.KEYGUARD);
-                mStatusBar.showBouncer();
+                post(new Runnable() {
+                    @Override
+                    public void run() {
+                        mStatusBar.showKeyguard();
+                        mStatusBar.showBouncer();
+                    }
+                });
                 return true;
             }
             return false;
         }
 
         @Override
-        public boolean requestDismissAndStartActivity(Intent intent) {
+        public boolean requestDismissAndStartActivity(final Intent intent) {
             if (hasExternalKeyguardView()) {
-                mStatusBar.setBarState(StatusBarState.KEYGUARD);
-                mStatusBar.startActivity(intent, true);
+                if (hasExternalKeyguardView()) {
+                    post(new Runnable() {
+                        @Override
+                        public void run() {
+                            mStatusBar.showKeyguard();
+                            mStatusBar.startActivity(intent, true);
+                        }
+                    });
+                }
                 return true;
             }
             return false;
@@ -1212,8 +1224,14 @@ public class NotificationPanelView extends PanelView implements
 
         @Override
         public void collapseNotificationPanel() {
-            if (mStatusBar.getBarState() == StatusBarState.KEYGUARD && hasExternalKeyguardView()) {
-                mStatusBar.focusKeyguardExternalView();
+            if (mStatusBar.getBarState() == StatusBarState.KEYGUARD && hasExternalKeyguardView() &&
+                    mKeyguardExternalView.isInteractive()) {
+                post(new Runnable() {
+                    @Override
+                    public void run() {
+                        mStatusBar.focusKeyguardExternalView();
+                    }
+                });
             }
         }