Merge "Settings not showing print jobs for a managed profile." into lmp-mr1-dev

src/com/android/settings/print/PrintJobSettingsFragment.java

@@ -78,7 +78,7 @@ public class PrintJobSettingsFragment extends SettingsPreferenceFragment {
 
         mPrintManager = ((PrintManager) getActivity().getSystemService(
                 Context.PRINT_SERVICE)).getGlobalPrintManagerForUser(
-                        ActivityManager.getCurrentUser());
+                        getActivity().getUserId());
 
         getActivity().getActionBar().setTitle(R.string.print_print_job);
 

src/com/android/settings/print/PrintSettingsFragment.java

@@ -465,7 +465,7 @@ public class PrintSettingsFragment extends SettingsPreferenceFragment
             super(context);
             mPrintManager = ((PrintManager) context.getSystemService(
                     Context.PRINT_SERVICE)).getGlobalPrintManagerForUser(
-                        ActivityManager.getCurrentUser());
+                    context.getUserId());
         }
 
         @Override