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

Commit 5e1e4ef4 authored by Svet Ganov's avatar Svet Ganov Committed by Android Git Automerger
Browse files

am b32f04b7: Merge "Printing from two apps at the same time not working." into lmp-mr1-dev 

* commit 'b32f04b7':
  Printing from two apps at the same time not working.
parents ae5c3ee2 b32f04b7

core/java/android/widget/AdapterView.java

+2 −1
Original line number Diff line number Diff line
@@ -861,7 +861,8 @@ public abstract class AdapterView<T extends Adapter> extends ViewGroup { 
        public void run() {

            mPendingSelectionNotifier = null;



            if (mDataChanged) {

            if (mDataChanged && getViewRootImpl() != null

                    && getViewRootImpl().isLayoutRequested()) {

                // Data has changed between when this SelectionNotifier was

                // posted and now. Postpone the notification until the next

                // layout is complete and we run checkSelectionChanged().

packages/PrintSpooler/src/com/android/printspooler/model/PageContentRepository.java

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.content.ServiceConnection; 
import android.graphics.Bitmap;

import android.graphics.Color;

import android.graphics.drawable.BitmapDrawable;

import android.net.Uri;

import android.os.AsyncTask;

import android.os.IBinder;

import android.os.ParcelFileDescriptor;
@@ -462,6 +463,7 @@ public final class PageContentRepository { 
                    }

                    Intent intent = new Intent(PdfManipulationService.ACTION_GET_RENDERER);

                    intent.setClass(mContext, PdfManipulationService.class);

                    intent.setData(Uri.fromParts("fake-scheme", String.valueOf(hashCode()), null));

                    mContext.bindService(intent, AsyncRenderer.this, Context.BIND_AUTO_CREATE);

                    mBoundToService = true;

                }