summaryrefslogtreecommitdiffstats
path: root/packages/PrintSpooler
diff options
context:
space:
mode:
authorSvetoslav <svetoslavganov@google.com>2014-09-23 16:20:43 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-23 16:20:43 +0000
commit5e7eeccd056f104f380e45bb507458621595937c (patch)
tree8c3f13ec015e606c74b0c3c7776b8681e361cd43 /packages/PrintSpooler
parent49d88bbd80cff472caf02152f79055916afcf57f (diff)
parent8b366ef3eeafea3839f78104f05266a12b8c0a87 (diff)
downloadframeworks_base-5e7eeccd056f104f380e45bb507458621595937c.zip
frameworks_base-5e7eeccd056f104f380e45bb507458621595937c.tar.gz
frameworks_base-5e7eeccd056f104f380e45bb507458621595937c.tar.bz2
am 515c7c94: am cd343325: am e821fc43: am 87c9fb76: am e9456781: Merge "Loosen the constraint for releasing a shared file." into lmp-dev
* commit '515c7c9416e33f17c9a937931d43ebfb391dcd44': Loosen the constraint for releasing a shared file.
Diffstat (limited to 'packages/PrintSpooler')
-rw-r--r--packages/PrintSpooler/src/com/android/printspooler/model/MutexFileProvider.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/PrintSpooler/src/com/android/printspooler/model/MutexFileProvider.java b/packages/PrintSpooler/src/com/android/printspooler/model/MutexFileProvider.java
index 1f48638..0df5e3c 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/model/MutexFileProvider.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/model/MutexFileProvider.java
@@ -93,7 +93,7 @@ public final class MutexFileProvider {
public void releaseFile() {
synchronized (mLock) {
if (mOwnerThread != Thread.currentThread()) {
- throw new IllegalStateException("Not acquired");
+ return;
}
if (DEBUG) {