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

Commit f47ee8f1 authored by Hall Liu's avatar Hall Liu
Browse files

Merge commit 'ae63546d' into... 

Merge commit 'ae63546d' into manual_merge_ae63546d19f91931a9a05015b149ddc19091c895

Change-Id: Ic7b8ec208eaed5fc3a9f5ee90dac5ffeb9a18543
parents 1e7cf17f ae63546d

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -8795,6 +8795,7 @@ package android.telephony { 
  public class TelephonyRegistryManager {

    method public void addOnOpportunisticSubscriptionsChangedListener(@NonNull android.telephony.SubscriptionManager.OnOpportunisticSubscriptionsChangedListener, @NonNull java.util.concurrent.Executor);

    method public void addOnSubscriptionsChangedListener(@NonNull android.telephony.SubscriptionManager.OnSubscriptionsChangedListener, @NonNull java.util.concurrent.Executor);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void notifyCallStateChangedForAllSubscriptions(int, @Nullable String);

    method public void notifyCarrierNetworkChange(boolean);

    method public void removeOnOpportunisticSubscriptionsChangedListener(@NonNull android.telephony.SubscriptionManager.OnOpportunisticSubscriptionsChangedListener);

    method public void removeOnSubscriptionsChangedListener(@NonNull android.telephony.SubscriptionManager.OnSubscriptionsChangedListener);

core/java/android/telephony/TelephonyRegistryManager.java

+25 −6
Original line number Diff line number Diff line
@@ -225,14 +225,33 @@ public class TelephonyRegistryManager { 
     * @param slotIndex for which call state changed. Can be derived from subId except when subId is

     * invalid.

     * @param state latest call state. e.g, offhook, ringing

     * @param incomingNumer incoming phone number.

     * @param incomingNumber incoming phone number.

     *

     * @hide

     */

    public void notifyCallStateChanged(int subId, int slotIndex, @CallState int state,

        String incomingNumer) {

            String incomingNumber) {

        try {

            sRegistry.notifyCallState(slotIndex, subId, state, incomingNumer);

            sRegistry.notifyCallState(slotIndex, subId, state, incomingNumber);

        } catch (RemoteException ex) {

            // system server crash

        }

    }



    /**

     * Notify call state changed on all subscriptions.

     *

     * @param state latest call state. e.g, offhook, ringing

     * @param incomingNumber incoming phone number.

     * @hide

     */

    @SystemApi

    @TestApi

    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)

    public void notifyCallStateChangedForAllSubscriptions(@CallState int state,

            @Nullable String incomingNumber) {

        try {

            sRegistry.notifyCallStateForAllSubs(state, incomingNumber);

        } catch (RemoteException ex) {

            // system server crash

        }