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

Commit 7547533c authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Renamed DataStallMonitor to DataStallRecoveryManager am: a68a4914

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2004934

Change-Id: If0d0a1a1c93b8be2645c50f090813a561dc95b43
parents f359a609 a68a4914
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ public class DataNetworkController extends Handler {
    private final @NonNull DataConfigManager mDataConfigManager;
    private final @NonNull DataSettingsManager mDataSettingsManager;
    private final @NonNull DataProfileManager mDataProfileManager;
    private final @NonNull DataStallMonitor mDataStallMonitor;
    private final @NonNull DataStallRecoveryManager mDataStallRecoveryManager;
    private final @NonNull DataTaskManager mDataTaskManager;
    private final @NonNull SparseArray<DataServiceManager> mDataServiceManagers =
            new SparseArray<>();
@@ -219,7 +219,7 @@ public class DataNetworkController extends Handler {
        mDataConfigManager = new DataConfigManager(mPhone, looper);
        mDataSettingsManager = new DataSettingsManager(mPhone, looper);
        mDataProfileManager = new DataProfileManager(mPhone, looper);
        mDataStallMonitor = new DataStallMonitor(mPhone, this, mDataServiceManagers
        mDataStallRecoveryManager = new DataStallRecoveryManager(mPhone, this, mDataServiceManagers
                .get(AccessNetworkConstants.TRANSPORT_TYPE_WWAN), looper);
        mDataTaskManager = new DataTaskManager(mPhone, looper);

@@ -231,7 +231,7 @@ public class DataNetworkController extends Handler {
     */
    private void registerAllEvents() {
        mDataConfigManager.registerForConfigUpdate(this, EVENT_DATA_CONFIG_UPDATED);
        mDataStallMonitor.registerForDataStallReestablishEvent(this,
        mDataStallRecoveryManager.registerForDataStallReestablishEvent(this,
                EVENT_DATA_STALL_ACTION_REESTABLISH);
    }

@@ -511,7 +511,7 @@ public class DataNetworkController extends Handler {
        pw.println("-------------------------------------");
        mDataSettingsManager.dump(fd, pw, args);
        pw.println("-------------------------------------");
        mDataStallMonitor.dump(fd, pw, args);
        mDataStallRecoveryManager.dump(fd, pw, args);
        pw.println("-------------------------------------");
        mDataConfigManager.dump(fd, pw, args);

+7 −7
Original line number Diff line number Diff line
@@ -32,17 +32,16 @@ import java.io.FileDescriptor;
import java.io.PrintWriter;

/**
 * DataStallMonitor monitors the data network activities, detects potential data stall, and takes
 * actions to recover
 * DataStallRecoveryManager monitors the network validation result from connectivity service and
 * takes actions to recovery data network.
 */
public class DataStallMonitor extends Handler {
public class DataStallRecoveryManager extends Handler {
    /** Event for data config updated. */
    private static final int EVENT_DATA_CONFIG_UPDATED = 1;

    /** Event for internet validation status changed. */
    private static final int EVENT_INTERNET_VALIDATION_STATUS_CHANGED = 2;


    private final @NonNull Phone mPhone;
    private final @NonNull String mLogTag;
    private final @NonNull LocalLog mLocalLog = new LocalLog(128);
@@ -67,7 +66,7 @@ public class DataStallMonitor extends Handler {
     * @param looper The looper to be used by the handler. Currently the handler thread is the
     * phone process's main thread.
     */
    public DataStallMonitor(@NonNull Phone phone,
    public DataStallRecoveryManager(@NonNull Phone phone,
            @NonNull DataNetworkController dataNetworkController,
            @NonNull DataServiceManager dataServiceManager, @NonNull Looper looper) {
        super(looper);
@@ -154,7 +153,7 @@ public class DataStallMonitor extends Handler {
    }

    /**
     * Dump the state of DataStallMonitor
     * Dump the state of DataStallRecoveryManager
     *
     * @param fd File descriptor
     * @param printWriter Print writer
@@ -162,7 +161,8 @@ public class DataStallMonitor extends Handler {
     */
    public void dump(FileDescriptor fd, PrintWriter printWriter, String[] args) {
        IndentingPrintWriter pw = new IndentingPrintWriter(printWriter, "  ");
        pw.println(DataStallMonitor.class.getSimpleName() + "-" + mPhone.getPhoneId() + ":");
        pw.println(DataStallRecoveryManager.class.getSimpleName() + "-" + mPhone.getPhoneId()
                + ":");
        pw.increaseIndent();
        pw.println("Local logs:");
        pw.increaseIndent();