Merge "fix common typos as part of codelab" into main (4cb35da8) · Commits · e / os / android_frameworks_base

core/java/android/os/BatteryConsumer.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -239,7 +239,7 @@ public abstract class BatteryConsumer {
		new Dimensions(POWER_COMPONENT_ANY, PROCESS_STATE_ANY);

		/**
		* Identifies power attribution dimensions that are captured by an data element of
		* Identifies power attribution dimensions that are captured by a data element of
		* a BatteryConsumer. These Keys are used to access those values and to set them using
		* Builders. See for example {@link #getConsumedPower(Key)}.
		*

+3 −3

Original line number	Diff line number	Diff line
		@@ -1576,7 +1576,7 @@ public abstract class BatteryStats {
		outNumOfInterest[0] = numOfInterest;
		}

		// The estimated time is the average time we spend in each level, multipled
		// The estimated time is the average time we spend in each level, multiplied
		// by 100 -- the total number of battery levels
		return (total / numOfInterest) * 100;
		}
		@@ -2023,7 +2023,7 @@ public abstract class BatteryStats {
		public static final int EVENT_TOP = 0x0003;
		// Event is about active sync operations.
		public static final int EVENT_SYNC = 0x0004;
		// Events for all additional wake locks aquired/release within a wake block.
		// Events for all additional wake locks acquired/release within a wake block.
		// These are not generated by default.
		public static final int EVENT_WAKE_LOCK = 0x0005;
		// Event is about an application executing a scheduled job.
		@@ -3389,7 +3389,7 @@ public abstract class BatteryStats {
		* incoming service calls from apps. The result is returned as an array of longs,
		* organized as a sequence like this:
		* <pre>
		* cluster1-speeed1, cluster1-speed2, ..., cluster2-speed1, cluster2-speed2, ...
		* cluster1-speed1, cluster1-speed2, ..., cluster2-speed1, cluster2-speed2, ...
		* </pre>
		*
		* @see com.android.internal.os.PowerProfile#getNumCpuClusters()

+1 −1

Original line number	Diff line number	Diff line
		@@ -58,7 +58,7 @@ public class HealthStatsWriter {
		* Construct a HealthStatsWriter object with the given constants.
		*
		* The "getDataType()" of the resulting HealthStats object will be the
		* short name of the java class that the Constants object was initalized
		* short name of the java class that the Constants object was initialized
		* with.
		*/
		public HealthStatsWriter(HealthKeys.Constants constants) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -52,7 +52,7 @@ import java.util.concurrent.Executor;
		*
		* After the installation is completed, the device will be running in the new system on next the
		* reboot. Then, when the user reboots the device again, it will leave {@code DynamicSystem} and go
		* back to the original system. While running in {@code DynamicSystem}, persitent storage for
		* back to the original system. While running in {@code DynamicSystem}, persistent storage for
		* factory reset protection (FRP) remains unchanged. Since the user is running the new system with
		* a temporarily created data partition, their original user data are kept unchanged.</p>
		*

+1 −1

Original line number	Diff line number	Diff line
		@@ -172,7 +172,7 @@ public class DynamicSystemManager {
		}
		}
		/**
		* Finish a previously started installation. Installations without a cooresponding
		* Finish a previously started installation. Installations without a corresponding
		* finishInstallation() will be cleaned up during device boot.
		*/
		@RequiresPermission(android.Manifest.permission.MANAGE_DYNAMIC_SYSTEM)