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

Commit 88a31e40 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Allow BAL from SelectPrinterActivity" into udc-qpr-dev am:... 

Merge "Merge "Allow BAL from SelectPrinterActivity" into udc-qpr-dev am: 0ccfa0d2" into udc-qpr-dev-plus-aosp
parents a18ac8d4 e0d18d75

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

+7 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.printspooler.ui; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.Activity;

import android.app.ActivityOptions;

import android.app.LoaderManager;

import android.content.ComponentName;

import android.content.Context;
@@ -714,8 +715,13 @@ public final class SelectPrinterActivity extends Activity implements 


                    try {

                        mPrinterForInfoIntent = printer;

                        Bundle options = ActivityOptions.makeBasic()

                                .setPendingIntentBackgroundActivityStartMode(

                                        ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED)

                                .toBundle();

                        startIntentSenderForResult(printer.getInfoIntent().getIntentSender(),

                                INFO_INTENT_REQUEST_CODE, fillInIntent, 0, 0, 0);

                                INFO_INTENT_REQUEST_CODE, fillInIntent, 0, 0, 0,

                                options);

                    } catch (SendIntentException e) {

                        mPrinterForInfoIntent = null;

                        Log.e(LOG_TAG, "Could not execute pending info intent: %s", e);