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

Commit 75c49ab3 authored by Shuo Qian's avatar Shuo Qian
Browse files

API Council Feedback - Override EmergencyNumberDB File API 

Use ParcelFileDescriptor; Introduce Reset API

Test: atest TelephonyHostTest#testEmergencyNumberDb
Bug: 147805285
Change-Id: I7a7733c02874c0f17fef8c91b9e543c8e803f504
Merged-In: I7a7733c02874c0f17fef8c91b9e543c8e803f504
parent 585c4df7

api/system-current.txt

+2 −1
Original line number Diff line number Diff line
@@ -11701,6 +11701,7 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void resetAllCarrierActions();

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void resetCarrierKeysForImsiEncryption();

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public void resetIms(int);

    method @RequiresPermission(android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION) public void resetOtaEmergencyNumberDbFilePath();

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean resetRadioConfig();

    method @RequiresPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL) public void resetSettings();

    method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setAllowedCarriers(int, java.util.List<android.service.carrier.CarrierIdentifier>);
@@ -11738,8 +11739,8 @@ package android.telephony { 
    method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int[] supplyPukReportResult(String, String);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean switchSlots(int[]);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void toggleRadioOnOff();

    method @RequiresPermission(android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION) public void updateOtaEmergencyNumberDbFilePath(@NonNull android.os.ParcelFileDescriptor);

    method public void updateServiceLocation();

    method @RequiresPermission(android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION) public void updateTestOtaEmergencyNumberDbFilePath(@NonNull String);

    field @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public static final String ACTION_ANOMALY_REPORTED = "android.telephony.action.ANOMALY_REPORTED";

    field public static final String ACTION_CARRIER_SIGNAL_DEFAULT_NETWORK_AVAILABLE = "com.android.internal.telephony.CARRIER_SIGNAL_DEFAULT_NETWORK_AVAILABLE";

    field public static final String ACTION_CARRIER_SIGNAL_PCO_VALUE = "com.android.internal.telephony.CARRIER_SIGNAL_PCO_VALUE";

api/test-current.txt

+2 −1
Original line number Diff line number Diff line
@@ -3728,11 +3728,12 @@ package android.telephony { 
    method public android.util.Pair<java.lang.Integer,java.lang.Integer> getRadioHalVersion();

    method public boolean modifyDevicePolicyOverrideApn(@NonNull android.content.Context, int, @NonNull android.telephony.data.ApnSetting);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void refreshUiccProfile();

    method @RequiresPermission("android.permission.READ_ACTIVE_EMERGENCY_SESSION") public void resetOtaEmergencyNumberDbFilePath();

    method @Deprecated public void setCarrierTestOverride(String, String, String, String, String, String, String);

    method public void setCarrierTestOverride(String, String, String, String, String, String, String, String, String);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setSystemSelectionChannels(@NonNull java.util.List<android.telephony.RadioAccessSpecifier>, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Boolean>);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setSystemSelectionChannels(@NonNull java.util.List<android.telephony.RadioAccessSpecifier>);

    method @RequiresPermission("android.permission.READ_ACTIVE_EMERGENCY_SESSION") public void updateTestOtaEmergencyNumberDbFilePath(@NonNull String);

    method @RequiresPermission("android.permission.READ_ACTIVE_EMERGENCY_SESSION") public void updateOtaEmergencyNumberDbFilePath(@NonNull android.os.ParcelFileDescriptor);

    field public static final int CARRIER_PRIVILEGE_STATUS_ERROR_LOADING_RULES = -2; // 0xfffffffe

    field public static final int CARRIER_PRIVILEGE_STATUS_HAS_ACCESS = 1; // 0x1

    field public static final int CARRIER_PRIVILEGE_STATUS_NO_ACCESS = 0; // 0x0

telephony/java/android/telephony/TelephonyManager.java

+32 −7
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ import android.os.Build; 
import android.os.Bundle;

import android.os.Handler;

import android.os.IBinder;

import android.os.ParcelFileDescriptor;

import android.os.PersistableBundle;

import android.os.Process;

import android.os.RemoteException;
@@ -11648,11 +11649,9 @@ public class TelephonyManager { 
    }



    /**

     * Override the file path for testing OTA emergency number database in a file partition.

     * Override the file path for OTA emergency number database in a file partition.

     *

     * @param otaFilePath The test OTA emergency number database file path;

     *                    if "RESET", recover the original database file partition.

     *                    Format: <root file folder>@<file path>

     * @param otaParcelFileDescriptor parcelable file descriptor for OTA emergency number database.

     *

     * <p> Requires permission:

     * {@link android.Manifest.permission#READ_ACTIVE_EMERGENCY_SESSION}
@@ -11662,16 +11661,42 @@ public class TelephonyManager { 
    @RequiresPermission(android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION)

    @SystemApi

    @TestApi

    public void updateTestOtaEmergencyNumberDbFilePath(@NonNull String otaFilePath) {

    public void updateOtaEmergencyNumberDbFilePath(

            @NonNull ParcelFileDescriptor otaParcelFileDescriptor) {

        try {

            ITelephony telephony = getITelephony();

            if (telephony != null) {

                telephony.updateTestOtaEmergencyNumberDbFilePath(otaFilePath);

                telephony.updateOtaEmergencyNumberDbFilePath(otaParcelFileDescriptor);

            } else {

                throw new IllegalStateException("telephony service is null.");

            }

        } catch (RemoteException ex) {

            Log.e(TAG, "notifyOtaEmergencyNumberDatabaseInstalled RemoteException", ex);

            Log.e(TAG, "updateOtaEmergencyNumberDbFilePath RemoteException", ex);

            ex.rethrowAsRuntimeException();

        }

    }



    /**

     * Reset the file path to default for OTA emergency number database in a file partition.

     *

     * <p> Requires permission:

     * {@link android.Manifest.permission#READ_ACTIVE_EMERGENCY_SESSION}

     *

     * @hide

     */

    @RequiresPermission(android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION)

    @SystemApi

    @TestApi

    public void resetOtaEmergencyNumberDbFilePath() {

        try {

            ITelephony telephony = getITelephony();

            if (telephony != null) {

                telephony.resetOtaEmergencyNumberDbFilePath();

            } else {

                throw new IllegalStateException("telephony service is null.");

            }

        } catch (RemoteException ex) {

            Log.e(TAG, "resetOtaEmergencyNumberDbFilePath RemoteException", ex);

            ex.rethrowAsRuntimeException();

        }

    }

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

+8 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.content.IntentSender; 
import android.os.Bundle;

import android.os.IBinder;

import android.os.Messenger;

import android.os.ParcelFileDescriptor;

import android.os.ResultReceiver;

import android.os.WorkSource;

import android.net.NetworkStats;
@@ -2121,9 +2122,14 @@ interface ITelephony { 
    void notifyOtaEmergencyNumberDbInstalled();



    /**

     * Override the file partition name for testing OTA emergency number database.

     * Override a customized file partition name for OTA emergency number database.

     */

    void updateTestOtaEmergencyNumberDbFilePath(String otaFilePath);

    void updateOtaEmergencyNumberDbFilePath(in ParcelFileDescriptor otaParcelFileDescriptor);



    /**

     * Reset file partition to default for OTA emergency number database.

     */

    void resetOtaEmergencyNumberDbFilePath();



    /**

     * Enable or disable a logical modem stack associated with the slotIndex.