commit 6491d51fdcc63a27c3e1f27c6ece5dc3af5877eb
author Svetoslav <svetoslavganov@google.com> Thu Jan 15 04:47:53 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 15 04:47:54 2015 +0000
tree 786845a30bb9a1fec1b644bea34ffe5d26c02d10
parent b57e1f29643e7454192973db738c13583b5c91a5
parent 6cfe7996541d608438fa7bec2cbad813ace93a4f

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

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

diff --git a/src/com/android/settings/print/PrintJobSettingsFragment.java b/src/com/android/settings/print/PrintJobSettingsFragment.java
index 34db97b..ccdfc0e 100644
--- a/src/com/android/settings/print/PrintJobSettingsFragment.java
+++ b/src/com/android/settings/print/PrintJobSettingsFragment.java
@@ -78,7 +78,7 @@
 
         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

diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java
index b7c74da..581321b 100644
--- a/src/com/android/settings/print/PrintSettingsFragment.java
+++ b/src/com/android/settings/print/PrintSettingsFragment.java
@@ -465,7 +465,7 @@
             super(context);
             mPrintManager = ((PrintManager) context.getSystemService(
                     Context.PRINT_SERVICE)).getGlobalPrintManagerForUser(
-                        ActivityManager.getCurrentUser());
+                    context.getUserId());
         }
 
         @Override