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

Commit fa1a9162 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Match WIFI_P2P data usage."

parents 7caffbcd 3ca74814

core/java/android/net/NetworkTemplate.java

+7 −3
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.net; 


import static android.net.ConnectivityManager.TYPE_ETHERNET;

import static android.net.ConnectivityManager.TYPE_WIFI;

import static android.net.ConnectivityManager.TYPE_WIFI_P2P;

import static android.net.ConnectivityManager.TYPE_WIMAX;

import static android.net.NetworkIdentity.scrubSubscriberId;

import static android.telephony.TelephonyManager.NETWORK_CLASS_2_G;
@@ -231,11 +232,14 @@ public class NetworkTemplate implements Parcelable { 
     * Check if matches Wi-Fi network template.

     */

    private boolean matchesWifi(NetworkIdentity ident) {

        if (ident.mType == TYPE_WIFI) {

        switch (ident.mType) {

            case TYPE_WIFI:

            case TYPE_WIFI_P2P:

                return true;

        }

            default:

                return false;

        }

    }



    /**

     * Check if matches Ethernet network template.