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

Commit 0240cac3 authored by Mark Chien's avatar Mark Chien Committed by Automerger Merge Worker
Browse files

Merge "Remove Preconditions usage to stop dependecy with non-updatble class"... 

Merge "Remove Preconditions usage to stop dependecy with non-updatble class" into rvc-dev am: d974b333

Change-Id: I7b13aa7a500d804d0e8ef96d9d72556f3c642124
parents bfb21429 d974b333

Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -722,7 +722,6 @@ filegroup { 
        "core/java/com/android/internal/util/IndentingPrintWriter.java",

        "core/java/com/android/internal/util/IState.java",

        "core/java/com/android/internal/util/MessageUtils.java",

        "core/java/com/android/internal/util/Preconditions.java",

        "core/java/com/android/internal/util/State.java",

        "core/java/com/android/internal/util/StateMachine.java",

        "core/java/com/android/internal/util/TrafficStatsConstants.java",

packages/Tethering/jarjar-rules.txt

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ rule com.android.internal.util.BitUtils* com.android.networkstack.tethering.util 
rule com.android.internal.util.IndentingPrintWriter.java* com.android.networkstack.tethering.util.IndentingPrintWriter.java@1

rule com.android.internal.util.IState.java* com.android.networkstack.tethering.util.IState.java@1

rule com.android.internal.util.MessageUtils* com.android.networkstack.tethering.util.MessageUtils@1

rule com.android.internal.util.Preconditions* com.android.networkstack.tethering.util.Preconditions@1

rule com.android.internal.util.State* com.android.networkstack.tethering.util.State@1

rule com.android.internal.util.StateMachine* com.android.networkstack.tethering.util.StateMachine@1

rule com.android.internal.util.TrafficStatsConstants* com.android.networkstack.tethering.util.TrafficStatsConstants@1

packages/Tethering/src/com/android/networkstack/tethering/UpstreamNetworkMonitor.java

+3 −2
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ import android.util.Log; 
import android.util.SparseIntArray;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.Preconditions;

import com.android.internal.util.StateMachine;



import java.util.HashMap;
@@ -591,7 +590,9 @@ public class UpstreamNetworkMonitor { 
        // Map from type to transports.

        final int notFound = -1;

        final int transport = sLegacyTypeToTransport.get(type, notFound);

        Preconditions.checkArgument(transport != notFound, "unknown legacy type: " + type);

        if (transport == notFound) {

            throw new IllegalArgumentException("unknown legacy type: " + type);

        }

        builder.addTransportType(transport);



        if (type == TYPE_MOBILE_DUN) {

packages/Tethering/tests/unit/jarjar-rules.txt

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ rule com.android.internal.util.BitUtils* com.android.networkstack.tethering.util 
rule com.android.internal.util.IndentingPrintWriter.java* com.android.networkstack.tethering.util.IndentingPrintWriter.java@1

rule com.android.internal.util.IState.java* com.android.networkstack.tethering.util.IState.java@1

rule com.android.internal.util.MessageUtils* com.android.networkstack.tethering.util.MessageUtils@1

rule com.android.internal.util.Preconditions* com.android.networkstack.tethering.util.Preconditions@1

rule com.android.internal.util.State* com.android.networkstack.tethering.util.State@1

rule com.android.internal.util.StateMachine* com.android.networkstack.tethering.util.StateMachine@1

rule com.android.internal.util.TrafficStatsConstants* com.android.networkstack.tethering.util.TrafficStatsConstants@1