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

Commit 80af4f7b authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

am 7301bd96: Merge "Use a separate thread for services that do NTP lookup" into klp-dev 

* commit '7301bd96':
  Use a separate thread for services that do NTP lookup
parents ba8129f1 7301bd96

services/java/com/android/server/NetworkTimeUpdateService.java

+4 −2
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.database.ContentObserver; 
import android.net.ConnectivityManager;

import android.net.NetworkInfo;

import android.os.Handler;

import android.os.HandlerThread;

import android.os.Looper;

import android.os.Message;

import android.os.SystemClock;
@@ -35,7 +36,6 @@ import android.util.Log; 
import android.util.NtpTrustedTime;

import android.util.TrustedTime;



import com.android.internal.os.BackgroundThread;

import com.android.internal.telephony.TelephonyIntents;



/**
@@ -113,7 +113,9 @@ public class NetworkTimeUpdateService { 
        registerForAlarms();

        registerForConnectivityIntents();



        mHandler = new MyHandler(BackgroundThread.get().getLooper());

        HandlerThread thread = new HandlerThread(TAG);

        thread.start();

        mHandler = new MyHandler(thread.getLooper());

        // Check the network time on the new thread

        mHandler.obtainMessage(EVENT_POLL_NETWORK_TIME).sendToTarget();

services/java/com/android/server/net/NetworkPolicyManagerService.java

+4 −2
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ import android.net.wifi.WifiManager; 
import android.os.Binder;

import android.os.Environment;

import android.os.Handler;

import android.os.HandlerThread;

import android.os.INetworkManagementService;

import android.os.IPowerManager;

import android.os.Message;
@@ -133,7 +134,6 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.internal.util.FastXmlSerializer;

import com.android.internal.util.IndentingPrintWriter;

import com.android.internal.util.Objects;

import com.android.server.IoThread;

import com.google.android.collect.Lists;

import com.google.android.collect.Maps;

import com.google.android.collect.Sets;
@@ -305,7 +305,9 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
        mNetworkManager = checkNotNull(networkManagement, "missing networkManagement");

        mTime = checkNotNull(time, "missing TrustedTime");



        mHandler = new Handler(IoThread.get().getLooper(), mHandlerCallback);

        HandlerThread thread = new HandlerThread(TAG);

        thread.start();

        mHandler = new Handler(thread.getLooper(), mHandlerCallback);



        mSuppressDefaultPolicy = suppressDefaultPolicy;

services/java/com/android/server/net/NetworkStatsService.java

+4 −2
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ import android.os.Binder; 
import android.os.DropBoxManager;

import android.os.Environment;

import android.os.Handler;

import android.os.HandlerThread;

import android.os.INetworkManagementService;

import android.os.Message;

import android.os.PowerManager;
@@ -119,7 +120,6 @@ import com.android.internal.util.ArrayUtils; 
import com.android.internal.util.FileRotator;

import com.android.internal.util.IndentingPrintWriter;

import com.android.server.EventLogTags;

import com.android.server.IoThread;

import com.android.server.connectivity.Tethering;

import com.google.android.collect.Maps;
@@ -270,7 +270,9 @@ public class NetworkStatsService extends INetworkStatsService.Stub { 
                Context.POWER_SERVICE);

        mWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG);



        mHandler = new Handler(IoThread.get().getLooper(), mHandlerCallback);

        HandlerThread thread = new HandlerThread(TAG);

        thread.start();

        mHandler = new Handler(thread.getLooper(), mHandlerCallback);



        mSystemDir = checkNotNull(systemDir);

        mBaseDir = new File(systemDir, "netstats");