From a354471821557cb500ee4d8cd4fe560a3b6e2f45 Mon Sep 17 00:00:00 2001 From: Fabian Kozynski Date: Thu, 25 Apr 2019 17:05:21 -0400 Subject: [PATCH] Fix alarm text in QSHeader to use PendingIntent For security reasons, we should be using the PendingIntent. Test: set alarm in clock and 3rd party app and test click. Behavior remains the same Fixes: 131342866 Change-Id: I7f773404aadc2b51cbfbcd128ac0155eed82b420 --- .../src/com/android/systemui/qs/QuickStatusBarHeader.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java index e688007697f47..ae51e6a8d2e72 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java @@ -37,6 +37,7 @@ import android.provider.Settings; import android.service.notification.ZenModeConfig; import android.text.format.DateUtils; import android.util.AttributeSet; +import android.util.Log; import android.util.Pair; import android.util.StatsLog; import android.view.DisplayCutout; @@ -523,11 +524,11 @@ public class QuickStatusBarHeader extends RelativeLayout implements mActivityStarter.postStartActivityDismissingKeyguard(new Intent( AlarmClock.ACTION_SHOW_ALARMS), 0); } else if (v == mNextAlarmContainer) { - if (mNextAlarm.getShowIntent() != null - && mNextAlarm.getShowIntent().getIntent() != null) { + if (mNextAlarm.getShowIntent() != null) { mActivityStarter.postStartActivityDismissingKeyguard( - mNextAlarm.getShowIntent().getIntent(), 0); + mNextAlarm.getShowIntent()); } else { + Log.d(TAG, "No PendingIntent for next alarm. Using default intent"); mActivityStarter.postStartActivityDismissingKeyguard(new Intent( AlarmClock.ACTION_SHOW_ALARMS), 0); }