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

Commit 77400256 authored by Pranav Madapurmath's avatar Pranav Madapurmath Committed by Android (Google) Code Review
Browse files

Merge "Formalize Fi specific TelephonyManager APIs" into main

parents 8d12ae85 1d9d6602

core/api/system-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ package android { 
    field @Deprecated public static final String ACCESS_FM_RADIO = "android.permission.ACCESS_FM_RADIO";

    field public static final String ACCESS_FPS_COUNTER = "android.permission.ACCESS_FPS_COUNTER";

    field public static final String ACCESS_INSTANT_APPS = "android.permission.ACCESS_INSTANT_APPS";

    field @FlaggedApi("com.android.server.telecom.flags.telecom_resolve_hidden_dependencies") public static final String ACCESS_LAST_KNOWN_CELL_ID = "android.permission.ACCESS_LAST_KNOWN_CELL_ID";

    field public static final String ACCESS_LOCUS_ID_USAGE_STATS = "android.permission.ACCESS_LOCUS_ID_USAGE_STATS";

    field public static final String ACCESS_MOCK_LOCATION = "android.permission.ACCESS_MOCK_LOCATION";

    field public static final String ACCESS_MTP = "android.permission.ACCESS_MTP";
@@ -14698,6 +14699,7 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getEmergencyNumberDbVersion();

    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getIsimDomain();

    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getIsimIst();

    method @FlaggedApi("com.android.server.telecom.flags.telecom_resolve_hidden_dependencies") @Nullable @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, "com.android.phone.permission.ACCESS_LAST_KNOWN_CELL_ID"}) public android.telephony.CellIdentity getLastKnownCellIdentity();

    method @Deprecated @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.Map<java.lang.Integer,java.lang.Integer> getLogicalToPhysicalSlotMapping();

    method public int getMaxNumberOfSimultaneouslyActiveSims();

    method public static long getMaxNumberVerificationTimeoutMillis();
@@ -14801,6 +14803,7 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setSystemSelectionChannels(@NonNull java.util.List<android.telephony.RadioAccessSpecifier>);

    method @Deprecated public void setVisualVoicemailEnabled(android.telecom.PhoneAccountHandle, boolean);

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

    method @FlaggedApi("com.android.server.telecom.flags.telecom_resolve_hidden_dependencies") @RequiresPermission(android.Manifest.permission.BIND_TELECOM_CONNECTION_SERVICE) public void setVoiceServiceStateOverride(boolean);

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

    method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public android.telephony.PinResult supplyIccLockPin(@NonNull String);

    method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public android.telephony.PinResult supplyIccLockPuk(@NonNull String, @NonNull String);

core/api/test-current.txt

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

    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.BIND_TELECOM_CONNECTION_SERVICE) public void setVoiceServiceStateOverride(boolean);

    method @FlaggedApi("com.android.server.telecom.flags.telecom_resolve_hidden_dependencies") @RequiresPermission(android.Manifest.permission.BIND_TELECOM_CONNECTION_SERVICE) public void setVoiceServiceStateOverride(boolean);

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

    field public static final int HAL_SERVICE_IMS = 7; // 0x7

    field public static final int HAL_SERVICE_MESSAGING = 2; // 0x2

core/res/AndroidManifest.xml

+11 −0
Original line number Diff line number Diff line
@@ -3042,6 +3042,17 @@ 
    <permission android:name="android.permission.ACCESS_RCS_USER_CAPABILITY_EXCHANGE"

        android:protectionLevel="internal|role" />



    <!-- Used to provide the Telecom framework with access to the last known call ID.

         <p>Protection level: signature

         @SystemApi

         @FlaggedApi("com.android.server.telecom.flags.telecom_resolve_hidden_dependencies")

         @hide

    -->

    <permission android:name="android.permission.ACCESS_LAST_KNOWN_CELL_ID"

        android:protectionLevel="signature"

        android:label="@string/permlab_accessLastKnownCellId"

        android:description="@string/permdesc_accessLastKnownCellId"/>



    <!-- ================================== -->

    <!-- Permissions for sdcard interaction -->

    <!-- ================================== -->

core/res/res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -1075,6 +1075,12 @@ 
    <string name="permdesc_manageOngoingCalls">Allows an app to see details about ongoing calls

         on your device and to control these calls.</string>



    <!-- Title for an application permission, listed so that the user can access the last known cell id provided by telephony. -->

    <string name="permlab_accessLastKnownCellId">Access last known cell identity.</string>

    <!-- Description on an application permission, listed so that the user can access the last known cell id provided by telephony -->

    <string name="permdesc_accessLastKnownCellId">Allows an app to access to the last known

        cell identity provided by telephony.</string>



    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permlab_readCellBroadcasts">read cell broadcast messages</string>

    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

data/etc/privapp-permissions-platform.xml

+1 −0
Original line number Diff line number Diff line
@@ -512,6 +512,7 @@ applications that come with the platform 
        <permission name="android.permission.READ_SAFETY_CENTER_STATUS" />

        <!-- Permission required for CTS test - CtsTelephonyTestCases -->

        <permission name="android.permission.BIND_TELECOM_CONNECTION_SERVICE" />

        <permission name="android.permission.ACCESS_LAST_KNOWN_CELL_ID" />

        <!-- Permission required for CTS test - CtsAppTestCases -->

        <permission name="android.permission.CAPTURE_MEDIA_OUTPUT" />

        <permission name="android.permission.CAPTURE_TUNER_AUDIO_INPUT" />