summaryrefslogtreecommitdiff
path: root/location/java
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2020-06-09 23:05:32 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-06-09 23:05:32 +0000
commit6200c35d5b53cb7afb90df476f455ca430a69093 (patch)
treed4fdd195bcdc480e0ee4be1bb31bcb9182599942 /location/java
parent5e53866efe598717b6aa85240888222c6a855105 (diff)
parentc6e39e749d5aa86c057cae27df01cdc4d407d5c0 (diff)
Merge "Remove unused intent in NiNotification" into rvc-dev am: e93814953c am: ebaf86bece am: c6e39e749d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11799318 Change-Id: Ic99ec11e64cc11875e87edc810abdedd11bce11b
Diffstat (limited to 'location/java')
-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 9846436b3ac8..67a040dba3e7 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;
@@ -402,13 +401,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);