Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca98456b authored by Junyu Lai's avatar Junyu Lai Committed by Automerger Merge Worker
Browse files

Merge "[DU12]Remove NetworkType Annotation" am: 7da58cca am: afbb5462 am:... 

Merge "[DU12]Remove NetworkType Annotation" am: 7da58cca am: afbb5462 am: 2bbc4b43 am: a2ced225

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1963221

Change-Id: I25de40b8818edfdfc1b55b4b6fcb9ecf0de37d00
parents 42e1d4b4 a2ced225

packages/ConnectivityT/framework-t/src/android/net/NetworkIdentity.java

+2 −4
Original line number Diff line number Diff line
@@ -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) {

packages/ConnectivityT/framework-t/src/android/net/NetworkTemplate.java

+2 −3
Original line number Diff line number Diff line
@@ -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;

packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsSubscriptionsMonitor.java

+1 −3
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import static android.telephony.TelephonyManager.NETWORK_TYPE_LTE; 


import android.annotation.NonNull;

import android.content.Context;

import android.telephony.Annotation;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyCallback;

import android.telephony.TelephonyDisplayInfo;
@@ -59,8 +58,7 @@ public class NetworkStatsSubscriptionsMonitor extends 
         * @param collapsedRatType collapsed RAT type.

         *                     @see android.app.usage.NetworkStatsManager#getCollapsedRatType(int).

         */

        void onCollapsedRatTypeChanged(@NonNull String subscriberId,

                @Annotation.NetworkType int collapsedRatType);

        void onCollapsedRatTypeChanged(@NonNull String subscriberId, int collapsedRatType);

    }

    private final Delegate mDelegate;