Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5be5ec3 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by Android (Google) Code Review
Browse files

Merge "Handle all configuration changes in PrintActivity as it cannot be... 

Merge "Handle all configuration changes in PrintActivity as it cannot be destroyed synchronously." into nyc-dev
parents cd7c97bc 940fa80c

packages/PrintSpooler/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 


        <activity

            android:name=".ui.PrintActivity"

            android:configChanges="screenSize|smallestScreenSize|orientation"

            android:configChanges="screenSize|smallestScreenSize|orientation|locale|keyboard|keyboardHidden|fontScale|uiMode|layoutDirection"

            android:permission="android.permission.BIND_PRINT_SPOOLER_SERVICE"

            android:theme="@style/Theme.PrintActivity">

            <intent-filter>

packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java

+4 −1
Original line number Diff line number Diff line
@@ -2051,9 +2051,12 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 
            mDestinationSpinnerAdapter.unregisterDataSetObserver(mPrintersObserver);

        }



        if (mSpoolerProvider != null) {

            mSpoolerProvider.destroy();

        }



        if (mState != STATE_INITIALIZING) {

            mProgressMessageController.cancel();

            mSpoolerProvider.destroy();

            mPrintedDocument.finish();

            mPrintedDocument.destroy();

            mPrintPreviewController.destroy(new Runnable() {