diff options
| author | 2019-01-30 21:57:32 -0800 | |
|---|---|---|
| committer | 2019-01-30 21:57:32 -0800 | |
| commit | bf830534cadb13f5086f19cb37020406a196828f (patch) | |
| tree | 3e9c28786e8d5acc2b34551664ec12b0561f8e8e | |
| parent | bdd22d05a99e14ab3d66663d49233c55850215e7 (diff) | |
| parent | 676a9dcd6a1d2d9cb14c64b57ab5565aa334eb01 (diff) | |
Merge "[KA06] export keepalive offload permission as system api." am: 6943546771 am: c9ada8727f
am: 676a9dcd6a
Change-Id: Ib76b14656e1bef9a1ea2bec7a848803fbc6fa2bb
| -rw-r--r-- | api/system-current.txt | 3 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 75f54f9b2301..34a9d9f8be66 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -122,6 +122,7 @@ package android { field public static final String OBSERVE_ROLE_HOLDERS = "android.permission.OBSERVE_ROLE_HOLDERS"; 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"; @@ -4087,7 +4088,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(); diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 7a261a968e36..67a7852741b3 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1730,7 +1730,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" /> |