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

Commit c9ada872 authored by junyulai's avatar junyulai Committed by android-build-merger
Browse files

Merge "[KA06] export keepalive offload permission as system api." 

am: 69435467

Change-Id: I7e73e50ff8bdbeff8b2f01e1d3bb4bbf95fba70f
parents 9fef7be2 69435467

api/system-current.txt

+2 −1
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ package android { 
    field public static final String OBSERVE_APP_USAGE = "android.permission.OBSERVE_APP_USAGE";

    field public static final String OVERRIDE_WIFI_CONFIG = "android.permission.OVERRIDE_WIFI_CONFIG";

    field public static final String PACKAGE_VERIFICATION_AGENT = "android.permission.PACKAGE_VERIFICATION_AGENT";

    field public static final String PACKET_KEEPALIVE_OFFLOAD = "android.permission.PACKET_KEEPALIVE_OFFLOAD";

    field public static final String PEERS_MAC_ADDRESS = "android.permission.PEERS_MAC_ADDRESS";

    field public static final String PERFORM_CDMA_PROVISIONING = "android.permission.PERFORM_CDMA_PROVISIONING";

    field public static final String PERFORM_SIM_ACTIVATION = "android.permission.PERFORM_SIM_ACTIVATION";
@@ -3066,7 +3067,7 @@ 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(anyOf={android.Manifest.permission.TETHER_PRIVILEGED, android.Manifest.permission.WRITE_SETTINGS}) public boolean isTetheringSupported();

































core/res/AndroidManifest.xml



+1
−1




























Original line number
Diff line number
Diff line








@@ -1554,7 +1554,7 @@













    <permission android:name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"















        android:protectionLevel="signature|privileged" />





























    <!-- Allows a system application to access hardware packet offload capabilities.













    <!-- @SystemApi Allows a system application to access hardware packet offload capabilities.















         @hide -->















    <permission android:name="android.permission.PACKET_KEEPALIVE_OFFLOAD"















        android:protectionLevel="signature|privileged" />