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

Commit 383f4f39 authored by Andreas Gampe's avatar Andreas Gampe
Browse files

Revert "Frameworks: Silently ignore InterruptedException" 

This reverts commit c8d5fc85.

In preparation for different fix.

Bug: 67986472
Bug: 70122540
Bug: 71533447
Test: m
Test: Device boots
Test: m cts && cts-tradefed run commandAndExit cts-dev --module CtsContentTestCases -c android.content.cts.SharedPreferencesTest
Change-Id: I0b9e72d271725e15c20b68de981303c96ac1bd2a
parent 153fb1c6

core/java/android/app/SharedPreferencesImpl.java

+4 −9
Original line number Diff line number Diff line
@@ -217,15 +217,10 @@ 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 (ExecutionException e) {

        } catch (InterruptedException | ExecutionException e) {

            throw new IllegalStateException(e);

            } catch (InterruptedException e) {

                // Ignore and try again.

            }

        }

    }

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