Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28587c10 authored by Michael Chan's avatar Michael Chan Committed by Android (Google) Code Review
Browse files

Merge "Fix notification pendingClickIntent"

parents 9c06d812 4fbff8f8

src/com/android/calendar/alerts/AlertReceiver.java

+4 −2
Original line number Diff line number Diff line
@@ -145,12 +145,14 @@ public class AlertReceiver extends BroadcastReceiver { 
            clickIntent.putExtra(AlertUtils.EVENT_START_KEY, startMillis);

            clickIntent.putExtra(AlertUtils.EVENT_END_KEY, endMillis);

            clickIntent.putExtra(AlertUtils.SHOW_EVENT_KEY, true);

            pendingClickIntent = PendingIntent.getService(context, 0, clickIntent,

                    PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_UPDATE_CURRENT);

        } else {

            clickIntent.setClass(context, AlertActivity.class);

            clickIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

        }

        pendingClickIntent = PendingIntent.getService(context, 0, clickIntent,

            pendingClickIntent = PendingIntent.getActivity(context, 0, clickIntent,

                    PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_UPDATE_CURRENT);

        }



        // Create an intent triggered by clicking on the "Clear All Notifications" button or

        // by dismissing the notification