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

Commit fb203f23 authored by Shuo Qian's avatar Shuo Qian Committed by android-build-merger
Browse files

Merge "Frame EmergencyNumber notifier in TelephonyRegistry" am: 6987e27a 

am: 90c87976

Change-Id: Ic19775fbd3e9c3aa5bdd8f2c24a2f8899695a46e
parents 7d1cdf15 90c87976

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

+9 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import android.telephony.ServiceState; 
import android.telephony.SignalStrength;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.telephony.emergency.EmergencyNumber;

import android.util.LocalLog;

import android.util.StatsLog;
@@ -1664,6 +1665,14 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
    }





    @Override

    public void notifyEmergencyNumberList(List<EmergencyNumber> emergencyNumberList) {

        // TODO checkPermission, modify Listener constent documentation

        // TODO implement multisim emergency number list update in listener

        // TODO implement PhoneStateListenerTest

    }





    @Override

    public void dump(FileDescriptor fd, PrintWriter writer, String[] args) {

        final IndentingPrintWriter pw = new IndentingPrintWriter(writer, "  ");

telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl

+3 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.telephony.PhoneCapability; 
import android.telephony.PhysicalChannelConfig;

import android.telephony.ServiceState;

import android.telephony.SignalStrength;

import android.telephony.emergency.EmergencyNumber;

import com.android.internal.telephony.IPhoneStateListener;

import com.android.internal.telephony.IOnSubscriptionsChangedListener;
@@ -78,6 +79,7 @@ interface ITelephonyRegistry { 
    void notifyCarrierNetworkChange(in boolean active);

    void notifyUserMobileDataStateChangedForPhoneId(in int phoneId, in int subId, in boolean state);

    void notifyPhoneCapabilityChanged(in PhoneCapability capability);

    void notifyRadioPowerStateChanged(in int state);

    void notifyPreferredDataSubIdChanged(int preferredSubId);

    void notifyRadioPowerStateChanged(in int state);

    void notifyEmergencyNumberList(in List<EmergencyNumber> emergencyNumberList);

}