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

Commit 010b6ce6 authored by Winson's avatar Winson Committed by android-build-merger
Browse files

Defaulting wallpaper offset to edge of the screen. am: 4b4ba90d am: 18faeaa5 

am: 48f732db

Change-Id: I86d0616df8f938b1b80651be83802796a24250b9
parents 117197fc 48f732db

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

+9 −1
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        }

    }



    private final IpConnectivityLog mMetricsLog = new IpConnectivityLog();

    private final IpConnectivityLog mMetricsLog;



    /**

     * Implements support for the legacy "one network per network type" model.
@@ -677,8 +677,16 @@ public class ConnectivityService extends IConnectivityManager.Stub 


    public ConnectivityService(Context context, INetworkManagementService netManager,

            INetworkStatsService statsService, INetworkPolicyManager policyManager) {

        this(context, netManager, statsService, policyManager, new IpConnectivityLog());

    }



    @VisibleForTesting

    protected ConnectivityService(Context context, INetworkManagementService netManager,

            INetworkStatsService statsService, INetworkPolicyManager policyManager,

            IpConnectivityLog logger) {

        if (DBG) log("ConnectivityService starting up");



        mMetricsLog = logger;

        mDefaultRequest = createInternetRequestForTransport(-1);

        NetworkRequestInfo defaultNRI = new NetworkRequestInfo(null, mDefaultRequest, new Binder());

        mNetworkRequests.put(mDefaultRequest, defaultNRI);

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

+8 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ public class NetworkMonitor extends StateMachine { 
    private final WifiManager mWifiManager;

    private final AlarmManager mAlarmManager;

    private final NetworkRequest mDefaultRequest;

    private final IpConnectivityLog mMetricsLog = new IpConnectivityLog();

    private final IpConnectivityLog mMetricsLog;



    private boolean mIsCaptivePortalCheckEnabled;

    private boolean mUseHttps;
@@ -226,10 +226,17 @@ public class NetworkMonitor extends StateMachine { 


    public NetworkMonitor(Context context, Handler handler, NetworkAgentInfo networkAgentInfo,

            NetworkRequest defaultRequest) {

        this(context, handler, networkAgentInfo, defaultRequest, new IpConnectivityLog());

    }



    @VisibleForTesting

    protected NetworkMonitor(Context context, Handler handler, NetworkAgentInfo networkAgentInfo,

            NetworkRequest defaultRequest, IpConnectivityLog logger) {

        // Add suffix indicating which NetworkMonitor we're talking about.

        super(TAG + networkAgentInfo.name());



        mContext = context;

        mMetricsLog = logger;

        mConnectivityServiceHandler = handler;

        mNetworkAgentInfo = networkAgentInfo;

        mNetId = mNetworkAgentInfo.network.netId;

services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java

+11 −7
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ import android.net.NetworkInfo.DetailedState; 
import android.net.NetworkMisc;

import android.net.NetworkRequest;

import android.net.RouteInfo;

import android.net.metrics.IpConnectivityLog;

import android.os.ConditionVariable;

import android.os.Handler;

import android.os.HandlerThread;
@@ -585,8 +586,9 @@ public class ConnectivityServiceTest extends AndroidTestCase { 
        public String gen204ProbeRedirectUrl = null;



        public WrappedNetworkMonitor(Context context, Handler handler,

            NetworkAgentInfo networkAgentInfo, NetworkRequest defaultRequest) {

            super(context, handler, networkAgentInfo, defaultRequest);

                NetworkAgentInfo networkAgentInfo, NetworkRequest defaultRequest,

                IpConnectivityLog log) {

            super(context, handler, networkAgentInfo, defaultRequest, log);

        }



        @Override
@@ -599,8 +601,9 @@ public class ConnectivityServiceTest extends AndroidTestCase { 
        private WrappedNetworkMonitor mLastCreatedNetworkMonitor;



        public WrappedConnectivityService(Context context, INetworkManagementService netManager,

                INetworkStatsService statsService, INetworkPolicyManager policyManager) {

            super(context, netManager, statsService, policyManager);

                INetworkStatsService statsService, INetworkPolicyManager policyManager,

                IpConnectivityLog log) {

            super(context, netManager, statsService, policyManager, log);

            mLingerDelayMs = TEST_LINGER_DELAY_MS;

        }
@@ -639,8 +642,8 @@ public class ConnectivityServiceTest extends AndroidTestCase { 
        @Override

        public NetworkMonitor createNetworkMonitor(Context context, Handler handler,

                NetworkAgentInfo nai, NetworkRequest defaultRequest) {

            final WrappedNetworkMonitor monitor = new WrappedNetworkMonitor(context, handler, nai,

                    defaultRequest);

            final WrappedNetworkMonitor monitor = new WrappedNetworkMonitor(

                    context, handler, nai, defaultRequest, mock(IpConnectivityLog.class));

            mLastCreatedNetworkMonitor = monitor;

            return monitor;

        }
@@ -705,7 +708,8 @@ public class ConnectivityServiceTest extends AndroidTestCase { 
        mService = new WrappedConnectivityService(mServiceContext,

                mock(INetworkManagementService.class),

                mock(INetworkStatsService.class),

                mock(INetworkPolicyManager.class));

                mock(INetworkPolicyManager.class),

                mock(IpConnectivityLog.class));



        mService.systemReady();

        mCm = new WrappedConnectivityManager(getContext(), mService);