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

Commit 6a688ca1 authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge commit '88932754' into nyc-mr1-dev-plus-aosp 

* commit '88932754':
  Captive portals: login activity probes like NetworkMonitor
  Logging improvements in CaptivePortalLoginActivity
  Captive portal systel log improvements
  Fix flaky IpPrefixTest.
  Removing bogus file added by mistake
  frameworks-test: adding missing @SmallTest
  Netd events: record connect() success/errno
  Add missing dependency.
  Show notification for always-on app VPN
parents 7bc2aebd 88932754

]

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
NetworkNotificationManager: logging improvements



TODO: squash me

# Please enter the commit message for your changes. Lines starting

# with '#' will be ignored, and an empty message aborts the commit.

# On branch notification_tagging

# Your branch is ahead of 'goog/master' by 2 commits.

#   (use "git push" to publish your local commits)

#

# Changes to be committed:

#	modified:   services/core/java/com/android/server/connectivity/NetworkNotificationManager.java

#

core/java/android/net/ConnectivityManager.java

+7 −0
Original line number Diff line number Diff line
@@ -229,6 +229,13 @@ public class ConnectivityManager { 
     */

    public static final String EXTRA_CAPTIVE_PORTAL_URL = "android.net.extra.CAPTIVE_PORTAL_URL";



    /**

     * Key for passing a user agent string to the captive portal login activity.

     * {@hide}

     */

    public static final String EXTRA_CAPTIVE_PORTAL_USER_AGENT =

            "android.net.extra.CAPTIVE_PORTAL_USER_AGENT";



    /**

     * Broadcast action to indicate the change of data activity status

     * (idle or active) on a network in a recent period.

core/tests/coretests/src/android/net/IpPrefixTest.java

+26 −9
Original line number Diff line number Diff line
@@ -18,14 +18,14 @@ package android.net; 


import android.net.IpPrefix;

import android.os.Parcel;

import static android.test.MoreAsserts.assertNotEqual;

import android.test.suitebuilder.annotation.SmallTest;



import static org.junit.Assert.assertArrayEquals;

import java.net.InetAddress;

import java.util.Random;

import junit.framework.TestCase;



import static android.test.MoreAsserts.assertNotEqual;

import static org.junit.Assert.assertArrayEquals;

import static org.junit.Assert.assertEquals;



public class IpPrefixTest extends TestCase {
@@ -242,24 +242,41 @@ public class IpPrefixTest extends TestCase { 


    @SmallTest

    public void testHashCode() {

        IpPrefix p;

        int oldCode = -1;

        IpPrefix p = new IpPrefix(new byte[4], 0);

        Random random = new Random();

        for (int i = 0; i < 100; i++) {

            final IpPrefix oldP = p;

            if (random.nextBoolean()) {

                // IPv4.

                byte[] b = new byte[4];

                random.nextBytes(b);

                p = new IpPrefix(b, random.nextInt(33));

                assertNotEqual(oldCode, p.hashCode());

                oldCode = p.hashCode();

            } else {

                // IPv6.

                byte[] b = new byte[16];

                random.nextBytes(b);

                p = new IpPrefix(b, random.nextInt(129));

                assertNotEqual(oldCode, p.hashCode());

                oldCode = p.hashCode();

            }

            if (p.equals(oldP)) {

              assertEquals(p.hashCode(), oldP.hashCode());

            }

            if (p.hashCode() != oldP.hashCode()) {

              assertNotEqual(p, oldP);

            }

        }

    }



    @SmallTest

    public void testHashCodeIsNotConstant() {

        IpPrefix[] prefixes = {

            new IpPrefix("2001:db8:f00::ace:d00d/127"),

            new IpPrefix("192.0.2.0/23"),

            new IpPrefix("::/0"),

            new IpPrefix("0.0.0.0/0"),

        };

        for (int i = 0; i < prefixes.length; i++) {

          for (int j = i + 1; j < prefixes.length; j++) {

            assertNotEqual(prefixes[i].hashCode(), prefixes[j].hashCode());

          }

        }

    }

packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java

+62 −23
Original line number Diff line number Diff line
@@ -55,12 +55,15 @@ import java.lang.reflect.Method; 
import java.util.Random;



public class CaptivePortalLoginActivity extends Activity {

    private static final String TAG = "CaptivePortalLogin";

    private static final String TAG = CaptivePortalLoginActivity.class.getSimpleName();

    private static final boolean DBG = true;



    private static final int SOCKET_TIMEOUT_MS = 10000;



    private enum Result { DISMISSED, UNWANTED, WANTED_AS_IS };



    private URL mURL;

    private URL mUrl;

    private String mUserAgent;

    private Network mNetwork;

    private CaptivePortal mCaptivePortal;

    private NetworkCallback mNetworkCallback;
@@ -72,17 +75,20 @@ public class CaptivePortalLoginActivity extends Activity { 
    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        mCm = ConnectivityManager.from(this);

        String url = getIntent().getStringExtra(ConnectivityManager.EXTRA_CAPTIVE_PORTAL_URL);

        if (url == null) url = mCm.getCaptivePortalServerUrl();

        try {

            mURL = new URL(url);

        } catch (MalformedURLException e) {

            // System misconfigured, bail out in a way that at least provides network access.

            Log.e(TAG, "Invalid captive portal URL, url=" + url);

            done(Result.WANTED_AS_IS);

        }

        mNetwork = getIntent().getParcelableExtra(ConnectivityManager.EXTRA_NETWORK);

        mCaptivePortal = getIntent().getParcelableExtra(ConnectivityManager.EXTRA_CAPTIVE_PORTAL);

        mUserAgent = getIntent().getParcelableExtra(

                ConnectivityManager.EXTRA_CAPTIVE_PORTAL_USER_AGENT);

        mUrl = getUrl();

        if (mUrl == null) {

            // getUrl() failed to parse the url provided in the intent: bail out in a way that

            // at least provides network access.

            done(Result.WANTED_AS_IS);

            return;

        }

        if (DBG) {

            Log.d(TAG, String.format("onCreate for %s", mUrl.toString()));

        }



        // Also initializes proxy system properties.

        mCm.bindProcessToNetwork(mNetwork);
@@ -149,6 +155,9 @@ public class CaptivePortalLoginActivity extends Activity { 
    }



    private void done(Result result) {

        if (DBG) {

            Log.d(TAG, String.format("Result %s for %s", result.name(), mUrl.toString()));

        }

        if (mNetworkCallback != null) {

            mCm.unregisterNetworkCallback(mNetworkCallback);

            mNetworkCallback = null;
@@ -185,22 +194,31 @@ public class CaptivePortalLoginActivity extends Activity { 


    @Override

    public boolean onOptionsItemSelected(MenuItem item) {

        int id = item.getItemId();

        if (id == R.id.action_use_network) {

            done(Result.WANTED_AS_IS);

            return true;

        final Result result;

        final String action;

        final int id = item.getItemId();

        switch (id) {

            case R.id.action_use_network:

                result = Result.WANTED_AS_IS;

                action = "USE_NETWORK";

                break;

            case R.id.action_do_not_use_network:

                result = Result.UNWANTED;

                action = "DO_NOT_USE_NETWORK";

                break;

            default:

                return super.onOptionsItemSelected(item);

        }

        if (id == R.id.action_do_not_use_network) {

            done(Result.UNWANTED);

            return true;

        if (DBG) {

            Log.d(TAG, String.format("onOptionsItemSelect %s for %s", action, mUrl.toString()));

        }

        return super.onOptionsItemSelected(item);

        done(result);

        return true;

    }



    @Override

    public void onDestroy() {

        super.onDestroy();



        if (mNetworkCallback != null) {

            mCm.unregisterNetworkCallback(mNetworkCallback);

            mNetworkCallback = null;
@@ -215,11 +233,29 @@ public class CaptivePortalLoginActivity extends Activity { 
                } catch (InterruptedException e) {

                }

            }

            startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(mURL.toString())));

            final String url = mUrl.toString();

            if (DBG) {

                Log.d(TAG, "starting activity with intent ACTION_VIEW for " + url);

            }

            startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));

        }

    }



    private URL getUrl() {

        String url = getIntent().getStringExtra(ConnectivityManager.EXTRA_CAPTIVE_PORTAL_URL);

        if (url == null) {

            url = mCm.getCaptivePortalServerUrl();

        }

        try {

            return new URL(url);

        } catch (MalformedURLException e) {

            Log.e(TAG, "Invalid captive portal URL " + url);

        }

        return null;

    }



    private void testForCaptivePortal() {

        // TODO: reuse NetworkMonitor facilities for consistent captive portal detection.

        new Thread(new Runnable() {

            public void run() {

                // Give time for captive portal to open.
@@ -230,11 +266,14 @@ public class CaptivePortalLoginActivity extends Activity { 
                HttpURLConnection urlConnection = null;

                int httpResponseCode = 500;

                try {

                    urlConnection = (HttpURLConnection) mURL.openConnection();

                    urlConnection = (HttpURLConnection) mNetwork.openConnection(mUrl);

                    urlConnection.setInstanceFollowRedirects(false);

                    urlConnection.setConnectTimeout(SOCKET_TIMEOUT_MS);

                    urlConnection.setReadTimeout(SOCKET_TIMEOUT_MS);

                    urlConnection.setUseCaches(false);

                    if (mUserAgent != null) {

                       urlConnection.setRequestProperty("User-Agent", mUserAgent);

                    }

                    urlConnection.getInputStream();

                    httpResponseCode = urlConnection.getResponseCode();

                } catch (IOException e) {
@@ -292,7 +331,7 @@ public class CaptivePortalLoginActivity extends Activity { 
                // settings.  Now prompt the WebView read the Network-specific proxy settings.

                setWebViewProxy();

                // Load the real page.

                view.loadUrl(mURL.toString());

                view.loadUrl(mUrl.toString());

                return;

            } else if (mPagesLoaded == 2) {

                // Prevent going back to empty first page.

services/core/java/com/android/server/connectivity/NetdEventListenerService.java

+13 −12
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.net.NetworkRequest; 
import android.net.metrics.DnsEvent;

import android.net.metrics.INetdEventListener;

import android.net.metrics.IpConnectivityLog;

import android.os.RemoteException;

import android.util.Log;



import com.android.internal.annotations.GuardedBy;
@@ -44,7 +45,7 @@ public class NetdEventListenerService extends INetdEventListener.Stub { 
    public static final String SERVICE_NAME = "netd_listener";



    private static final String TAG = NetdEventListenerService.class.getSimpleName();

    private static final boolean DBG = true;

    private static final boolean DBG = false;

    private static final boolean VDBG = false;



    // TODO: read this constant from system property
@@ -86,7 +87,7 @@ public class NetdEventListenerService extends INetdEventListener.Stub { 
            byte[] returnCodes = Arrays.copyOf(mReturnCodes, mEventCount);

            int[] latenciesMs = Arrays.copyOf(mLatenciesMs, mEventCount);

            mMetricsLog.log(new DnsEvent(mNetId, eventTypes, returnCodes, latenciesMs));

            maybeLog(String.format("Logging %d results for netId %d", mEventCount, mNetId));

            maybeLog("Logging %d results for netId %d", mEventCount, mNetId);

            mEventCount = 0;

        }
@@ -136,9 +137,9 @@ public class NetdEventListenerService extends INetdEventListener.Stub { 
    // Called concurrently by multiple binder threads.

    // This method must not block or perform long-running operations.

    public synchronized void onDnsEvent(int netId, int eventType, int returnCode, int latencyMs,

            String hostname, String[] ipAddresses, int ipAddressesCount, int uid) {

        maybeVerboseLog(String.format("onDnsEvent(%d, %d, %d, %d)",

                netId, eventType, returnCode, latencyMs));

            String hostname, String[] ipAddresses, int ipAddressesCount, int uid)

            throws RemoteException {

        maybeVerboseLog("onDnsEvent(%d, %d, %d, %dms)", netId, eventType, returnCode, latencyMs);



        DnsEventBatch batch = mEventBatches.get(netId);

        if (batch == null) {
@@ -151,9 +152,9 @@ public class NetdEventListenerService extends INetdEventListener.Stub { 
    @Override

    // Called concurrently by multiple binder threads.

    // This method must not block or perform long-running operations.

    public synchronized void onConnectEvent(int netId, int latencyMs, String ipAddr, int port,

            int uid) {

        maybeVerboseLog(String.format("onConnectEvent(%d, %d)", netId, latencyMs));

    public synchronized void onConnectEvent(int netId, int error, int latencyMs, String ipAddr, int port,

            int uid) throws RemoteException {

        maybeVerboseLog("onConnectEvent(%d, %d, %dms)", netId, error, latencyMs);

    }



    public synchronized void dump(PrintWriter writer) {
@@ -166,11 +167,11 @@ public class NetdEventListenerService extends INetdEventListener.Stub { 
        pw.decreaseIndent();

    }



    private static void maybeLog(String s) {

        if (DBG) Log.d(TAG, s);

    private static void maybeLog(String s, Object... args) {

        if (DBG) Log.d(TAG, String.format(s, args));

    }



    private static void maybeVerboseLog(String s) {

        if (VDBG) Log.d(TAG, s);

    private static void maybeVerboseLog(String s, Object... args) {

        if (VDBG) Log.d(TAG, String.format(s, args));

    }

}