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

Commit 766788dd authored by Tyler Gunn's avatar Tyler Gunn Committed by Gerrit Code Review
Browse files

Merge "Fix NullPointerException issue due to threads race" into main

parents fe9a8a6f b9e18209

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)