Merge "Rename EmergencyCallDiagnosticParam API" into main
diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index fe97349..50764b2 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -14844,7 +14844,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.EmergencyCallDiagnosticParams);
+ 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 @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);
@@ -15023,19 +15023,19 @@
method public default void onCarrierServiceChanged(@Nullable String, int);
}
- @FlaggedApi("com.android.server.telecom.flags.telecom_resolve_hidden_dependencies") public static final class TelephonyManager.EmergencyCallDiagnosticParams {
+ @FlaggedApi("com.android.server.telecom.flags.telecom_resolve_hidden_dependencies") public static final class TelephonyManager.EmergencyCallDiagnosticData {
method public long getLogcatCollectionStartTimeMillis();
method public boolean isLogcatCollectionEnabled();
- method public boolean isTelecomDumpSysCollectionEnabled();
- method public boolean isTelephonyDumpSysCollectionEnabled();
+ method public boolean isTelecomDumpsysCollectionEnabled();
+ method public boolean isTelephonyDumpsysCollectionEnabled();
}
- public static final class TelephonyManager.EmergencyCallDiagnosticParams.Builder {
- ctor public TelephonyManager.EmergencyCallDiagnosticParams.Builder();
- method @NonNull public android.telephony.TelephonyManager.EmergencyCallDiagnosticParams build();
- method @NonNull public android.telephony.TelephonyManager.EmergencyCallDiagnosticParams.Builder setLogcatCollectionStartTimeMillis(long);
- method @NonNull public android.telephony.TelephonyManager.EmergencyCallDiagnosticParams.Builder setTelecomDumpSysCollectionEnabled(boolean);
- method @NonNull public android.telephony.TelephonyManager.EmergencyCallDiagnosticParams.Builder setTelephonyDumpSysCollectionEnabled(boolean);
+ public static final class TelephonyManager.EmergencyCallDiagnosticData.Builder {
+ ctor public TelephonyManager.EmergencyCallDiagnosticData.Builder();
+ method @NonNull public android.telephony.TelephonyManager.EmergencyCallDiagnosticData build();
+ method @NonNull public android.telephony.TelephonyManager.EmergencyCallDiagnosticData.Builder setLogcatCollectionStartTimeMillis(long);
+ method @NonNull public android.telephony.TelephonyManager.EmergencyCallDiagnosticData.Builder setTelecomDumpsysCollectionEnabled(boolean);
+ method @NonNull public android.telephony.TelephonyManager.EmergencyCallDiagnosticData.Builder setTelephonyDumpsysCollectionEnabled(boolean);
}
public static class TelephonyManager.ModemActivityInfoException extends java.lang.Exception {
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 89661a4..f82463b 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -18709,9 +18709,9 @@
*/
@SystemApi
@FlaggedApi(com.android.server.telecom.flags.Flags.FLAG_TELECOM_RESOLVE_HIDDEN_DEPENDENCIES)
- public static final class EmergencyCallDiagnosticParams {
+ public static final class EmergencyCallDiagnosticData {
public static final class Builder {
- private boolean mCollectTelecomDumpSys;
+ private boolean mCollectTelecomDumpsys;
private boolean mCollectTelephonyDumpsys;
// If this is set to a value other than -1L, then the logcat collection is enabled.
@@ -18724,9 +18724,9 @@
* @param collectTelecomDumpsys Determines whether telecom dumpsys should be collected.
* @return Builder instance corresponding to the configured call diagnostic params.
*/
- public @NonNull Builder setTelecomDumpSysCollectionEnabled(
+ public @NonNull Builder setTelecomDumpsysCollectionEnabled(
boolean collectTelecomDumpsys) {
- mCollectTelecomDumpSys = collectTelecomDumpsys;
+ mCollectTelecomDumpsys = collectTelecomDumpsys;
return this;
}
@@ -18735,7 +18735,7 @@
* @param collectTelephonyDumpsys Determines if telephony dumpsys should be collected.
* @return Builder instance corresponding to the configured call diagnostic params.
*/
- public @NonNull Builder setTelephonyDumpSysCollectionEnabled(
+ public @NonNull Builder setTelephonyDumpsysCollectionEnabled(
boolean collectTelephonyDumpsys) {
mCollectTelephonyDumpsys = collectTelephonyDumpsys;
return this;
@@ -18753,35 +18753,35 @@
}
/**
- * Build the EmergencyCallDiagnosticParams from the provided Builder config.
- * @return {@link EmergencyCallDiagnosticParams} instance from provided builder.
+ * Build the EmergencyCallDiagnosticData from the provided Builder config.
+ * @return {@link EmergencyCallDiagnosticData} instance from provided builder.
*/
- public @NonNull EmergencyCallDiagnosticParams build() {
- return new EmergencyCallDiagnosticParams(mCollectTelecomDumpSys,
+ public @NonNull EmergencyCallDiagnosticData build() {
+ return new EmergencyCallDiagnosticData(mCollectTelecomDumpsys,
mCollectTelephonyDumpsys, mLogcatStartTimeMillis);
}
}
- private boolean mCollectTelecomDumpSys;
+ private boolean mCollectTelecomDumpsys;
private boolean mCollectTelephonyDumpsys;
private boolean mCollectLogcat;
private long mLogcatStartTimeMillis;
private static long sUnsetLogcatStartTime = -1L;
- private EmergencyCallDiagnosticParams(boolean collectTelecomDumpSys,
+ private EmergencyCallDiagnosticData(boolean collectTelecomDumpsys,
boolean collectTelephonyDumpsys, long logcatStartTimeMillis) {
- mCollectTelecomDumpSys = collectTelecomDumpSys;
+ mCollectTelecomDumpsys = collectTelecomDumpsys;
mCollectTelephonyDumpsys = collectTelephonyDumpsys;
mLogcatStartTimeMillis = logcatStartTimeMillis;
mCollectLogcat = logcatStartTimeMillis != sUnsetLogcatStartTime;
}
- public boolean isTelecomDumpSysCollectionEnabled() {
- return mCollectTelecomDumpSys;
+ public boolean isTelecomDumpsysCollectionEnabled() {
+ return mCollectTelecomDumpsys;
}
- public boolean isTelephonyDumpSysCollectionEnabled() {
+ public boolean isTelephonyDumpsysCollectionEnabled() {
return mCollectTelephonyDumpsys;
}
@@ -18796,12 +18796,12 @@
@Override
public String toString() {
- return "EmergencyCallDiagnosticParams{" +
- "mCollectTelecomDumpSys=" + mCollectTelecomDumpSys +
- ", mCollectTelephonyDumpsys=" + mCollectTelephonyDumpsys +
- ", mCollectLogcat=" + mCollectLogcat +
- ", mLogcatStartTimeMillis=" + mLogcatStartTimeMillis +
- '}';
+ return "EmergencyCallDiagnosticData{"
+ + "mCollectTelecomDumpsys=" + mCollectTelecomDumpsys
+ + ", mCollectTelephonyDumpsys=" + mCollectTelephonyDumpsys
+ + ", mCollectLogcat=" + mCollectLogcat
+ + ", mLogcatStartTimeMillis=" + mLogcatStartTimeMillis
+ + '}';
}
}
@@ -18809,7 +18809,7 @@
* Request telephony to persist state for debugging emergency call failures.
*
* @param dropboxTag Tag to use when persisting data to dropbox service.
- * @param params Parameters controlling what is collected.
+ * @param data Parameters controlling what is collected in the diagnostics.
*
* @hide
*/
@@ -18817,7 +18817,7 @@
@FlaggedApi(com.android.server.telecom.flags.Flags.FLAG_TELECOM_RESOLVE_HIDDEN_DEPENDENCIES)
@RequiresPermission(android.Manifest.permission.DUMP)
public void persistEmergencyCallDiagnosticData(@NonNull String dropboxTag,
- @NonNull EmergencyCallDiagnosticParams params) {
+ @NonNull EmergencyCallDiagnosticData data) {
try {
ITelephony telephony = ITelephony.Stub.asInterface(
TelephonyFrameworkInitializer
@@ -18826,10 +18826,10 @@
.get());
if (telephony != null) {
telephony.persistEmergencyCallDiagnosticData(dropboxTag,
- params.isLogcatCollectionEnabled(),
- params.getLogcatCollectionStartTimeMillis(),
- params.isTelecomDumpSysCollectionEnabled(),
- params.isTelephonyDumpSysCollectionEnabled());
+ data.isLogcatCollectionEnabled(),
+ data.getLogcatCollectionStartTimeMillis(),
+ data.isTelecomDumpsysCollectionEnabled(),
+ data.isTelephonyDumpsysCollectionEnabled());
}
} catch (RemoteException e) {
Log.e(TAG, "Error while persistEmergencyCallDiagnosticData: " + e);