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

Commit 7ffa1d11 authored by Hall Liu's avatar Hall Liu
Browse files

Add new API for Telecom to send phone state 

Add new API to replace Telecom's prior usage of hidden TelephonyRegistry
methods.

Bug: 141576016
Test: CTS
Change-Id: I0049f55e8eadaa144ad844026524197198700038
parent 80b82f13

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -8329,6 +8329,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

+26 −5
Original line number Diff line number Diff line
@@ -15,9 +15,11 @@ 
 */

package android.telephony;



import android.annotation.CallbackExecutor;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.content.Context;

import android.net.LinkProperties;

import android.net.NetworkCapabilities;
@@ -49,8 +51,8 @@ import android.telephony.data.ApnSetting; 
import android.telephony.ims.ImsReasonInfo;

import android.util.Log;



import com.android.internal.telephony.ITelephonyRegistry;

import com.android.internal.telephony.IOnSubscriptionsChangedListener;

import com.android.internal.telephony.ITelephonyRegistry;



import java.util.HashMap;

import java.util.List;
@@ -235,14 +237,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, 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.notifyCallState(slotIndex, subId, state, incomingNumer);

            sRegistry.notifyCallStateForAllSubs(state, incomingNumber);

        } catch (RemoteException ex) {

            // system server crash

        }