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

Commit 5c27e63d authored by Tyler Gunn's avatar Tyler Gunn Committed by Automerger Merge Worker
Browse files

Merge "Fix potential issue where sub info change listener is not registered."... 

Merge "Fix potential issue where sub info change listener is not registered." into rvc-dev am: f0d56871 am: 16a9b71f am: e43b40bb am: 328788e0

Change-Id: I3f9b4d610119a75d4fba81fadef80b453b4bb8fc
parents 19bc3e13 328788e0

telephony/java/android/telephony/SubscriptionManager.java

+18 −0
Original line number Diff line number Diff line
@@ -972,6 +972,18 @@ public class SubscriptionManager { 
            if (DBG) log("onSubscriptionsChanged: NOT OVERRIDDEN");

        }



        /**

         * Callback invoked when {@link SubscriptionManager#addOnSubscriptionsChangedListener(

         * Executor, OnSubscriptionsChangedListener)} or

         * {@link SubscriptionManager#addOnSubscriptionsChangedListener(

         * OnSubscriptionsChangedListener)} fails to complete due to the

         * {@link Context#TELEPHONY_REGISTRY_SERVICE} being unavailable.

         * @hide

         */

        public void onAddListenerFailed() {

            Rlog.w(LOG_TAG, "onAddListenerFailed not overridden");

        }



        private void log(String s) {

            Rlog.d(LOG_TAG, s);

        }
@@ -1044,6 +1056,12 @@ public class SubscriptionManager { 
        if (telephonyRegistryManager != null) {

            telephonyRegistryManager.addOnSubscriptionsChangedListener(listener,

                    executor);

        } else {

            // If the telephony registry isn't available, we will inform the caller on their

            // listener that it failed so they can try to re-register.

            loge("addOnSubscriptionsChangedListener: pkgname=" + pkgName + " failed to be added "

                    + " due to TELEPHONY_REGISTRY_SERVICE being unavailable.");

            executor.execute(() -> listener.onAddListenerFailed());

        }

    }