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 584a3b9c32
commit a522e3ddd1
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.content.Context;
import android.net.wifi.WifiInfo; import android.net.wifi.WifiInfo;
import android.service.NetworkIdentityProto; import android.service.NetworkIdentityProto;
import android.telephony.Annotation;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.util.proto.ProtoOutputStream; import android.util.proto.ProtoOutputStream;
@@ -275,8 +274,7 @@ public class NetworkIdentity {
@Deprecated @Deprecated
@NonNull @NonNull
public static NetworkIdentity buildNetworkIdentity(Context context, public static NetworkIdentity buildNetworkIdentity(Context context,
@NonNull NetworkStateSnapshot snapshot, @NonNull NetworkStateSnapshot snapshot, boolean defaultNetwork, int ratType) {
boolean defaultNetwork, @Annotation.NetworkType int ratType) {
final NetworkIdentity.Builder builder = new NetworkIdentity.Builder() final NetworkIdentity.Builder builder = new NetworkIdentity.Builder()
.setNetworkStateSnapshot(snapshot).setDefaultNetwork(defaultNetwork); .setNetworkStateSnapshot(snapshot).setDefaultNetwork(defaultNetwork);
if (snapshot.getLegacyType() == TYPE_MOBILE && ratType != NETWORK_TYPE_ALL) { if (snapshot.getLegacyType() == TYPE_MOBILE && ratType != NETWORK_TYPE_ALL) {
@@ -433,7 +431,7 @@ public class NetworkIdentity {
* @return this builder. * @return this builder.
*/ */
@NonNull @NonNull
public Builder setRatType(@Annotation.NetworkType int ratType) { public Builder setRatType(int ratType) {
if (!CollectionUtils.contains(TelephonyManager.getAllNetworkTypes(), ratType) if (!CollectionUtils.contains(TelephonyManager.getAllNetworkTypes(), ratType)
&& ratType != TelephonyManager.NETWORK_TYPE_UNKNOWN && ratType != TelephonyManager.NETWORK_TYPE_UNKNOWN
&& ratType != NetworkStatsManager.NETWORK_TYPE_5G_NSA) { && 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.Build;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.telephony.Annotation.NetworkType;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.ArraySet; import android.util.ArraySet;
@@ -203,7 +202,7 @@ public final class NetworkTemplate implements Parcelable {
* @hide * @hide
*/ */
public static NetworkTemplate buildTemplateMobileWithRatType(@Nullable String subscriberId, public static NetworkTemplate buildTemplateMobileWithRatType(@Nullable String subscriberId,
@NetworkType int ratType, int metered) { int ratType, int metered) {
if (TextUtils.isEmpty(subscriberId)) { if (TextUtils.isEmpty(subscriberId)) {
return new NetworkTemplate(MATCH_MOBILE_WILDCARD, null /* subscriberId */, return new NetworkTemplate(MATCH_MOBILE_WILDCARD, null /* subscriberId */,
null /* matchSubscriberIds */, null /* matchSubscriberIds */,
@@ -1039,7 +1038,7 @@ public final class NetworkTemplate implements Parcelable {
* @return this builder. * @return this builder.
*/ */
@NonNull @NonNull
public Builder setRatType(@NetworkType int ratType) { public Builder setRatType(int ratType) {
// Input will be validated with the match rule when building the template. // Input will be validated with the match rule when building the template.
mRatType = ratType; mRatType = ratType;
return this; return this;

4
service-t/src/com/android/server/net/NetworkStatsSubscriptionsMonitor.java
View File

@@ -24,7 +24,6 @@ import static android.telephony.TelephonyManager.NETWORK_TYPE_LTE;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.content.Context; import android.content.Context;
import android.telephony.Annotation;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.TelephonyCallback; import android.telephony.TelephonyCallback;
import android.telephony.TelephonyDisplayInfo; import android.telephony.TelephonyDisplayInfo;
@@ -59,8 +58,7 @@ public class NetworkStatsSubscriptionsMonitor extends
* @param collapsedRatType collapsed RAT type. * @param collapsedRatType collapsed RAT type.
* @see android.app.usage.NetworkStatsManager#getCollapsedRatType(int). * @see android.app.usage.NetworkStatsManager#getCollapsedRatType(int).
*/ */
void onCollapsedRatTypeChanged(@NonNull String subscriberId, void onCollapsedRatTypeChanged(@NonNull String subscriberId, int collapsedRatType);
@Annotation.NetworkType int collapsedRatType);
} }
private final Delegate mDelegate; private final Delegate mDelegate;