Merge "Add get last entitlement value callback API"

diff --cc api/system-current.txt
index 64a0881,8b00789..e17459b
--- 1/api/system-current.txt
--- 2/api/system-current.txt
+++ b/api/system-current.txt
@@@ -3067,9 -3064,10 +3067,10 @@@ package android.net 
    }
  
    public class ConnectivityManager {
 -    method @RequiresPermission("android.permission.PACKET_KEEPALIVE_OFFLOAD") public android.net.SocketKeepalive createNattKeepalive(@NonNull android.net.Network, @NonNull java.io.FileDescriptor, @NonNull java.net.InetAddress, @NonNull java.net.InetAddress, @NonNull java.util.concurrent.Executor, @NonNull android.net.SocketKeepalive.Callback);
 +    method @RequiresPermission(android.Manifest.permission.PACKET_KEEPALIVE_OFFLOAD) public android.net.SocketKeepalive createNattKeepalive(@NonNull android.net.Network, @NonNull java.io.FileDescriptor, @NonNull java.net.InetAddress, @NonNull java.net.InetAddress, @NonNull java.util.concurrent.Executor, @NonNull android.net.SocketKeepalive.Callback);
      method public boolean getAvoidBadWifi();
      method @RequiresPermission(android.Manifest.permission.LOCAL_MAC_ADDRESS) public String getCaptivePortalServerUrl();
+     method @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public void getLatestTetheringEntitlementValue(int, boolean, @NonNull android.net.ConnectivityManager.TetheringEntitlementValueListener, @Nullable android.os.Handler);
      method @RequiresPermission(anyOf={android.Manifest.permission.TETHER_PRIVILEGED, android.Manifest.permission.WRITE_SETTINGS}) public boolean isTetheringSupported();
      method @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", android.Manifest.permission.NETWORK_SETUP_WIZARD, "android.permission.NETWORK_STACK"}) public void setAirplaneMode(boolean);
      method @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public void startTethering(int, boolean, android.net.ConnectivityManager.OnStartTetheringCallback);
@@@ -3088,9 -3089,13 +3092,14 @@@
      method public void onTetheringStarted();
    }
  
+   public abstract static class ConnectivityManager.TetheringEntitlementValueListener {
+     ctor public ConnectivityManager.TetheringEntitlementValueListener();
+     method public void onEntitlementResult(int);
+   }
+ 
    public final class IpPrefix implements android.os.Parcelable {
      ctor public IpPrefix(java.net.InetAddress, int);
 +    ctor public IpPrefix(String);
    }
  
    public class LinkAddress implements android.os.Parcelable {

diff --cc core/java/android/net/ConnectivityManager.java
Simple merge

diff --cc core/java/android/net/IConnectivityManager.aidl
Simple merge

diff --cc services/core/java/com/android/server/ConnectivityService.java
Simple merge