Merge "Fix potential issue where sub info change listener is not registered." am: ba1878f55a (c82e04e7) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/SubscriptionManager.java

+18 −0

Original line number	Diff line number	Diff line
		@@ -948,6 +948,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);
		}
		@@ -1028,6 +1040,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());
		}
		}