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

Commit 64418f4c authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

Merge "Integrate the active emergency session listener in TelephonyRegistry" 

am: 4a54c2fa

Change-Id: I890a913c18332669dee8f21baf81db78a50a0fb0
parents f26f7a20 4a54c2fa

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -7752,6 +7752,8 @@ package android.telephony { 
    method public void onCallAttributesChanged(@NonNull android.telephony.CallAttributes);

    method @RequiresPermission("android.permission.READ_PRECISE_PHONE_STATE") public void onCallDisconnectCauseChanged(int, int);

    method @RequiresPermission("android.permission.READ_PRECISE_PHONE_STATE") public void onImsCallDisconnectCauseChanged(@NonNull android.telephony.ims.ImsReasonInfo);

    method public void onOutgoingEmergencyCall(@NonNull android.telephony.emergency.EmergencyNumber);

    method public void onOutgoingEmergencySms(@NonNull android.telephony.emergency.EmergencyNumber);

    method @RequiresPermission("android.permission.READ_PRECISE_PHONE_STATE") public void onPreciseCallStateChanged(@NonNull android.telephony.PreciseCallState);

    method @RequiresPermission("android.permission.READ_PRECISE_PHONE_STATE") public void onPreciseDataConnectionStateChanged(@NonNull android.telephony.PreciseDataConnectionState);

    method public void onRadioPowerStateChanged(int);

api/test-current.txt

+5 −0
Original line number Diff line number Diff line
@@ -2853,6 +2853,11 @@ package android.telephony { 
    method public static void setMinMatchForTest(int);

  }



  public class PhoneStateListener {

    field @RequiresPermission("android.permission.READ_ACTIVE_EMERGENCY_SESSION") public static final int LISTEN_OUTGOING_CALL_EMERGENCY_NUMBER = 268435456; // 0x10000000

    field @RequiresPermission("android.permission.READ_ACTIVE_EMERGENCY_SESSION") public static final int LISTEN_OUTGOING_SMS_EMERGENCY_NUMBER = 536870912; // 0x20000000

  }



  public class ServiceState implements android.os.Parcelable {

    method public void addNetworkRegistrationInfo(android.telephony.NetworkRegistrationInfo);

    method public void setCdmaSystemAndNetworkId(int, int);

cmds/telecom/src/com/android/commands/telecom/Telecom.java

+17 −0
Original line number Diff line number Diff line
@@ -65,6 +65,14 @@ public final class Telecom extends BaseCommand { 
    private static final String COMMAND_UNREGISTER_PHONE_ACCOUNT = "unregister-phone-account";

    private static final String COMMAND_SET_DEFAULT_DIALER = "set-default-dialer";

    private static final String COMMAND_GET_DEFAULT_DIALER = "get-default-dialer";

    /**

     * Change the system dialer package name if a package name was specified,

     * Example: adb shell telecom set-system-dialer <PACKAGE>

     *

     * Restore it to the default if if argument is "default" or no argument is passed.

     * Example: adb shell telecom set-system-dialer default

     */

    private static final String COMMAND_SET_SYSTEM_DIALER = "set-system-dialer";

    private static final String COMMAND_GET_SYSTEM_DIALER = "get-system-dialer";

    private static final String COMMAND_WAIT_ON_HANDLERS = "wait-on-handlers";

    private static final String COMMAND_SET_SIM_COUNT = "set-sim-count";
@@ -193,6 +201,9 @@ public final class Telecom extends BaseCommand { 
            case COMMAND_GET_DEFAULT_DIALER:

                runGetDefaultDialer();

                break;

            case COMMAND_SET_SYSTEM_DIALER:

                runSetSystemDialer();

                break;

            case COMMAND_GET_SYSTEM_DIALER:

                runGetSystemDialer();

                break;
@@ -297,6 +308,12 @@ public final class Telecom extends BaseCommand { 
        System.out.println("Success - " + packageName + " set as override default dialer.");

    }



    private void runSetSystemDialer() throws RemoteException {

        final String packageName = nextArg();

        mTelecomService.setSystemDialerPackage(packageName.equals("default") ? null : packageName);

        System.out.println("Success - " + packageName + " set as override system dialer.");

    }



    private void runGetDefaultDialer() throws RemoteException {

        System.out.println(mTelecomService.getDefaultDialerPackage());

    }

packages/Shell/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
    <uses-permission android:name="android.permission.CALL_PHONE" />

    <uses-permission android:name="android.permission.READ_PHONE_STATE" />

    <uses-permission android:name="android.permission.READ_PRECISE_PHONE_STATE" />

    <uses-permission android:name="android.permission.READ_ACTIVE_EMERGENCY_SESSION" />

    <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />

    <uses-permission android:name="android.permission.READ_CONTACTS" />

    <uses-permission android:name="android.permission.WRITE_CONTACTS" />

services/core/java/com/android/server/TelephonyRegistry.java

+67 −0
Original line number Diff line number Diff line
@@ -209,6 +209,10 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 


    private Map<Integer, List<EmergencyNumber>> mEmergencyNumberList;



    private EmergencyNumber[] mOutgoingSmsEmergencyNumber;



    private EmergencyNumber[] mOutgoingCallEmergencyNumber;



    private CallQuality[] mCallQuality;



    private CallAttributes[] mCallAttributes;
@@ -267,6 +271,10 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                PhoneStateListener.LISTEN_PRECISE_CALL_STATE |

                PhoneStateListener.LISTEN_PRECISE_DATA_CONNECTION_STATE;



    static final int READ_ACTIVE_EMERGENCY_SESSION_PERMISSION_MASK =

            PhoneStateListener.LISTEN_OUTGOING_CALL_EMERGENCY_NUMBER

                    | PhoneStateListener.LISTEN_OUTGOING_SMS_EMERGENCY_NUMBER;



    private static final int MSG_USER_SWITCHED = 1;

    private static final int MSG_UPDATE_DEFAULT_SUB = 2;
@@ -407,6 +415,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
        mImsReasonInfo = new ArrayList<>();

        mPhysicalChannelConfigs = new ArrayList<>();

        mEmergencyNumberList = new HashMap<>();

        mOutgoingCallEmergencyNumber = new EmergencyNumber[numPhones];

        mOutgoingSmsEmergencyNumber = new EmergencyNumber[numPhones];

        for (int i = 0; i < numPhones; i++) {

            mCallState[i] =  TelephonyManager.CALL_STATE_IDLE;

            mDataActivity[i] = TelephonyManager.DATA_ACTIVITY_NONE;
@@ -1925,6 +1935,56 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
        }

    }



    @Override

    public void notifyOutgoingEmergencyCall(int phoneId, int subId,

            EmergencyNumber emergencyNumber) {

        if (!checkNotifyPermission("notifyOutgoingEmergencyCall()")) {

            return;

        }

        synchronized (mRecords) {

            if (validatePhoneId(phoneId)) {

                mOutgoingCallEmergencyNumber[phoneId] = emergencyNumber;

                for (Record r : mRecords) {

                    if (r.matchPhoneStateListenerEvent(

                            PhoneStateListener.LISTEN_OUTGOING_CALL_EMERGENCY_NUMBER)

                                    && idMatch(r.subId, subId, phoneId)) {

                        try {

                            r.callback.onOutgoingEmergencyCall(emergencyNumber);

                        } catch (RemoteException ex) {

                            mRemoveList.add(r.binder);

                        }

                    }

                }

            }

            handleRemoveListLocked();

        }

    }



    @Override

    public void notifyOutgoingEmergencySms(int phoneId, int subId,

            EmergencyNumber emergencyNumber) {

        if (!checkNotifyPermission("notifyOutgoingEmergencySms()")) {

            return;

        }

        synchronized (mRecords) {

            if (validatePhoneId(phoneId)) {

                mOutgoingSmsEmergencyNumber[phoneId] = emergencyNumber;

                for (Record r : mRecords) {

                    if (r.matchPhoneStateListenerEvent(

                            PhoneStateListener.LISTEN_OUTGOING_SMS_EMERGENCY_NUMBER)

                                    && idMatch(r.subId, subId, phoneId)) {

                        try {

                            r.callback.onOutgoingEmergencySms(emergencyNumber);

                        } catch (RemoteException ex) {

                            mRemoveList.add(r.binder);

                        }

                    }

                }

            }

            handleRemoveListLocked();

        }

    }



    @Override

    public void notifyCallQualityChanged(CallQuality callQuality, int phoneId, int subId,

            int callNetworkType) {
@@ -1997,6 +2057,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                pw.println("mCallAttributes=" + mCallAttributes[i]);

                pw.println("mCallNetworkType=" + mCallNetworkType[i]);

                pw.println("mPreciseDataConnectionState=" + mPreciseDataConnectionState[i]);

                pw.println("mOutgoingCallEmergencyNumber=" + mOutgoingCallEmergencyNumber[i]);

                pw.println("mOutgoingSmsEmergencyNumber=" + mOutgoingSmsEmergencyNumber[i]);

                pw.decreaseIndent();

            }

            pw.println("mCarrierNetworkChangeState=" + mCarrierNetworkChangeState);
@@ -2266,6 +2328,11 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                    android.Manifest.permission.READ_PRECISE_PHONE_STATE, null);

        }



        if ((events & READ_ACTIVE_EMERGENCY_SESSION_PERMISSION_MASK) != 0) {

            mContext.enforceCallingOrSelfPermission(

                    android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION, null);

        }



        if ((events & PhoneStateListener.LISTEN_OEM_HOOK_RAW_EVENT) != 0) {

            mContext.enforceCallingOrSelfPermission(

                    android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, null);