Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove unused intent in NiNotification" into rvc-dev am: e93814953c

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11799318

Change-Id: I1050717a58ce5437f11bc59745e18af351e106c0
This commit is contained in:
TreeHugger Robot
2020-06-09 22:40:34 +00:00
committed by Automerger Merge Worker
parent f670a4a50b e93814953c
commit ebaf86bece
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
location/java/com/android/internal/location/GpsNetInitiatedHandler.java
View File

@@ -18,7 +18,6 @@ package com.android.internal.location;
import android.app.Notification; import android.app.Notification;
import android.app.NotificationManager; import android.app.NotificationManager;
import android.app.PendingIntent;
import android.compat.annotation.UnsupportedAppUsage; import android.compat.annotation.UnsupportedAppUsage;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
@@ -402,13 +401,9 @@ public class GpsNetInitiatedHandler {
mNiNotificationBuilder.setDefaults(0); mNiNotificationBuilder.setDefaults(0);
} }
// if not to popup dialog immediately, pending intent will open the dialog
Intent intent = !mPopupImmediately ? getDlgIntent(notif) : new Intent();
PendingIntent pi = PendingIntent.getBroadcast(mContext, 0, intent, 0);
mNiNotificationBuilder.setTicker(getNotifTicker(notif, mContext)) mNiNotificationBuilder.setTicker(getNotifTicker(notif, mContext))
.setContentTitle(title) .setContentTitle(title)
.setContentText(message) .setContentText(message);
.setContentIntent(pi);
notificationManager.notifyAsUser(null, notif.notificationId, mNiNotificationBuilder.build(), notificationManager.notifyAsUser(null, notif.notificationId, mNiNotificationBuilder.build(),
UserHandle.ALL); UserHandle.ALL);