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

Merge "Frameworks: Silently ignore InterruptedException"

Browse Source
This commit is contained in:
Treehugger Robot
2017-12-05 02:25:14 +00:00
committed by Gerrit Code Review
parent 68b81299d2 c8d5fc8572
commit 7e717e09cd
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/app/SharedPreferencesImpl.java
View File

@@ -217,10 +217,15 @@ final class SharedPreferencesImpl implements SharedPreferences {
}
private @GuardedBy("mLock") Map<String, Object> getLoaded() {
try {
return mMap.get();
} catch (InterruptedException | ExecutionException e) {
throw new IllegalStateException(e);
// For backwards compatibility, we need to ignore any interrupts. b/70122540.
for (;;) {
try {
return mMap.get();
} catch (ExecutionException e) {
throw new IllegalStateException(e);
} catch (InterruptedException e) {
// Ignore and try again.
}
}
}
private @GuardedBy("mLock") Map<String, Object> getLoadedWithBlockGuard() {