From a5d8632a138d62d6d557661783b3c19803eb4c2d Mon Sep 17 00:00:00 2001
From: Hai Zhang <zhanghai@google.com>
Date: Fri, 15 Feb 2019 18:06:51 -0800
Subject: [PATCH] Fix default grant running for secondary user.

USER_SYSTEM is the same thing as the primary user, so we need to pass
USER_ALL to listen to package changes for all users.

Bug: 124452117
Bug: 124401873
Test: manual
Change-Id: Iab8469deb0e1ac3e7c286aba7fe2573187eb76f7
---
 .../core/java/com/android/server/role/RoleManagerService.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/role/RoleManagerService.java b/services/core/java/com/android/server/role/RoleManagerService.java
index d8531210cad8f..c145a22de6cd1 100644
--- a/services/core/java/com/android/server/role/RoleManagerService.java
+++ b/services/core/java/com/android/server/role/RoleManagerService.java
@@ -196,7 +196,7 @@ public class RoleManagerService extends SystemService implements RoleUserState.C
                 }
                 performInitialGrantsIfNecessary(userId);
             }
-        }, UserHandle.SYSTEM, intentFilter, null /* broadcastPermission */, null /* handler */);
+        }, UserHandle.ALL, intentFilter, null, null);
 
         getContext().getContentResolver().registerContentObserver(
                 Settings.Global.getUriFor(Settings.Global.SMS_ACCESS_RESTRICTION_ENABLED), false,