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

Commit 54ef98b2 authored by Willy Hu's avatar Willy Hu Committed by Automerger Merge Worker
Browse files

Add New Event for Data Stall Recovery Action Reestablish am: 79e33a42 am: f359a609 

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

Change-Id: I5d6d91e7a0d2de8f9459401e02ad61f95b9ee984
parents a16d81b4 f359a609

src/java/com/android/internal/telephony/data/DataNetworkController.java

+13 −1
Original line number Diff line number Diff line
@@ -97,7 +97,8 @@ public class DataNetworkController extends Handler { 
    /** Event for setup a data network. */

    private static final int EVENT_SETUP_DATA_NETWORK = 5;





    /** Event for data stall action reestablish. */

    private static final int EVENT_DATA_STALL_ACTION_REESTABLISH = 6;



    private final Phone mPhone;

    private final String mLogTag;
@@ -230,6 +231,8 @@ public class DataNetworkController extends Handler { 
     */

    private void registerAllEvents() {

        mDataConfigManager.registerForConfigUpdate(this, EVENT_DATA_CONFIG_UPDATED);

        mDataStallMonitor.registerForDataStallReestablishEvent(this,

                EVENT_DATA_STALL_ACTION_REESTABLISH);

    }



    @Override
@@ -250,6 +253,9 @@ public class DataNetworkController extends Handler { 
            case EVENT_SETUP_DATA_NETWORK:

                onSetupDataNetwork((DataProfile) msg.obj);

                break;

            case EVENT_DATA_STALL_ACTION_REESTABLISH:

                onDataStallActionReestablish();

                break;

            default:

                loge("Unexpected event " + msg.what);

        }
@@ -383,6 +389,12 @@ public class DataNetworkController extends Handler { 
        }

    }



    /**

     * Handle data stall action reestablish event.

     */

    private void onDataStallActionReestablish() {

    }



    /**

     * @return Data config manager instance.

     */

src/java/com/android/internal/telephony/data/DataStallMonitor.java

+21 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.os.AsyncResult; 
import android.os.Handler;

import android.os.Looper;

import android.os.Message;

import android.os.RegistrantList;

import android.util.IndentingPrintWriter;

import android.util.LocalLog;
@@ -55,6 +56,9 @@ public class DataStallMonitor extends Handler { 
    /** Cellular data service */

    private final @NonNull DataServiceManager mWwanDataServiceManager;



    /** The RegistrantList for recovery action reestablish */

    private final RegistrantList mDataStallReestablishRegistrants = new RegistrantList();



    /**

     * Constructor

     *
@@ -73,6 +77,13 @@ public class DataStallMonitor extends Handler { 
        mWwanDataServiceManager = dataServiceManager;

        mDataConfigManager = mDataNetworkController.getDataConfigManager();



        registerAllEvents();

    }



    /**

     * Register for all events that data stall monitor is interested.

     */

    private void registerAllEvents() {

        mDataConfigManager.registerForConfigUpdate(this, EVENT_DATA_CONFIG_UPDATED);

        mDataNetworkController.registerForInternetValidationStatusChanged(this,

                EVENT_INTERNET_VALIDATION_STATUS_CHANGED);
@@ -107,6 +118,16 @@ public class DataStallMonitor extends Handler { 


    }



    /**

     * Register for data stall reestablish event.

     *

     * @param handler The handler to handle the event.

     * @param what The event.

     */

    public void registerForDataStallReestablishEvent(@NonNull Handler handler, int what) {

        mDataStallReestablishRegistrants.addUnique(handler, what, null);

    }



    /**

     * Log debug messages.

     * @param s debug messages