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

Commit b9e5eb9a authored by Danny Baumann's avatar Danny Baumann Committed by Gerrit Code Review
Browse files

Merge "Send out a MOBILE_DATA_CHANGED intent." into gingerbread

parents 73ac3027 5f900abf

packages/SystemUI/src/com/android/systemui/statusbar/powerwidget/MobileDataButton.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -9,12 +9,13 @@ import android.content.SharedPreferences; 
import android.net.ConnectivityManager;

import android.net.ConnectivityManager;

import android.provider.Settings;

import android.provider.Settings;





import com.android.internal.telephony.TelephonyIntents;

import com.android.internal.telephony.Phone;

import com.android.internal.telephony.Phone;





public class MobileDataButton extends PowerButton {

public class MobileDataButton extends PowerButton {





    public static final String ACTION_MODIFY_NETWORK_MODE = "com.android.internal.telephony.MODIFY_NETWORK_MODE";

    public static final String ACTION_MODIFY_NETWORK_MODE = "com.android.internal.telephony.MODIFY_NETWORK_MODE";

    public static final String ACTION_MOBILE_DATA_CHANGED = "com.android.internal.telephony.MOBILE_DATA_CHANGED";



    public static final String EXTRA_NETWORK_MODE = "networkMode";

    public static final String EXTRA_NETWORK_MODE = "networkMode";





    public MobileDataButton() { mType = BUTTON_MOBILEDATA; }

    public MobileDataButton() { mType = BUTTON_MOBILEDATA; }
@@ -75,7 +76,7 @@ public class MobileDataButton extends PowerButton { 
    @Override

    @Override

    protected IntentFilter getBroadcastIntentFilter() {

    protected IntentFilter getBroadcastIntentFilter() {

        IntentFilter filter = new IntentFilter();

        IntentFilter filter = new IntentFilter();

        filter.addAction(TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED);

        filter.addAction(ACTION_MOBILE_DATA_CHANGED);

        return filter;

        return filter;

    }

    }

services/java/com/android/server/ConnectivityService.java

+7 −0
Original line number Original line Diff line number Diff line
@@ -74,6 +74,9 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
    private static final String NETWORK_RESTORE_DELAY_PROP_NAME =

    private static final String NETWORK_RESTORE_DELAY_PROP_NAME =

            "android.telephony.apn-restore";

            "android.telephony.apn-restore";





    private static final String ACTION_MOBILE_DATA_CHANGED =

            "com.android.internal.telephony.MOBILE_DATA_CHANGED";

    private static final String EXTRA_ENABLED = "enabled";





    private Tethering mTethering;

    private Tethering mTethering;

    private boolean mTetheringConfigValid = false;

    private boolean mTetheringConfigValid = false;
@@ -1014,6 +1017,10 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
                mNetTrackers[ConnectivityManager.TYPE_WIMAX].teardown();

                mNetTrackers[ConnectivityManager.TYPE_WIMAX].teardown();

            }

            }

        }

        }



        Intent intent = new Intent(ACTION_MOBILE_DATA_CHANGED);

        intent.putExtra(EXTRA_ENABLED, enabled);

        mContext.sendBroadcast(intent);

    }

    }





    private int getNumConnectedNetworks() {

    private int getNumConnectedNetworks() {