Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove @hide symbols from NativeDaemonConnector"

Browse Source
This commit is contained in:
Paul Hu
2021-12-07 07:12:28 +00:00
committed by Gerrit Code Review
parent a37333ace6 e591c24c92
commit 68d5b22c2d
1 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/Nsd/service/src/com/android/server/NativeDaemonConnector.java
View File

@@ -20,16 +20,15 @@ import android.net.LocalSocket;
import android.net.LocalSocketAddress; import android.net.LocalSocketAddress;
import android.os.Build; import android.os.Build;
import android.os.Handler; import android.os.Handler;
import android.os.HandlerThread;
import android.os.Looper; import android.os.Looper;
import android.os.Message; import android.os.Message;
import android.os.PowerManager; import android.os.PowerManager;
import android.os.SystemClock; import android.os.SystemClock;
import android.os.SystemProperties;
import android.util.LocalLog; import android.util.LocalLog;
import android.util.Log; import android.util.Log;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.server.power.ShutdownThread;
import java.io.FileDescriptor; import java.io.FileDescriptor;
import java.io.IOException; import java.io.IOException;
@@ -83,13 +82,6 @@ final class NativeDaemonConnector implements Runnable, Handler.Callback {
NativeDaemonConnector(INativeDaemonConnectorCallbacks callbacks, String socket, NativeDaemonConnector(INativeDaemonConnectorCallbacks callbacks, String socket,
int responseQueueSize, String logTag, int maxLogSize, PowerManager.WakeLock wl) { int responseQueueSize, String logTag, int maxLogSize, PowerManager.WakeLock wl) {
this(callbacks, socket, responseQueueSize, logTag, maxLogSize, wl,
FgThread.get().getLooper());
}
NativeDaemonConnector(INativeDaemonConnectorCallbacks callbacks, String socket,
int responseQueueSize, String logTag, int maxLogSize, PowerManager.WakeLock wl,
Looper looper) {
mCallbacks = callbacks; mCallbacks = callbacks;
mSocket = socket; mSocket = socket;
mResponseQueue = new ResponseQueue(responseQueueSize); mResponseQueue = new ResponseQueue(responseQueueSize);
@@ -97,10 +89,12 @@ final class NativeDaemonConnector implements Runnable, Handler.Callback {
if (mWakeLock != null) { if (mWakeLock != null) {
mWakeLock.setReferenceCounted(true); mWakeLock.setReferenceCounted(true);
} }
mLooper = looper;
mSequenceNumber = new AtomicInteger(0); mSequenceNumber = new AtomicInteger(0);
TAG = logTag != null ? logTag : "NativeDaemonConnector"; TAG = logTag != null ? logTag : "NativeDaemonConnector";
mLocalLog = new LocalLog(maxLogSize); mLocalLog = new LocalLog(maxLogSize);
final HandlerThread thread = new HandlerThread(TAG);
thread.start();
mLooper = thread.getLooper();
} }
/** /**
@@ -135,23 +129,15 @@ final class NativeDaemonConnector implements Runnable, Handler.Callback {
mCallbackHandler = new Handler(mLooper, this); mCallbackHandler = new Handler(mLooper, this);
while (true) { while (true) {
if (isShuttingDown()) break;
try { try {
listenToSocket(); listenToSocket();
} catch (Exception e) { } catch (Exception e) {
loge("Error in NativeDaemonConnector: " + e); loge("Error in NativeDaemonConnector: " + e);
if (isShuttingDown()) break;
SystemClock.sleep(5000); SystemClock.sleep(5000);
} }
} }
} }
private static boolean isShuttingDown() {
String shutdownAct = SystemProperties.get(
ShutdownThread.SHUTDOWN_ACTION_PROPERTY, "");
return shutdownAct != null && shutdownAct.length() > 0;
}
@Override @Override
public boolean handleMessage(Message msg) { public boolean handleMessage(Message msg) {
final String event = (String) msg.obj; final String event = (String) msg.obj;