commit c1aaede528df2db695e3a94f39eeea1b0a8d8ee1
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Apr 27 23:02:31 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 27 23:02:37 2017 +0000
tree 8ac0de97a161a67831e48e3219d58f20d6c30d31
parent ad9412cf8acdfeea591616bbfd5f21c6af9dd8c2
parent e1aaf7d577867d809316920050e92d4d7c6d40d5

Merge "Fixing service notification on secondary users" into oc-dev

services/core/java/com/android/server/am/ServiceRecord.java

diff --git a/services/core/java/com/android/server/am/ServiceRecord.java b/services/core/java/com/android/server/am/ServiceRecord.java
index 42c405f..027dc08 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 @@
                                         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));