commit 826730aeb98040cd01c9b5f0656c8b9036bc07de
author Jorim Jaggi <jjaggi@google.com> Mon Dec 08 21:05:13 2014 +0100
committer Jorim Jaggi <jjaggi@google.com> Wed Dec 10 17:22:58 2014 +0100
tree 6338c4c3b819c45dc75be70c2fbaec93f2424a83
parent cf579e9be165a5ed9fc32f3e6cf5e7d234cce63c

Fix SysUI when an app started from the affordances crashes

- Fix infinite recursion in this case.
- If the app crashes, we are waiting for either setOccluded or
  hideKeyguard to be called. However, neither of these gets called
  in this case, so we recover from it by adding a timeout of 5
  seconds.

Bug: 18652789
Change-Id: Ib9a043f5692a8578703df1db08e1a6b9dcfbc742

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java

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 08844f31..d2dc425 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -1629,6 +1629,7 @@
         } else {
             mSecureCameraLaunchManager.startSecureCameraLaunch();
         }
+        mStatusBar.startLaunchTransitionTimeout();
         mBlockTouches = true;
     }