Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2d0fc00 authored by Andreas Gampe's avatar Andreas Gampe Committed by android-build-merger
Browse files

Merge "Frameworks: Silently ignore InterruptedException" am: 7e717e09 am: a6c6c4f5 

am: d52c7c92

Change-Id: Ia6588f13809132b705d372ba132ed3f7ef179bad
parents 7780e80d d52c7c92

core/java/android/app/SharedPreferencesImpl.java

+9 −4
Original line number Diff line number Diff line
@@ -217,10 +217,15 @@ final class SharedPreferencesImpl implements SharedPreferences { 
    }



    private @GuardedBy("mLock") Map<String, Object> getLoaded() {

        // For backwards compatibility, we need to ignore any interrupts. b/70122540.

        for (;;) {

            try {

                return mMap.get();

        } catch (InterruptedException | ExecutionException e) {

            } catch (ExecutionException e) {

                throw new IllegalStateException(e);

            } catch (InterruptedException e) {

                // Ignore and try again.

            }

        }

    }

    private @GuardedBy("mLock") Map<String, Object> getLoadedWithBlockGuard() {