diff options
| author | Svetoslav <svetoslavganov@google.com> | 2013-09-12 22:38:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-12 22:38:35 +0000 |
| commit | 25f17f295b4da464a2758c11a02cabb51bf4722f (patch) | |
| tree | 14dbb3aaa7f29542055a1bb020061024a3875d96 /services | |
| parent | 96ece97073d197a056a9314ceca8a4a8ba445c26 (diff) | |
| parent | cc65b0c325b88c466763712f76148a6f5b8a5b3f (diff) | |
| download | frameworks_base-25f17f295b4da464a2758c11a02cabb51bf4722f.zip frameworks_base-25f17f295b4da464a2758c11a02cabb51bf4722f.tar.gz frameworks_base-25f17f295b4da464a2758c11a02cabb51bf4722f.tar.bz2 | |
Merge "Not change the print options on printer change if possible." into klp-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/print/RemotePrintService.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/java/com/android/server/print/RemotePrintService.java b/services/java/com/android/server/print/RemotePrintService.java index 0d539b0..f15c760 100644 --- a/services/java/com/android/server/print/RemotePrintService.java +++ b/services/java/com/android/server/print/RemotePrintService.java @@ -447,7 +447,9 @@ final class RemotePrintService implements DeathRecipient { Slog.i(LOG_TAG, "[user: " + mUserId + "] stopPrinterTracking()"); } // We are no longer tracking the printer. - mTrackedPrinterList.remove(printerId); + if (mTrackedPrinterList == null || !mTrackedPrinterList.remove(printerId)) { + return; + } if (mTrackedPrinterList.isEmpty()) { mTrackedPrinterList = null; } |