Merge "Print preview disappearing on screen off/on." into lmp-dev

1 files changed, 9 insertions, 0 deletions

diff --git a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
index 3985285..389988a 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
@@ -312,6 +312,14 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat
     }
 
     @Override
+    public void onResume() {
+        super.onResume();
+        if (mState != STATE_INITIALIZING && mCurrentPrinter != null) {
+            mPrinterRegistry.setTrackedPrinter(mCurrentPrinter.getId());
+        }
+    }
+
+    @Override
     public void onPause() {
         PrintSpoolerService spooler = mSpoolerProvider.getSpooler();
 
@@ -347,6 +355,7 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat
         }
 
         mPrinterAvailabilityDetector.cancel();
+        mPrinterRegistry.setTrackedPrinter(null);
 
         super.onPause();
     }