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

Merge "The list of active print jobs in print service retunring wrong result." into klp-dev

Browse Source
This commit is contained in:
Svetoslav Ganov
2013-10-13 19:10:12 +00:00
committed by Android (Google) Code Review
parent 18e1214790 d91cb3ea61
commit 65d7b8d0db
4 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/print/PrintJobInfo.java
View File

@@ -131,7 +131,7 @@ public final class PrintJobInfo implements Parcelable {
/** The name of the printer - internally used */
private String mPrinterName;
/** The status of the print job. */
/** The state of the print job. */
private int mState;
/** The id of the app that created the job. */
@@ -555,7 +555,7 @@ public final class PrintJobInfo implements Parcelable {
builder.append("PrintJobInfo{");
builder.append("label: ").append(mLabel);
builder.append(", id: ").append(mId);
builder.append(", status: ").append(stateToString(mState));
builder.append(", state: ").append(stateToString(mState));
builder.append(", printer: " + mPrinterId);
builder.append(", tag: ").append(mTag);
builder.append(", creationTime: " + mCreationTime);
@@ -583,6 +583,9 @@ public final class PrintJobInfo implements Parcelable {
case STATE_STARTED: {
return "STATE_STARTED";
}
case STATE_BLOCKED: {
return "STATE_BLOCKED";
}
case STATE_FAILED: {
return "STATE_FAILED";
}

23
core/java/android/print/PrintManager.java
View File

@@ -146,11 +146,14 @@ public final class PrintManager {
switch (message.what) {
case MSG_NOTIFY_PRINT_JOB_STATE_CHANGED: {
SomeArgs args = (SomeArgs) message.obj;
PrintJobStateChangeListener listener =
(PrintJobStateChangeListener) args.arg1;
PrintJobId printJobId = (PrintJobId) args.arg2;
PrintJobStateChangeListenerWrapper wrapper =
(PrintJobStateChangeListenerWrapper) args.arg1;
PrintJobStateChangeListener listener = wrapper.getListener();
if (listener != null) {
PrintJobId printJobId = (PrintJobId) args.arg2;
listener.onPrintJobStateChanged(printJobId);
}
args.recycle();
listener.onPrintJobStateChanged(printJobId);
} break;
}
}
@@ -217,6 +220,7 @@ public final class PrintManager {
if (mPrintJobStateChangeListeners.isEmpty()) {
mPrintJobStateChangeListeners = null;
}
wrappedListener.destroy();
try {
mService.removePrintJobStateChangeListener(wrappedListener, mUserId);
} catch (RemoteException re) {
@@ -769,12 +773,19 @@ public final class PrintManager {
PrintJobStateChangeListener listener = mWeakListener.get();
if (handler != null && listener != null) {
SomeArgs args = SomeArgs.obtain();
args.arg1 = listener;
args.arg1 = this;
args.arg2 = printJobId;
handler.obtainMessage(MSG_NOTIFY_PRINT_JOB_STATE_CHANGED,
args).sendToTarget();
}
}
}
public void destroy() {
mWeakListener.clear();
}
public PrintJobStateChangeListener getListener() {
return mWeakListener.get();
}
}
}

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

@@ -189,7 +189,7 @@ public class NotificationController {
if (i == printJobCount - 1) {
builder.setLargeIcon(((BitmapDrawable) mContext.getResources().getDrawable(
computeNotificationIcon(printJob))).getBitmap());
builder.setSmallIcon(com.android.internal.R.drawable.ic_print);
builder.setSmallIcon(computeNotificationIcon(printJob));
builder.setContentTitle(computeNotificationTitle(printJob));
builder.setContentText(printJob.getPrinterName());
}

2
services/java/com/android/server/print/RemotePrintService.java
View File

@@ -682,7 +682,7 @@ final class RemotePrintService implements DeathRecipient {
final long identity = Binder.clearCallingIdentity();
try {
return service.mSpooler.getPrintJobInfos(service.mComponentName,
PrintJobInfo.STATE_ANY_VISIBLE_TO_CLIENTS, PrintManager.APP_ID_ANY);
PrintJobInfo.STATE_ANY_SCHEDULED, PrintManager.APP_ID_ANY);
} finally {
Binder.restoreCallingIdentity(identity);
}