commit ab1220a7c9f5c84633f13c7f90866bd1320a4016
author Pranav Madapurmath <pmadapurmath@google.com> Tue Mar 05 12:33:01 2024 -0800
committer Pranav Madapurmath <pmadapurmath@google.com> Tue Mar 05 23:02:32 2024 +0000
tree 46a61f6d5f49006550b0c2d2ce491b64038fab31
parent 39d7066db68d6bbe4ad9c77f90376b74b01761a9

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

core/api/system-current.txt

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index 062bdaa..f3468f4 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -15384,7 +15384,7 @@
     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

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 626a2e5..5eb4a80 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -18852,7 +18852,7 @@
      */
     @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 {