From e1aaf7d577867d809316920050e92d4d7c6d40d5 Mon Sep 17 00:00:00 2001 From: Suprabh Shukla Date: Wed, 26 Apr 2017 11:47:43 -0700 Subject: [PATCH] Fixing service notification on secondary users The notification was starting application details activity in user 0 instead of the user in which the service is running Test: Manually tested that clicking on the notification starts app info activity in the current user Bug: 37530249 Change-Id: I9545c37bf1a36515813cbf1124c82c1c0fc3ad21 Merged-In: I9545c37bf1a36515813cbf1124c82c1c0fc3ad21 --- services/core/java/com/android/server/am/ServiceRecord.java | 5 +++-- 1 file 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 cffa475aff18e..7761d526cd5dc 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));