summaryrefslogtreecommitdiff
path: root/location/java/com
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2020-06-09 23:21:32 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-06-09 23:21:32 +0000
commit5e72ff77d4d2579ec350573211d855c49075aa0a (patch)
tree51c8aa52b8396d3e04ba94f643bdc2fad917643b /location/java/com
parentaf50a4e6fc21fd984702080c5c2175b6ffa21cdc (diff)
parent6200c35d5b53cb7afb90df476f455ca430a69093 (diff)
Merge "Remove unused intent in NiNotification" into rvc-dev am: e93814953c am: ebaf86bece am: c6e39e749d am: 6200c35d5b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11799318 Change-Id: I23e0430e37ab8714fb35389d269dc7c8a6c99986
Diffstat (limited to 'location/java/com')
-rw-r--r--location/java/com/android/internal/location/GpsNetInitiatedHandler.java7
1 files changed, 1 insertions, 6 deletions
diff --git a/location/java/com/android/internal/location/GpsNetInitiatedHandler.java b/location/java/com/android/internal/location/GpsNetInitiatedHandler.java
index d5ae3bc4d881..eb2e23e1b5e1 100644
--- a/location/java/com/android/internal/location/GpsNetInitiatedHandler.java
+++ b/location/java/com/android/internal/location/GpsNetInitiatedHandler.java
@@ -18,7 +18,6 @@ package com.android.internal.location;
import android.app.Notification;
import android.app.NotificationManager;
-import android.app.PendingIntent;
import android.compat.annotation.UnsupportedAppUsage;
import android.content.BroadcastReceiver;
import android.content.Context;
@@ -415,13 +414,9 @@ public class GpsNetInitiatedHandler {
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))
.setContentTitle(title)
- .setContentText(message)
- .setContentIntent(pi);
+ .setContentText(message);
notificationManager.notifyAsUser(null, notif.notificationId, mNiNotificationBuilder.build(),
UserHandle.ALL);