Merge "BatteryService: scheduleUpdate asynchronously" am: 238a04ef59 am:... (a4616d3a) · Commits · e / os / android_frameworks_base

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

+16 −9

Original line number	Diff line number	Diff line
		@@ -1235,14 +1235,21 @@ public final class BatteryService extends SystemService {
		}
		@Override
		public void scheduleUpdate() throws RemoteException {
		mHealthServiceWrapper.getHandlerThread().getThreadHandler().post(() -> {
		traceBegin("HealthScheduleUpdate");
		try {
		IHealth service = mHealthServiceWrapper.getLastService();
		if (service == null) throw new RemoteException("no health service");
		if (service == null) {
		Slog.e(TAG, "no health service");
		return;
		}
		service.update();
		} catch (RemoteException ex) {
		Slog.e(TAG, "Cannot call update on health HAL", ex);
		} finally {
		traceEnd();
		}
		});
		}
		}

		@@ -1319,7 +1326,7 @@ public final class BatteryService extends SystemService {
		Arrays.asList(INSTANCE_VENDOR, INSTANCE_HEALTHD);

		private final IServiceNotification mNotification = new Notification();
		private final HandlerThread mHandlerThread = new HandlerThread("HealthServiceRefresh");
		private final HandlerThread mHandlerThread = new HandlerThread("HealthServiceHwbinder");
		// These variables are fixed after init.
		private Callback mCallback;
		private IHealthSupplier mHealthSupplier;