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

core/java/android/widget/AdapterView.java

@@ -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

@@ -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;
                 }