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

Merge "Send update notifications when the status of a print job updates and make sure to only access mPrintServicesChangeListenerRecords when locked." into nyc-dev

Browse Source 
am: bfce110c63

* commit 'bfce110c63541f514c865fc221047b8101932d58':
  Send update notifications when the status of a print job updates and make sure to only access mPrintServicesChangeListenerRecords when locked.

Change-Id: I6d87b7de3325d330b7b03f838ea8ec9475ff85be
This commit is contained in:
Philip P. Moltmann
2016-04-22 17:48:37 +00:00
committed by android-build-merger
parent b6f30bae48 bfce110c63
commit 9cb79d193b
2 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
packages/PrintSpooler/src/com/android/printspooler/model/PrintSpoolerService.java
View File

@@ -497,6 +497,20 @@ public final class PrintSpoolerService extends Service {
}
}
/**
* Notify all interested parties that a print job has been updated.
*
* @param printJob The updated print job.
*/
private void notifyPrintJobUpdated(PrintJobInfo printJob) {
Message message = mHandlerCaller.obtainMessageO(
HandlerCallerCallback.MSG_ON_PRINT_JOB_STATE_CHANGED,
printJob);
mHandlerCaller.executeOrSendMessage(message);
mNotificationController.onUpdateNotifications(mPrintJobs);
}
public boolean setPrintJobState(PrintJobId printJobId, int state, String error) {
boolean success = false;
@@ -549,12 +563,7 @@ public final class PrintSpoolerService extends Service {
notifyOnAllPrintJobsHandled();
}
Message message = mHandlerCaller.obtainMessageO(
HandlerCallerCallback.MSG_ON_PRINT_JOB_STATE_CHANGED,
printJob);
mHandlerCaller.executeOrSendMessage(message);
mNotificationController.onUpdateNotifications(mPrintJobs);
notifyPrintJobUpdated(printJob);
}
}
@@ -584,9 +593,12 @@ public final class PrintSpoolerService extends Service {
*/
public void setStatus(@NonNull PrintJobId printJobId, @Nullable CharSequence status) {
synchronized (mLock) {
getPrintJobInfo(printJobId, PrintManager.APP_ID_ANY).setStatus(status);
PrintJobInfo printJob = getPrintJobInfo(printJobId, PrintManager.APP_ID_ANY);
mNotificationController.onUpdateNotifications(mPrintJobs);
if (printJob != null) {
printJob.setStatus(status);
notifyPrintJobUpdated(printJob);
}
}
}
@@ -600,9 +612,12 @@ public final class PrintSpoolerService extends Service {
public void setStatus(@NonNull PrintJobId printJobId, @StringRes int status,
@Nullable CharSequence appPackageName) {
synchronized (mLock) {
getPrintJobInfo(printJobId, PrintManager.APP_ID_ANY).setStatus(status, appPackageName);
PrintJobInfo printJob = getPrintJobInfo(printJobId, PrintManager.APP_ID_ANY);
mNotificationController.onUpdateNotifications(mPrintJobs);
if (printJob != null) {
printJob.setStatus(status, appPackageName);
notifyPrintJobUpdated(printJob);
}
}
}

6
services/print/java/com/android/server/print/UserState.java
View File

@@ -593,7 +593,11 @@ final class UserState implements PrintSpoolerCallbacks, PrintServiceCallbacks,
new ListenerRecord<IPrintServicesChangeListener>(listener) {
@Override
public void onBinderDied() {
mPrintServicesChangeListenerRecords.remove(this);
synchronized (mLock) {
if (mPrintServicesChangeListenerRecords != null) {
mPrintServicesChangeListenerRecords.remove(this);
}
}
}
});
}