remove PooledLambda usage
Bug: 196011694
Test: build, presubmit
Change-Id: I15d416ba4d0d2bb9f7c16ad02fde5c0a8496cc97
diff --git a/service/src/com/android/car/evs/CarEvsService.java b/service/src/com/android/car/evs/CarEvsService.java
index cada565..3131024 100644
--- a/service/src/com/android/car/evs/CarEvsService.java
+++ b/service/src/com/android/car/evs/CarEvsService.java
@@ -26,7 +26,6 @@
import static android.car.evs.CarEvsManager.STREAM_EVENT_STREAM_STOPPED;
import static com.android.car.CarLog.TAG_EVS;
-import static com.android.internal.util.function.pooled.PooledLambda.obtainMessage;
import android.annotation.NonNull;
import android.annotation.Nullable;
@@ -118,9 +117,6 @@
// Interval for connecting to the EVS HAL service trial
private static final long EVS_HAL_SERVICE_BIND_RETRY_INTERVAL_MS = 1000;
- // Code to identify a message to request an activity again
- private static final int MSG_CHECK_ACTIVITY_REQUEST_TIMEOUT = 0;
-
// Service request priorities
private static final int REQUEST_PRIORITY_HIGH = 0;
private static final int REQUEST_PRIORITY_NORMAL = 1;
@@ -224,6 +220,8 @@
}
};
+ private final Runnable mActivityRequestTimeoutRunnable = () -> handleActivityRequestTimeout();
+
// CarEvsService state machine implementation to handle all state transitions.
private final class StateMachine {
// Current state
@@ -385,7 +383,7 @@
}
// Reset a timer for this new request
- mHandler.removeMessages(MSG_CHECK_ACTIVITY_REQUEST_TIMEOUT);
+ mHandler.removeCallbacks(mActivityRequestTimeoutRunnable);
break;
case SERVICE_STATE_ACTIVE:
@@ -435,7 +433,7 @@
}
// Reset a timer for this new request
- mHandler.removeMessages(MSG_CHECK_ACTIVITY_REQUEST_TIMEOUT);
+ mHandler.removeCallbacks(mActivityRequestTimeoutRunnable);
break;
case SERVICE_STATE_ACTIVE:
@@ -459,9 +457,7 @@
}
// Arms the timer
- mHandler.sendMessageDelayed(obtainMessage(CarEvsService::handleActivityRequestTimeout,
- CarEvsService.this).setWhat(MSG_CHECK_ACTIVITY_REQUEST_TIMEOUT),
- STREAM_START_REQUEST_TIMEOUT_MS);
+ mHandler.postDelayed(mActivityRequestTimeoutRunnable, STREAM_START_REQUEST_TIMEOUT_MS);
mState = SERVICE_STATE_REQUESTED;
mServiceType = service;
@@ -523,8 +519,9 @@
}
if (mStreamCallback != null) {
- mHandler.sendMessage(obtainMessage(
- CarEvsService::notifyStreamStopped, mStreamCallback));
+ // keep old reference for Runnable.
+ ICarEvsStreamCallback previousCallback = mStreamCallback;
+ mHandler.post(() -> notifyStreamStopped(previousCallback));
}
mStreamCallback = callback;
@@ -918,7 +915,7 @@
Objects.requireNonNull(callback);
if (isSessionToken(token)) {
- mHandler.removeMessages(MSG_CHECK_ACTIVITY_REQUEST_TIMEOUT);
+ mHandler.removeCallbacks(mActivityRequestTimeoutRunnable);
}
final int priority = token != null ? REQUEST_PRIORITY_HIGH : REQUEST_PRIORITY_LOW;
@@ -1175,7 +1172,7 @@
}
// Cancel a pending message to check a request timeout
- mHandler.removeMessages(MSG_CHECK_ACTIVITY_REQUEST_TIMEOUT);
+ mHandler.removeCallbacks(mActivityRequestTimeoutRunnable);
}
}
@@ -1294,8 +1291,7 @@
Slog.d(TAG_EVS, "Trying to connect to the EVS HAL service.");
if (mStateEngine.execute(REQUEST_PRIORITY_HIGH, SERVICE_STATE_INACTIVE) != ERROR_NONE) {
// Try to restore a connection again after a given amount of time
- mHandler.sendMessageDelayed(obtainMessage(
- CarEvsService::connectToHalServiceIfNecessary, this, intervalInMillis),
+ mHandler.postDelayed(() -> connectToHalServiceIfNecessary(intervalInMillis),
intervalInMillis);
}
}
diff --git a/service/src/com/android/car/hal/UserHalService.java b/service/src/com/android/car/hal/UserHalService.java
index fb12969..d3019a1 100644
--- a/service/src/com/android/car/hal/UserHalService.java
+++ b/service/src/com/android/car/hal/UserHalService.java
@@ -22,7 +22,6 @@
import static android.car.VehiclePropertyIds.USER_IDENTIFICATION_ASSOCIATION;
import static com.android.car.internal.ExcludeFromCodeCoverageGeneratedReport.DUMP_INFO;
-import static com.android.internal.util.function.pooled.PooledLambda.obtainMessage;
import android.annotation.NonNull;
import android.annotation.Nullable;
@@ -191,23 +190,19 @@
VehiclePropValue value = values.get(i);
switch (value.prop) {
case INITIAL_USER_INFO:
- mHandler.sendMessage(obtainMessage(
- UserHalService::handleOnInitialUserInfoResponse, this, value));
+ mHandler.post(() -> handleOnInitialUserInfoResponse(value));
break;
case SWITCH_USER:
- mHandler.sendMessage(obtainMessage(
- UserHalService::handleOnSwitchUserResponse, this, value));
+ mHandler.post(() -> handleOnSwitchUserResponse(value));
break;
case CREATE_USER:
- mHandler.sendMessage(obtainMessage(
- UserHalService::handleOnCreateUserResponse, this, value));
+ mHandler.post(() -> handleOnCreateUserResponse(value));
break;
case REMOVE_USER:
Slog.w(TAG, "Received REMOVE_USER HAL event: " + value);
break;
case USER_IDENTIFICATION_ASSOCIATION:
- mHandler.sendMessage(obtainMessage(
- UserHalService::handleOnUserIdentificationAssociation, this, value));
+ mHandler.post(() -> handleOnUserIdentificationAssociation(value));
break;
default:
Slog.w(TAG, "received unsupported event from HAL: " + value);
@@ -352,9 +347,7 @@
private void sendHalRequest(int requestId, int timeoutMs, @NonNull VehiclePropValue request,
@NonNull HalCallback<?> callback) {
- mHandler.sendMessageDelayed(obtainMessage(
- UserHalService::handleCheckIfRequestTimedOut, this, requestId).setWhat(requestId),
- timeoutMs);
+ mHandler.postDelayed(() -> handleCheckIfRequestTimedOut(requestId), requestId, timeoutMs);
try {
if (DBG) Slog.d(TAG, "Calling hal.set(): " + request);
mHal.set(request);
