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

Commit 2bca8960 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 

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



Change-Id: I8d4287eddf276d15c3e8bc8d84de9de47378b109
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e3fb9bb2 766788dd

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

+5 −2
Original line number Diff line number Diff line
@@ -304,6 +304,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
@@ -313,7 +315,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) {
@@ -831,7 +832,9 @@ public class Ringer { 
            call.setUserMissed(USER_MISSED_DND_MODE);

        }



        if (mAttributesLatch != null) {

            mAttributesLatch.countDown();

        }

        return builder.setEndEarly(endEarly)

                .setLetDialerHandleRinging(letDialerHandleRinging)

                .setAcquireAudioFocus(shouldAcquireAudioFocus)