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

Commit 25be9509 authored by Paul Hu's avatar Paul Hu Committed by Gerrit Code Review
Browse files

Merge "Fix CS external dependencies on CarrierDefaultApp"

parents 6df94880 01e44792

packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java

+1 −2
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ public class CaptivePortalLoginActivity extends Activity { 
    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        mCm = ConnectivityManager.from(this);

        mCm = getSystemService(ConnectivityManager.class);

        mUrl = getUrlForCaptivePortal();

        if (mUrl == null) {

            done(false);
@@ -161,7 +161,6 @@ public class CaptivePortalLoginActivity extends Activity { 
        if (network != null) {

            network = network.getPrivateDnsBypassingCopy();

            mCm.bindProcessToNetwork(network);

            mCm.setProcessDefaultNetworkForHostResolution(network);

        }

        mNetwork = network;

    }

packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/ProvisionObserver.java

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ public class ProvisionObserver extends JobService { 
            case PROVISION_OBSERVER_REEVALUATION_JOB_ID:

                if (isProvisioned(this)) {

                    Log.d(TAG, "device provisioned, force network re-evaluation");

                    final ConnectivityManager connMgr = ConnectivityManager.from(this);

                    final ConnectivityManager connMgr = getSystemService(ConnectivityManager.class);

                    Network[] info = connMgr.getAllNetworks();

                    for (Network nw : info) {

                        final NetworkCapabilities nc = connMgr.getNetworkCapabilities(nw);