summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jason Monk <jmonk@google.com> 2016-10-14 19:00:46 +0000
committer android-build-merger <android-build-merger@google.com> 2016-10-14 19:00:46 +0000
commit2abab0248f6f343e5cece6ab27a010b1c622ec17 (patch)
tree6cbc05546667ec4bafcecc372d901204a75381be
parent881011d951780c3dacecb4c470a46d4ba8727636 (diff)
parent6aa197116e0f0b380a9aaafaef70a07e5cbe5dff (diff)
Fix launching alarm pending intent am: d0408f0028 am: 9042736ff1
am: 6aa197116e Change-Id: Ide52a40383e181a07ec24ce4d89d5368a69c635d
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java
index 7a2ae22ed466..e4991d5ef66b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java
@@ -343,9 +343,7 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements
}
} else if (v == mAlarmStatus && mNextAlarm != null) {
PendingIntent showIntent = mNextAlarm.getShowIntent();
- if (showIntent != null && showIntent.isActivity()) {
- mActivityStarter.startActivity(showIntent.getIntent(), true /* dismissShade */);
- }
+ mActivityStarter.startPendingIntentDismissingKeyguard(showIntent);
}
}