diff options
author | Junyu Lai <junyulai@google.com> | 2023-11-07 08:36:33 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-11-07 08:36:33 +0000 |
commit | aacc149392d9e489d52e7cceb6fbdbd2cd5b8e7c (patch) | |
tree | 36457b0aaa3d4ed05c3822f4bc9c7a58fbf79426 /current/sdk_library | |
parent | 3f956b645c8031da4b7bb72ab2fd1d5ebf4fb7e6 (diff) | |
parent | eac14c91ef41dbd75e8fbc3b4520e644c0b3b39d (diff) | |
download | Connectivity-aacc149392d9e489d52e7cceb6fbdbd2cd5b8e7c.tar.gz |
Merge "Drop prebuilt files to android source tree." into main
Diffstat (limited to 'current/sdk_library')
-rw-r--r-- | current/sdk_library/module-lib/framework-connectivity-stubs.jar | bin | 97765 -> 97801 bytes | |||
-rw-r--r-- | current/sdk_library/module-lib/framework-connectivity-t-stubs.jar | bin | 68339 -> 68339 bytes | |||
-rw-r--r-- | current/sdk_library/module-lib/framework-connectivity-t.srcjar | bin | 45952 -> 45956 bytes | |||
-rw-r--r-- | current/sdk_library/module-lib/framework-connectivity.srcjar | bin | 65334 -> 65353 bytes | |||
-rw-r--r-- | current/sdk_library/module-lib/framework-connectivity.txt | 1 | ||||
-rw-r--r-- | current/sdk_library/module-lib/framework-connectivity_annotations.zip | bin | 6732 -> 6758 bytes | |||
-rw-r--r-- | current/sdk_library/public/framework-connectivity-stubs.jar | bin | 53852 -> 53851 bytes | |||
-rw-r--r-- | current/sdk_library/public/framework-connectivity.srcjar | bin | 94566 -> 94575 bytes | |||
-rw-r--r-- | current/sdk_library/system/framework-connectivity-t-stubs.jar | bin | 55005 -> 55005 bytes | |||
-rw-r--r-- | current/sdk_library/system/framework-connectivity-t.srcjar | bin | 37658 -> 37662 bytes | |||
-rw-r--r-- | current/sdk_library/system/framework-connectivity-t.txt | 4 |
11 files changed, 3 insertions, 2 deletions
diff --git a/current/sdk_library/module-lib/framework-connectivity-stubs.jar b/current/sdk_library/module-lib/framework-connectivity-stubs.jar Binary files differindex 50876ce..fa59377 100644 --- a/current/sdk_library/module-lib/framework-connectivity-stubs.jar +++ b/current/sdk_library/module-lib/framework-connectivity-stubs.jar diff --git a/current/sdk_library/module-lib/framework-connectivity-t-stubs.jar b/current/sdk_library/module-lib/framework-connectivity-t-stubs.jar Binary files differindex 7ef04e0..3ddfb53 100644 --- a/current/sdk_library/module-lib/framework-connectivity-t-stubs.jar +++ b/current/sdk_library/module-lib/framework-connectivity-t-stubs.jar diff --git a/current/sdk_library/module-lib/framework-connectivity-t.srcjar b/current/sdk_library/module-lib/framework-connectivity-t.srcjar Binary files differindex 9b2119c..3565691 100644 --- a/current/sdk_library/module-lib/framework-connectivity-t.srcjar +++ b/current/sdk_library/module-lib/framework-connectivity-t.srcjar diff --git a/current/sdk_library/module-lib/framework-connectivity.srcjar b/current/sdk_library/module-lib/framework-connectivity.srcjar Binary files differindex 78f7dc0..72b8400 100644 --- a/current/sdk_library/module-lib/framework-connectivity.srcjar +++ b/current/sdk_library/module-lib/framework-connectivity.srcjar diff --git a/current/sdk_library/module-lib/framework-connectivity.txt b/current/sdk_library/module-lib/framework-connectivity.txt index 782e20a..4d55067 100644 --- a/current/sdk_library/module-lib/framework-connectivity.txt +++ b/current/sdk_library/module-lib/framework-connectivity.txt @@ -14,6 +14,7 @@ package android.net { method @NonNull public static android.util.Range<java.lang.Integer> getIpSecNetIdRange(); method @Nullable @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.NETWORK_SETTINGS}) public android.net.LinkProperties getRedactedLinkPropertiesForPackage(@NonNull android.net.LinkProperties, int, @NonNull String); method @Nullable @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.NETWORK_SETTINGS}) public android.net.NetworkCapabilities getRedactedNetworkCapabilitiesForPackage(@NonNull android.net.NetworkCapabilities, int, @NonNull String); + method @FlaggedApi("com.android.net.flags.support_is_uid_networking_blocked") @RequiresPermission(android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK) public boolean isUidNetworkingBlocked(int, boolean); method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_SETTINGS}) public void registerDefaultNetworkCallbackForUid(int, @NonNull android.net.ConnectivityManager.NetworkCallback, @NonNull android.os.Handler); method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS}) public void registerSystemDefaultNetworkCallback(@NonNull android.net.ConnectivityManager.NetworkCallback, @NonNull android.os.Handler); method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void removeUidFromMeteredNetworkAllowList(int); diff --git a/current/sdk_library/module-lib/framework-connectivity_annotations.zip b/current/sdk_library/module-lib/framework-connectivity_annotations.zip Binary files differindex 911a554..d62c656 100644 --- a/current/sdk_library/module-lib/framework-connectivity_annotations.zip +++ b/current/sdk_library/module-lib/framework-connectivity_annotations.zip diff --git a/current/sdk_library/public/framework-connectivity-stubs.jar b/current/sdk_library/public/framework-connectivity-stubs.jar Binary files differindex d3eab3b..30b9edf 100644 --- a/current/sdk_library/public/framework-connectivity-stubs.jar +++ b/current/sdk_library/public/framework-connectivity-stubs.jar diff --git a/current/sdk_library/public/framework-connectivity.srcjar b/current/sdk_library/public/framework-connectivity.srcjar Binary files differindex 16f86a9..3061380 100644 --- a/current/sdk_library/public/framework-connectivity.srcjar +++ b/current/sdk_library/public/framework-connectivity.srcjar diff --git a/current/sdk_library/system/framework-connectivity-t-stubs.jar b/current/sdk_library/system/framework-connectivity-t-stubs.jar Binary files differindex 018def5..dca3093 100644 --- a/current/sdk_library/system/framework-connectivity-t-stubs.jar +++ b/current/sdk_library/system/framework-connectivity-t-stubs.jar diff --git a/current/sdk_library/system/framework-connectivity-t.srcjar b/current/sdk_library/system/framework-connectivity-t.srcjar Binary files differindex b27062e..250df62 100644 --- a/current/sdk_library/system/framework-connectivity-t.srcjar +++ b/current/sdk_library/system/framework-connectivity-t.srcjar diff --git a/current/sdk_library/system/framework-connectivity-t.txt b/current/sdk_library/system/framework-connectivity-t.txt index 6c98a4f..23510e1 100644 --- a/current/sdk_library/system/framework-connectivity-t.txt +++ b/current/sdk_library/system/framework-connectivity-t.txt @@ -492,12 +492,12 @@ package android.net.thread { field @NonNull public static final android.os.Parcelable.Creator<android.net.thread.PendingOperationalDataset> CREATOR; } - @FlaggedApi("com.android.net.thread.flags.thread_enabled") public class ThreadNetworkController { + @FlaggedApi("com.android.net.thread.flags.thread_enabled") public final class ThreadNetworkController { method public int getThreadVersion(); field public static final int THREAD_VERSION_1_3 = 4; // 0x4 } - @FlaggedApi("com.android.net.thread.flags.thread_enabled") public class ThreadNetworkManager { + @FlaggedApi("com.android.net.thread.flags.thread_enabled") public final class ThreadNetworkManager { method @NonNull public java.util.List<android.net.thread.ThreadNetworkController> getAllThreadNetworkControllers(); } |