summaryrefslogtreecommitdiff
path: root/packages/PrintSpooler/src
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2017-08-31 01:03:03 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-08-31 01:03:03 +0000
commit37acb83e147a7b400bb70207793ad1e6c62e1000 (patch)
tree25a5dc7066a7b4edfe18a4d2609252f3f2d6e72d /packages/PrintSpooler/src
parentaab40a1516b204a9d168d116aad9893d4df8b43c (diff)
parent8682785c4a9d9de970fcfdbb6f87ec774e2a54f4 (diff)
Merge "Do not call MediaSizeComp before it is initalized"
Diffstat (limited to 'packages/PrintSpooler/src')
-rw-r--r--packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
index 1b7a1b8b9567..951d196dabe1 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
@@ -642,7 +642,9 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat
public void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig);
- mMediaSizeComparator.onConfigurationChanged(newConfig);
+ if (mMediaSizeComparator != null) {
+ mMediaSizeComparator.onConfigurationChanged(newConfig);
+ }
if (mPrintPreviewController != null) {
mPrintPreviewController.onOrientationChanged();