commit 906fc4172466e7ddd0886fa51b308ce4e69c266a
author Andre Eisenbach <eisenbach@google.com> Fri Jan 16 02:01:02 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 16 02:01:05 2015 +0000
tree e1c3ef2518b39d05cc9e1c64c4d516c785e1e599
parent 6491d51fdcc63a27c3e1f27c6ece5dc3af5877eb
parent 63e0f16c63617440ce864908344af1c8ce41fbec

Merge "Do not perform SDP during pairing" 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