commit 16e12abbef5b84b75e3180b3d1ba5244b7e2557d
author Robert Greenwalt <rgreenwalt@google.com> Tue Jul 08 15:31:37 2014 -0700
committer Robert Greenwalt <rgreenwalt@google.com> Tue Jul 08 23:55:18 2014 +0000
tree 459b5e59b852a0005710517a0fc862ae74d3a244
parent 8e5270fdf5639461d67e9a898a85520abac6053d

Add Trust to NetworkCapabilities.

Indicates the user has indicated implicit trust of a network.  This
generally means it's a sim-selected carrier, a plugged in ethernet,
a paired BT device or a wifi they've asked to connect to.  Untrusted
networks are probably limited to unknown wifi AP.

Change-Id: I89490bdaa3c2d63d33f876c72d8b088dc155fa3d

core/java/android/net/NetworkCapabilities.java

diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java
index fe96287..00200d0 100644
--- a/core/java/android/net/NetworkCapabilities.java
+++ b/core/java/android/net/NetworkCapabilities.java
@@ -63,7 +63,8 @@
      * Represents the network's capabilities.  If any are specified they will be satisfied
      * by any Network that matches all of them.
      */
-    private long mNetworkCapabilities = (1 << NET_CAPABILITY_NOT_RESTRICTED);
+    private long mNetworkCapabilities = (1 << NET_CAPABILITY_NOT_RESTRICTED) |
+            (1 << NET_CAPABILITY_TRUSTED);
 
     /**
      * Indicates this is a network that has the ability to reach the
@@ -149,8 +150,17 @@
      */
     public static final int NET_CAPABILITY_NOT_RESTRICTED = 13;
 
+    /**
+     * Indicates that the user has indicated implicit trust of this network.  This
+     * generally means it's a sim-selected carrier, a plugged in ethernet, a paired
+     * BT device or a wifi the user asked to connect to.  Untrusted networks
+     * are probably limited to unknown wifi AP.  Set by default.
+     */
+    public static final int NET_CAPABILITY_TRUSTED        = 14;
+
+
     private static final int MIN_NET_CAPABILITY = NET_CAPABILITY_MMS;
-    private static final int MAX_NET_CAPABILITY = NET_CAPABILITY_NOT_RESTRICTED;
+    private static final int MAX_NET_CAPABILITY = NET_CAPABILITY_TRUSTED;
 
     /**
      * Adds the given capability to this {@code NetworkCapability} instance.
@@ -512,6 +522,7 @@
                 case NET_CAPABILITY_NOT_METERED:    capabilities += "NOT_METERED"; break;
                 case NET_CAPABILITY_INTERNET:       capabilities += "INTERNET"; break;
                 case NET_CAPABILITY_NOT_RESTRICTED: capabilities += "NOT_RESTRICTED"; break;
+                case NET_CAPABILITY_TRUSTED:        capabilities += "TRUSTED"; break;
             }
             if (++i < types.length) capabilities += "&";
         }