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

Commit ab1220a7 authored by Pranav Madapurmath's avatar Pranav Madapurmath
Browse files

Enforce READ_DROPBOX_DATA permission for ecall diagnostics. 

Following privacy review done for the recent mainline changes to resolve
TelephonyManager#persistEmergencyCallDiagnosticData, ensure that
READ_DROPBOX_DATA is explicitly required. Since the new changes have
been gated by a flag, this permission check needs to be conditionally
checked on the same premise.

Bug: 328132903
Test: Manual
Test: atest TelephonyManagerTest
Change-Id: I67e08a9e8279ab44593ed07d0fa44fdebb953899
parent 39d7066d

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -15384,7 +15384,7 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean matchesCurrentSimOperator(@NonNull String, int, @Nullable String);

    method public boolean needsOtaServiceProvisioning();

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

    method @FlaggedApi("com.android.server.telecom.flags.telecom_resolve_hidden_dependencies") @RequiresPermission(android.Manifest.permission.DUMP) public void persistEmergencyCallDiagnosticData(@NonNull String, @NonNull android.telephony.TelephonyManager.EmergencyCallDiagnosticData);

    method @FlaggedApi("com.android.server.telecom.flags.telecom_resolve_hidden_dependencies") @RequiresPermission(android.Manifest.permission.READ_DROPBOX_DATA) public void persistEmergencyCallDiagnosticData(@NonNull String, @NonNull android.telephony.TelephonyManager.EmergencyCallDiagnosticData);

    method @RequiresPermission(android.Manifest.permission.REBOOT) public int prepareForUnattendedReboot();

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

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void registerCarrierPrivilegesCallback(int, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyManager.CarrierPrivilegesCallback);

telephony/java/android/telephony/TelephonyManager.java

+1 −1
Original line number Diff line number Diff line
@@ -18852,7 +18852,7 @@ public class TelephonyManager { 
     */

    @SystemApi

    @FlaggedApi(com.android.server.telecom.flags.Flags.FLAG_TELECOM_RESOLVE_HIDDEN_DEPENDENCIES)

    @RequiresPermission(android.Manifest.permission.DUMP)

    @RequiresPermission(android.Manifest.permission.READ_DROPBOX_DATA)

    public void persistEmergencyCallDiagnosticData(@NonNull String dropboxTag,

            @NonNull EmergencyCallDiagnosticData data) {

        try {