Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
automerge: 5e1e4ef

* commit '5e1e4ef41917315c46e577ddabb469164c56c515':
  Printing from two apps at the same time not working.
This commit is contained in:
Svet Ganov
2014-10-25 00:51:05 +00:00
committed by android-build-merger
parent 4870dab864 5e1e4ef419
commit a6a440b691
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/widget/AdapterView.java
View File

@@ -861,7 +861,8 @@ public abstract class AdapterView<T extends Adapter> extends ViewGroup {
public void run() { public void run() {
mPendingSelectionNotifier = null; mPendingSelectionNotifier = null;
if (mDataChanged) { if (mDataChanged && getViewRootImpl() != null
&& getViewRootImpl().isLayoutRequested()) {
// Data has changed between when this SelectionNotifier was // Data has changed between when this SelectionNotifier was
// posted and now. Postpone the notification until the next // posted and now. Postpone the notification until the next
// layout is complete and we run checkSelectionChanged(). // layout is complete and we run checkSelectionChanged().

2
packages/PrintSpooler/src/com/android/printspooler/model/PageContentRepository.java
View File

@@ -24,6 +24,7 @@ import android.content.ServiceConnection;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.BitmapDrawable;
import android.net.Uri;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.IBinder; import android.os.IBinder;
import android.os.ParcelFileDescriptor; import android.os.ParcelFileDescriptor;
@@ -462,6 +463,7 @@ public final class PageContentRepository {
} }
Intent intent = new Intent(PdfManipulationService.ACTION_GET_RENDERER); Intent intent = new Intent(PdfManipulationService.ACTION_GET_RENDERER);
intent.setClass(mContext, PdfManipulationService.class); intent.setClass(mContext, PdfManipulationService.class);
intent.setData(Uri.fromParts("fake-scheme", String.valueOf(hashCode()), null));
mContext.bindService(intent, AsyncRenderer.this, Context.BIND_AUTO_CREATE); mContext.bindService(intent, AsyncRenderer.this, Context.BIND_AUTO_CREATE);
mBoundToService = true; mBoundToService = true;
} }