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

Commit 949f56eb authored by Aaron Huang's avatar Aaron Huang Committed by Chiachang Wang
Browse files

Replace deduceRestrictedCapability with the version in libs/net 

deduceRestrictedCapability is moved to libs/net and renamed.
This change is to use inferRestrictedCapability method which
is in libs/net.

Bug: 178777253
Test: FrameworksNetTests
      FrameworksTelephonyTests:DataConnectionTest
(cherry-picked from ag/13929323)

Merged-In: I83cd60b5405311bc33c4368316f7a65144709d0d
Change-Id: I83cd60b5405311bc33c4368316f7a65144709d0d
parent 5e2cf5f5

src/java/com/android/internal/telephony/dataconnection/DataConnection.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -99,6 +99,7 @@ import com.android.internal.util.IndentingPrintWriter; 
import com.android.internal.util.Protocol;

import com.android.internal.util.Protocol;

import com.android.internal.util.State;

import com.android.internal.util.State;

import com.android.internal.util.StateMachine;

import com.android.internal.util.StateMachine;

import com.android.net.module.util.NetworkCapabilitiesUtils;

import com.android.telephony.Rlog;

import com.android.telephony.Rlog;





import java.io.FileDescriptor;

import java.io.FileDescriptor;
@@ -1823,6 +1824,7 @@ public class DataConnection extends StateMachine { 
            }

            }

        }

        }







        // Mark NOT_METERED in the following cases:

        // Mark NOT_METERED in the following cases:

        // 1. All APNs in the APN settings are unmetered.

        // 1. All APNs in the APN settings are unmetered.

        // 2. The non-restricted data is intended for unmetered use only.

        // 2. The non-restricted data is intended for unmetered use only.
@@ -1832,8 +1834,7 @@ public class DataConnection extends StateMachine { 
            builder.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED);

            builder.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED);

        }

        }





        // TODO: Need to remove the use of hidden API deduceRestrictedCapability

        if (NetworkCapabilitiesUtils.inferRestrictedCapability(builder.build())) {

        if (builder.build().deduceRestrictedCapability()) {

            builder.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED);

            builder.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED);

        }

        }