summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-04-26 22:33:57 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-04-26 22:34:02 +0000
commit5a567142ad42d664be162b599ecba8a7ec8b16a6 (patch)
treef5649bf871af2ca164939c13e446fc2ca398ebfd
parent3f14b9e87e080ffcff69ceb815dbbd0ae8c07f3a (diff)
parent8c21d074fec997e8430475a0e51ca004fdf9b04c (diff)
Merge "Merge "Fix the notification issue shown on startForeground" am: ea86140ba4 am: 3b498d1c56 am: fd0239aa3f am: d5bf76fec0"
-rw-r--r--services/core/java/com/android/server/am/ServiceRecord.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/am/ServiceRecord.java b/services/core/java/com/android/server/am/ServiceRecord.java
index cffa475aff18..7761d526cd5d 100644
--- a/services/core/java/com/android/server/am/ServiceRecord.java
+++ b/services/core/java/com/android/server/am/ServiceRecord.java
@@ -495,8 +495,9 @@ final class ServiceRecord extends Binder {
Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
runningIntent.setData(Uri.fromParts("package",
appInfo.packageName, null));
- PendingIntent pi = PendingIntent.getActivity(ams.mContext, 0,
- runningIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+ PendingIntent pi = PendingIntent.getActivityAsUser(ams.mContext, 0,
+ runningIntent, PendingIntent.FLAG_UPDATE_CURRENT, null,
+ UserHandle.of(userId));
notiBuilder.setColor(ams.mContext.getColor(
com.android.internal
.R.color.system_notification_accent_color));