Merge "Remove obsolete battery_part_status_api flag." into main (7bf1d58e) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/health/HealthServiceWrapperAidl.java

+4 −10

Original line number	Diff line number	Diff line
		@@ -16,8 +16,6 @@

		package com.android.server.health;

		import static android.os.Flags.batteryPartStatusApi;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.hardware.health.BatteryHealthData;
		@@ -157,16 +155,12 @@ class HealthServiceWrapperAidl extends HealthServiceWrapper {
		prop.setLong(healthData.batteryStateOfHealth);
		break;
		case BatteryManager.BATTERY_PROPERTY_SERIAL_NUMBER:
		if (batteryPartStatusApi()) {
		healthData = service.getBatteryHealthData();
		prop.setString(healthData.batterySerialNumber);
		}
		break;
		case BatteryManager.BATTERY_PROPERTY_PART_STATUS:
		if (batteryPartStatusApi()) {
		healthData = service.getBatteryHealthData();
		prop.setLong(healthData.batteryPartStatus);
		}
		break;
		}
		} catch (UnsupportedOperationException e) {