LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Changed ConnectivityService#getServiceInstance so its a singleton." am: 56023ad2c6

Browse Source 
Original change: undetermined

Change-Id: Ie1a9765cc29732210b8bcd40bc794d215c56b4e9
This commit is contained in:
Joe Onorato
2021-05-31 10:45:36 +00:00
committed by Automerger Merge Worker
parent 614eadad23 56023ad2c6
commit 6d2fdffc7a
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/java/com/android/server/ConnectivityService.java
View File

@@ -105,7 +105,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
private int mNumDnsEntries; private int mNumDnsEntries;
private boolean mTestMode; private boolean mTestMode;
private static volatile ConnectivityService sServiceInstance; private static ConnectivityService sServiceInstance;
private Handler mHandler; private Handler mHandler;
@@ -176,10 +176,11 @@ public class ConnectivityService extends IConnectivityManager.Stub {
Looper.loop(); Looper.loop();
} }
public static synchronized ConnectivityService getServiceInstance(Context context) { public static ConnectivityService getServiceInstance(Context context) {
if (sServiceInstance == null) { ConnectivityThread thread = new ConnectivityThread(context);
ConnectivityThread thread = new ConnectivityThread(context); thread.start();
thread.start();
synchronized (thread) {
while (sServiceInstance == null) { while (sServiceInstance == null) {
try { try {
// Wait until sServiceInstance has been initialized. // Wait until sServiceInstance has been initialized.