commit 762104ea5d5be567c434fcd8d610b0007d4a94fd
author Xiaohui Chen <xiaohuic@google.com> Tue Sep 01 10:26:53 2015 -0700
committer Xiaohui Chen <xiaohuic@google.com> Tue Sep 01 13:23:48 2015 -0700
tree d697f2ab2c350c5c633ec539c7ab75a4352b14a9
parent b600e38d481d6f9d36ec349351b5f51c63622a08

Cleanup USER_OWNER in Settings

This cl updates a couple places related to managed profiles.

Bug: 19913735
Change-Id: I72b5315885fc34d8716339ecc18447c15867a5ac

src/com/android/settings/ManagedProfileSetup.java

diff --git a/src/com/android/settings/ManagedProfileSetup.java b/src/com/android/settings/ManagedProfileSetup.java
index 198abe0..a72d2de 100644
--- a/src/com/android/settings/ManagedProfileSetup.java
+++ b/src/com/android/settings/ManagedProfileSetup.java
@@ -22,6 +22,7 @@
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.content.pm.UserInfo;
 import android.util.Log;
 import android.os.UserHandle;
 import android.os.UserManager;
@@ -45,14 +46,15 @@
     @Override
     public void onReceive(Context context, Intent broadcast) {
         final UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);
-        if (!Utils.isManagedProfile(um)) {
+        UserInfo userInfo = um.getUserInfo(UserHandle.myUserId());
+        if (userInfo == null || !userInfo.isManagedProfile()) {
             return;
         }
         Log.i(TAG, "Received broadcast: " + broadcast.getAction()
                 + ". Setting up intent forwarding for managed profile.");
         final PackageManager pm  = context.getPackageManager();
         // Clear any previous intent forwarding we set up
-        pm.clearCrossProfileIntentFilters(UserHandle.myUserId());
+        pm.clearCrossProfileIntentFilters(userInfo.id);
 
         // Set up intent forwarding for implicit intents
         Intent intent = new Intent();
@@ -70,8 +72,8 @@
                 boolean shouldForward = info.activityInfo.metaData.getBoolean(
                         PRIMARY_PROFILE_SETTING);
                 if (shouldForward) {
-                    pm.addCrossProfileIntentFilter(info.filter, UserHandle.myUserId(),
-                        UserHandle.USER_OWNER, PackageManager.SKIP_CURRENT_PROFILE);
+                    pm.addCrossProfileIntentFilter(info.filter, userInfo.id,
+                        userInfo.profileGroupId, PackageManager.SKIP_CURRENT_PROFILE);
                 }
             }
         }