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

Commit b892c4e2 authored by Bin Chen's avatar Bin Chen Committed by Zhao Wei Liew
Browse files

fwb: services: tests: Remove duplicated WrappedAvoidBadWifiTracker class

 * ERROR: /frameworks/base/services/tests/servicestests/src/
          com/android/server/ConnectivityServiceTest.java:617:
          Duplicate nested type WrappedAvoidBadWifiTracker
    
   This was the result of a bad 7.1.1_r1 merge in commit
   c19f0656.

Change-Id: Id5bb5f79a53f05a0d0c4932f739646ac6021e655
parent c19f0656
Loading
Loading
Loading
Loading
+0 −13
Original line number Diff line number Diff line
@@ -614,19 +614,6 @@ public class ConnectivityServiceTest extends AndroidTestCase {
        }
    }

    private class WrappedAvoidBadWifiTracker extends AvoidBadWifiTracker {
        public boolean configRestrictsAvoidBadWifi;

        public WrappedAvoidBadWifiTracker(Context c, Handler h, Runnable r) {
            super(c, h, r);
        }

        @Override
        public boolean configRestrictsAvoidBadWifi() {
            return configRestrictsAvoidBadWifi;
        }
    }

    private class WrappedConnectivityService extends ConnectivityService {
        public WrappedAvoidBadWifiTracker wrappedAvoidBadWifiTracker;
        private WrappedNetworkMonitor mLastCreatedNetworkMonitor;