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

Commit 019cb1d4 authored by Erik Kline's avatar Erik Kline Committed by android-build-merger
Browse files

Merge "Refactor isTetheringSupported() calls" am: e34c426f 

am: 6f63d051

Change-Id: Iad6358dc2f1d10b322d22ec90543adc50882962d
parents c13bf777 6f63d051

services/core/java/com/android/server/ConnectivityService.java

+6 −1
Original line number Diff line number Diff line
@@ -910,7 +910,12 @@ public class ConnectivityService extends IConnectivityManager.Stub 


    private Tethering makeTethering() {

        // TODO: Move other elements into @Overridden getters.

        final TetheringDependencies deps = new TetheringDependencies();

        final TetheringDependencies deps = new TetheringDependencies() {

            @Override

            public boolean isTetheringSupported() {

                return ConnectivityService.this.isTetheringSupported();

            }

        };

        return new Tethering(mContext, mNetd, mStatsService, mPolicyManager,

                IoThread.get().getLooper(), new MockableSystemProperties(),

                deps);

services/core/java/com/android/server/connectivity/Tethering.java

+88 −78

File changed.

Preview size limit exceeded, changes collapsed.

services/core/java/com/android/server/connectivity/tethering/TetheringDependencies.java

+4 −0
Original line number Diff line number Diff line
@@ -60,4 +60,8 @@ public class TetheringDependencies { 
    public INetd getNetdService() {

        return NetdService.getInstance();

    }



    public boolean isTetheringSupported() {

        return true;

    }

}

tests/net/java/com/android/server/connectivity/TetheringTest.java

+40 −42

File changed.

Preview size limit exceeded, changes collapsed.