diff options
| -rw-r--r-- | core/java/android/app/SharedPreferencesImpl.java | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/core/java/android/app/SharedPreferencesImpl.java b/core/java/android/app/SharedPreferencesImpl.java index 389ae7189ff0..e245bb5ad931 100644 --- a/core/java/android/app/SharedPreferencesImpl.java +++ b/core/java/android/app/SharedPreferencesImpl.java @@ -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() { |