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

Commit 570008e6 authored by Jack Yu's avatar Jack Yu Committed by Android (Google) Code Review
Browse files

Merge "Fixed the incorrect API comment" into main

parents b51a8072 e44aa7e2

core/java/android/telephony/TelephonyRegistryManager.java

+9 −7
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import android.telephony.Annotation.PreciseDisconnectCauses; 
import android.telephony.Annotation.RadioPowerState;

import android.telephony.Annotation.SimActivationState;

import android.telephony.Annotation.SrvccState;

import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;

import android.telephony.TelephonyManager.CarrierPrivilegesCallback;

import android.telephony.emergency.EmergencyNumber;

import android.telephony.ims.ImsCallSession;
@@ -116,14 +117,15 @@ public class TelephonyRegistryManager { 
    }



    /**

     * Register for changes to the list of active {@link SubscriptionInfo} records or to the

     * individual records themselves. When a change occurs the onSubscriptionsChanged method of

     * the listener will be invoked immediately if there has been a notification. The

     * onSubscriptionChanged method will also be triggered once initially when calling this

     * function.

     * Register for changes to the list of {@link SubscriptionInfo} records or to the

     * individual records (active or inactive) themselves. When a change occurs, the

     * {@link OnSubscriptionsChangedListener#onSubscriptionsChanged()} method of

     * the listener will be invoked immediately. The

     * {@link OnSubscriptionsChangedListener#onSubscriptionsChanged()} method will also be invoked

     * once initially when calling this method.

     *

     * @param listener an instance of {@link SubscriptionManager.OnSubscriptionsChangedListener}

     *                 with onSubscriptionsChanged overridden.

     * @param listener an instance of {@link OnSubscriptionsChangedListener} with

     * {@link OnSubscriptionsChangedListener#onSubscriptionsChanged()} overridden.

     * @param executor the executor that will execute callbacks.

     * @hide

     */

telephony/java/android/telephony/SubscriptionManager.java

+7 −6
Original line number Diff line number Diff line
@@ -1618,14 +1618,15 @@ public class SubscriptionManager { 
    }



    /**

     * Register for changes to the list of active {@link SubscriptionInfo} records or to the

     * individual records themselves. When a change occurs the onSubscriptionsChanged method of

     * the listener will be invoked immediately if there has been a notification. The

     * onSubscriptionChanged method will also be triggered once initially when calling this

     * function.

     * Register for changes to the list of {@link SubscriptionInfo} records or to the

     * individual records (active or inactive) themselves. When a change occurs, the

     * {@link OnSubscriptionsChangedListener#onSubscriptionsChanged()} method of

     * the listener will be invoked immediately. The

     * {@link OnSubscriptionsChangedListener#onSubscriptionsChanged()} method will also be invoked

     * once initially when calling this method.

     *

     * @param listener an instance of {@link OnSubscriptionsChangedListener} with

     *                 onSubscriptionsChanged overridden.

     * {@link OnSubscriptionsChangedListener#onSubscriptionsChanged()} overridden.

     * @param executor the executor that will execute callbacks.

     */

    public void addOnSubscriptionsChangedListener(