am 942edf4c: am 21824675: am 6491d51f: Merge "Settings not showing print jobs for a managed profile." into lmp-mr1-dev

* commit '942edf4ca6fb2e191d2ba1f5f2c2933c535516fd':
  Settings not showing print jobs for a managed profile.
This commit is contained in:
Svetoslav
2015-01-15 05:11:40 +00:00
committed by Android Git Automerger
2 changed files with 2 additions and 2 deletions

View File

@@ -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);

View File

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