Merge "Add UNSUPPORTED to health 2.1 types" am: 6a4ab26005 am: 49a258dd49 am: 0451d28dad (861e8b9a) · Commits · e / os / android_hardware_interfaces

current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -662,7 +662,7 @@ ba5ac712b2a656dc07c83ab4a7a2c2f3bee1bbcb752e8b8ffa9b672f3b5b0728 android.hardwar
		a28d6c29a7e36976acffb018208e65b3496d9152d57d864038556cdd83b35744 android.hardware.gnss.measurement_corrections@1.1::types
		ce8dbe76eb9ee94b46ef98f725be992e760a5751073d4f4912484026541371f3 android.hardware.health@2.1::IHealth
		26f04510a0b57aba5167c5c0a7c2f077c2acbb98b81902a072517829fd9fd67f android.hardware.health@2.1::IHealthInfoCallback
		3a4e7462a12589bd219599de59663d0ba9915313f45150774780d09f4e114f74 android.hardware.health@2.1::types
		e2f8bc1868fd4a3fd587c172773ea5a8c2f5a3deaf7958394102ca455252b255 android.hardware.health@2.1::types
		0589e410f519e36514e7ece18f283f022df0f70efd2c12821d822f67f74aba98 android.hardware.identity@1.0::types
		bbeee9604128ede83ee755b67e73b5ad29e6e1dbac9ec41fea6ffe2745b0c50a android.hardware.identity@1.0::IIdentityCredential
		96ce8aad80f4c476f25261f790d357c117e79e18474c7dadd850dac704bbe65e android.hardware.identity@1.0::IIdentityCredentialStore

+14 −2

Original line number	Diff line number	Diff line
		@@ -19,6 +19,10 @@ package android.hardware.health@2.1;
		import @1.0::HealthConfig;
		import @2.0::HealthInfo;

		enum Constants : int64_t {
		BATTERY_CHARGE_TIME_TO_FULL_NOW_SECONDS_UNSUPPORTED = -1,
		};

		/**
		* Battery capacity level. This enum provides additional information along side
		* with the battery capacity.
		@@ -26,12 +30,18 @@ import @2.0::HealthInfo;
		* battery capacity.
		*/
		enum BatteryCapacityLevel : int32_t {
		/**
		* Battery capacity level is unsupported.
		* Battery capacity level must be set to this value if and only if the
		* implementation is unsupported.
		*/
		UNSUPPORTED = -1,
		/**
		* Battery capacity level is unknown.
		* Battery capacity level must be set to this value if and only if battery
		* is not present.
		* is not present or the battery capacity level is unknown/uninitialized.
		*/
		UNKNOWN = 0,
		UNKNOWN,
		/**
		* Battery is at critical level. The Android framework must schedule a
		* shutdown when it sees this value from the HAL.
		@@ -78,6 +88,8 @@ struct HealthInfo {

		/**
		* Estimated time to fully charge the device (in seconds).
		* Value must be BATTERY_CHARGE_TIME_TO_FULL_NOW_SECONDS_UNSUPPORTED if and
		* only if the implementation is unsupported.
		* Value must be 0 if and only if batteryCapacityLevel is FULL or UNKNOWN.
		* Otherwise, value must be positive.
		*/