LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Remove framework-connectivity-annotations library" into sc-dev am: 059ddb4025 am: 4a3eb4e02c

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14731888

Change-Id: I078cfb1f3bf500f90bc73b1f440e9fe9bc7e05d8
This commit is contained in:
Aaron Huang
2021-06-01 08:49:37 +00:00
committed by Automerger Merge Worker
parent f96011db0f 4a3eb4e02c
commit b3d01d2c1d
6 changed files with 22 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
framework/Android.bp
View File

@@ -55,22 +55,6 @@ filegroup {
],
}
java_library {
name: "framework-connectivity-annotations",
sdk_version: "module_current",
srcs: [
"src/android/net/ConnectivityAnnotations.java",
],
libs: [
"framework-annotations-lib",
"framework-connectivity",
],
visibility: [
"//frameworks/base:__subpackages__",
"//packages/modules/Connectivity:__subpackages__",
],
}
java_sdk_library {
name: "framework-connectivity",
sdk_version: "module_current",

51
framework/src/android/net/ConnectivityAnnotations.java
View File

@@ -1,51 +0,0 @@
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.net;
import android.annotation.IntDef;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
/**
* Type annotations for constants used in the connectivity API surface.
*
* The annotations are maintained in a separate class so that it can be built as
* a separate library that other modules can build against, as Typedef should not
* be exposed as SystemApi.
*
* @hide
*/
public final class ConnectivityAnnotations {
private ConnectivityAnnotations() {}
@Retention(RetentionPolicy.SOURCE)
@IntDef(flag = true, value = {
ConnectivityManager.MULTIPATH_PREFERENCE_HANDOVER,
ConnectivityManager.MULTIPATH_PREFERENCE_RELIABILITY,
ConnectivityManager.MULTIPATH_PREFERENCE_PERFORMANCE,
})
public @interface MultipathPreference {}
@Retention(RetentionPolicy.SOURCE)
@IntDef(flag = false, value = {
ConnectivityManager.RESTRICT_BACKGROUND_STATUS_DISABLED,
ConnectivityManager.RESTRICT_BACKGROUND_STATUS_WHITELISTED,
ConnectivityManager.RESTRICT_BACKGROUND_STATUS_ENABLED,
})
public @interface RestrictBackgroundStatus {}
}

22
framework/src/android/net/ConnectivityManager.java
View File

@@ -40,8 +40,6 @@ import android.compat.annotation.UnsupportedAppUsage;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.net.ConnectivityAnnotations.MultipathPreference;
import android.net.ConnectivityAnnotations.RestrictBackgroundStatus;
import android.net.ConnectivityDiagnosticsManager.DataStallReport.DetectionMethod;
import android.net.IpSecManager.UdpEncapsulationSocket;
import android.net.SocketKeepalive.Callback;
@@ -4809,6 +4807,16 @@ public class ConnectivityManager {
MULTIPATH_PREFERENCE_RELIABILITY |
MULTIPATH_PREFERENCE_PERFORMANCE;
/** @hide */
@Retention(RetentionPolicy.SOURCE)
@IntDef(flag = true, value = {
MULTIPATH_PREFERENCE_HANDOVER,
MULTIPATH_PREFERENCE_RELIABILITY,
MULTIPATH_PREFERENCE_PERFORMANCE,
})
public @interface MultipathPreference {
}
/**
* Provides a hint to the calling application on whether it is desirable to use the
* multinetwork APIs (e.g., {@link Network#openConnection}, {@link Network#bindSocket}, etc.)
@@ -5030,6 +5038,16 @@ public class ConnectivityManager {
public static final String ACTION_RESTRICT_BACKGROUND_CHANGED =
"android.net.conn.RESTRICT_BACKGROUND_CHANGED";
/** @hide */
@Retention(RetentionPolicy.SOURCE)
@IntDef(flag = false, value = {
RESTRICT_BACKGROUND_STATUS_DISABLED,
RESTRICT_BACKGROUND_STATUS_WHITELISTED,
RESTRICT_BACKGROUND_STATUS_ENABLED,
})
public @interface RestrictBackgroundStatus {
}
/**
* Determines if the calling application is subject to metered network restrictions while
* running on background.

2
framework/src/android/net/ConnectivitySettingsManager.java
View File

@@ -27,7 +27,7 @@ import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.content.ContentResolver;
import android.content.Context;
import android.net.ConnectivityAnnotations.MultipathPreference;
import android.net.ConnectivityManager.MultipathPreference;
import android.os.Process;
import android.os.UserHandle;
import android.provider.Settings;

1
service/Android.bp
View File

@@ -61,7 +61,6 @@ java_library {
"stable.core.platform.api.stubs",
"android_system_server_stubs_current",
"framework-annotations-lib",
"framework-connectivity-annotations",
"framework-connectivity.impl",
"framework-tethering.stubs.module_lib",
"framework-wifi.stubs.module_lib",

2
service/src/com/android/server/ConnectivityService.java
View File

@@ -105,12 +105,12 @@ import android.database.ContentObserver;
import android.net.CaptivePortal;
import android.net.CaptivePortalData;
import android.net.ConnectionInfo;
import android.net.ConnectivityAnnotations.RestrictBackgroundStatus;
import android.net.ConnectivityDiagnosticsManager.ConnectivityReport;
import android.net.ConnectivityDiagnosticsManager.DataStallReport;
import android.net.ConnectivityManager;
import android.net.ConnectivityManager.BlockedReason;
import android.net.ConnectivityManager.NetworkCallback;
import android.net.ConnectivityManager.RestrictBackgroundStatus;
import android.net.ConnectivityResources;
import android.net.ConnectivitySettingsManager;
import android.net.DataStallReportParcelable;