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

Commit 8e8aba5c authored by Tyler Gunn's avatar Tyler Gunn Committed by Automerger Merge Worker
Browse files

Merge "Fix NullPointerException issue due to threads race" into main am: 766788dd am: 2bca8960 

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/3542210



Change-Id: Ib2a9d1321f0a84fe194549dae4b70353b9ff5782
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4198094e 2bca8960

src/com/android/server/telecom/Ringer.java

+5 −2
Original line number Diff line number Diff line
@@ -305,6 +305,8 @@ public class Ringer { 
                return false;

            }



            mAttributesLatch = new CountDownLatch(1);



            // Use completable future to establish a timeout, not intent to make these work outside

            // the main thread asynchronously

            // TODO: moving these RingerAttributes calculation out of Telecom lock to avoid blocking
@@ -314,7 +316,6 @@ public class Ringer { 


            RingerAttributes attributes = null;

            try {

                mAttributesLatch = new CountDownLatch(1);

                attributes = ringerAttributesFuture.get(

                        RINGER_ATTRIBUTES_TIMEOUT, TimeUnit.MILLISECONDS);

            } catch (ExecutionException | InterruptedException | TimeoutException e) {
@@ -852,7 +853,9 @@ public class Ringer { 
            call.setUserMissed(USER_MISSED_DND_MODE);

        }



        if (mAttributesLatch != null) {

            mAttributesLatch.countDown();

        }

        return builder.setEndEarly(endEarly)

                .setLetDialerHandleRinging(letDialerHandleRinging)

                .setAcquireAudioFocus(shouldAcquireAudioFocus)