Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix notifications that are sent for USER_ALL." into nyc-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2016-04-11 23:19:06 +00:00
committed by Android (Google) Code Review
parent bc20320f7f 012bc7bb9f
commit 01a1ad511e
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/app/Notification.java
View File

@@ -1955,9 +1955,16 @@ public class Notification implements Parcelable
* @hide
*/
public static void addFieldsFromContext(Context context, Notification notification) {
notification.extras.putParcelable(EXTRA_BUILDER_APPLICATION_INFO,
context.getApplicationInfo());
notification.extras.putInt(EXTRA_ORIGINATING_USERID, context.getUserId());
addFieldsFromContext(context.getApplicationInfo(), context.getUserId(), notification);
}
/**
* @hide
*/
public static void addFieldsFromContext(ApplicationInfo ai, int userId,
Notification notification) {
notification.extras.putParcelable(EXTRA_BUILDER_APPLICATION_INFO, ai);
notification.extras.putInt(EXTRA_ORIGINATING_USERID, userId);
}
@Override

10
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -2459,12 +2459,10 @@ public class NotificationManagerService extends SystemService {
// Fix the notification as best we can.
try {
if (!"android".equals(pkg) && !"system".equals(pkg)) {
Notification.addFieldsFromContext(getContext().createApplicationContext(
getContext().getPackageManager().getApplicationInfoAsUser(
pkg, PackageManager.MATCH_UNINSTALLED_PACKAGES, userId),
Context.CONTEXT_RESTRICTED), notification);
}
final ApplicationInfo ai = getContext().getPackageManager().getApplicationInfoAsUser(
pkg, PackageManager.MATCH_DEBUG_TRIAGED_MISSING,
(userId == UserHandle.USER_ALL) ? UserHandle.USER_SYSTEM : userId);
Notification.addFieldsFromContext(ai, userId, notification);
} catch (NameNotFoundException e) {
Slog.e(TAG, "Cannot create a context for sending app", e);
return;