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

Commit 9ccc9144 authored by sangyun's avatar sangyun
Browse files

Throw RuntimeException when looper is not prepared for deprecated API 

Modified to send RuntimeException if Looper is not prepared when
using deprecated addOnSubscriptionsChangedListener.

With the feature of the "Lazily init Handler in SubscriptionManager",
we expected to avoid using addOnSubscriptionsChangedListener, which
has been deprecated. However, if the Looper is not prepared while
using addOnSubscriptionsChangedListener, which was deprecated,
previously a RuntimeException would have been thrown, but currently
a NullpointerException will be caused. For backward compatibility,
Modified it to generate a RuntimeException.

Bug: 314924913
Test: manual test
Test: atest SubscriptionManagerTest
Change-Id: I32a117eaac557a901bd78584013c9d5e4b0c5b4d
parent 91e6c2c7

telephony/java/android/telephony/SubscriptionManager.java

+8 −2
Original line number Diff line number Diff line
@@ -1485,8 +1485,14 @@ public class SubscriptionManager { 
    public void addOnSubscriptionsChangedListener(OnSubscriptionsChangedListener listener) {

        if (listener == null) return;



        addOnSubscriptionsChangedListener(

                new HandlerExecutor(new Handler(listener.getCreatorLooper())), listener);

        Looper looper = listener.getCreatorLooper();

        if (looper == null) {

            throw new RuntimeException(

                    "Can't create handler inside thread " + Thread.currentThread()

                    + " that has not called Looper.prepare()");

        }



        addOnSubscriptionsChangedListener(new HandlerExecutor(new Handler(looper)), listener);

    }



    /**