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

[DU12]Remove NetworkType Annotation

Browse Source 
Bug: 216619447
Test: atest NetworkTemplateTest NetworkStatsCollectionTest
            NetworkStatsSubscriptionsMonitorTest
Change-Id: I58689201a684f581a4b88df058a5e0683da61926
This commit is contained in:
Frank
2022-01-27 22:15:46 +08:00
parent b68a9f0972
commit de9b4def5f
3 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
framework-t/src/android/net/NetworkIdentity.java
View File

@@ -30,7 +30,6 @@ import android.app.usage.NetworkStatsManager;
import android.content.Context;
import android.net.wifi.WifiInfo;
import android.service.NetworkIdentityProto;
import android.telephony.Annotation;
import android.telephony.TelephonyManager;
import android.util.proto.ProtoOutputStream;
@@ -275,8 +274,7 @@ public class NetworkIdentity {
@Deprecated
@NonNull
public static NetworkIdentity buildNetworkIdentity(Context context,
@NonNull NetworkStateSnapshot snapshot,
boolean defaultNetwork, @Annotation.NetworkType int ratType) {
@NonNull NetworkStateSnapshot snapshot, boolean defaultNetwork, int ratType) {
final NetworkIdentity.Builder builder = new NetworkIdentity.Builder()
.setNetworkStateSnapshot(snapshot).setDefaultNetwork(defaultNetwork);
if (snapshot.getLegacyType() == TYPE_MOBILE && ratType != NETWORK_TYPE_ALL) {
@@ -433,7 +431,7 @@ public class NetworkIdentity {
* @return this builder.
*/
@NonNull
public Builder setRatType(@Annotation.NetworkType int ratType) {
public Builder setRatType(int ratType) {
if (!CollectionUtils.contains(TelephonyManager.getAllNetworkTypes(), ratType)
&& ratType != TelephonyManager.NETWORK_TYPE_UNKNOWN
&& ratType != NetworkStatsManager.NETWORK_TYPE_5G_NSA) {

5
framework-t/src/android/net/NetworkTemplate.java
View File

@@ -47,7 +47,6 @@ import android.net.wifi.WifiInfo;
import android.os.Build;
import android.os.Parcel;
import android.os.Parcelable;
import android.telephony.Annotation.NetworkType;
import android.text.TextUtils;
import android.util.ArraySet;
@@ -203,7 +202,7 @@ public final class NetworkTemplate implements Parcelable {
* @hide
*/
public static NetworkTemplate buildTemplateMobileWithRatType(@Nullable String subscriberId,
@NetworkType int ratType, int metered) {
int ratType, int metered) {
if (TextUtils.isEmpty(subscriberId)) {
return new NetworkTemplate(MATCH_MOBILE_WILDCARD, null /* subscriberId */,
null /* matchSubscriberIds */,
@@ -1039,7 +1038,7 @@ public final class NetworkTemplate implements Parcelable {
* @return this builder.
*/
@NonNull
public Builder setRatType(@NetworkType int ratType) {
public Builder setRatType(int ratType) {
// Input will be validated with the match rule when building the template.
mRatType = ratType;
return this;