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

Commit c8d5fc85 authored by Andreas Gampe's avatar Andreas Gampe
Browse files

Frameworks: Silently ignore InterruptedException 

Apps seem to rely on this undocumented behavior so that the
threaded sync adapter doesn't crash an app. That's really
bad on the app side, but we will have to live with it.

Bug: 67986472
Bug: 70122540
Test: m
Test: Device boots
Test: m cts && cts-tradefed run commandAndExit cts-dev --module CtsContentTestCases -c android.content.cts.SharedPreferencesTest
Change-Id: I1ee4dfba4ad29c4f66fa60d3c8f8a99900b3447a
parent 3d16ff7a

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() {