Merge "Basic renames / tidy ups" (37564211) · Commits · e / os / android_frameworks_base

core/java/android/app/time/TimeCapabilitiesAndConfig.java

+21 −22

Original line number	Diff line number	Diff line
		@@ -42,19 +42,18 @@ public final class TimeCapabilitiesAndConfig implements Parcelable {
		}
		};

		@NonNull
		private final TimeCapabilities mTimeCapabilities;

		@NonNull
		private final TimeConfiguration mTimeConfiguration;
		@NonNull private final TimeCapabilities mCapabilities;
		@NonNull private final TimeConfiguration mConfiguration;

		/**
		* Creates a new instance.
		*
		* @hide
		*/
		public TimeCapabilitiesAndConfig(@NonNull TimeCapabilities timeCapabilities,
		@NonNull TimeConfiguration timeConfiguration) {
		mTimeCapabilities = Objects.requireNonNull(timeCapabilities);
		mTimeConfiguration = Objects.requireNonNull(timeConfiguration);
		mCapabilities = Objects.requireNonNull(timeCapabilities);
		mConfiguration = Objects.requireNonNull(timeConfiguration);
		}

		@NonNull
		@@ -64,14 +63,20 @@ public final class TimeCapabilitiesAndConfig implements Parcelable {
		return new TimeCapabilitiesAndConfig(capabilities, configuration);
		}

		@Override
		public void writeToParcel(@NonNull Parcel dest, int flags) {
		dest.writeParcelable(mCapabilities, flags);
		dest.writeParcelable(mConfiguration, flags);
		}

		/**
		* Returns the user's time behaviour capabilities.
		*
		* @hide
		*/
		@NonNull
		public TimeCapabilities getTimeCapabilities() {
		return mTimeCapabilities;
		public TimeCapabilities getCapabilities() {
		return mCapabilities;
		}

		/**
		@@ -80,8 +85,8 @@ public final class TimeCapabilitiesAndConfig implements Parcelable {
		* @hide
		*/
		@NonNull
		public TimeConfiguration getTimeConfiguration() {
		return mTimeConfiguration;
		public TimeConfiguration getConfiguration() {
		return mConfiguration;
		}

		@Override
		@@ -89,31 +94,25 @@ public final class TimeCapabilitiesAndConfig implements Parcelable {
		return 0;
		}

		@Override
		public void writeToParcel(@NonNull Parcel dest, int flags) {
		dest.writeParcelable(mTimeCapabilities, flags);
		dest.writeParcelable(mTimeConfiguration, flags);
		}

		@Override
		public boolean equals(Object o) {
		if (this == o) return true;
		if (o == null \|\| getClass() != o.getClass()) return false;
		TimeCapabilitiesAndConfig that = (TimeCapabilitiesAndConfig) o;
		return mTimeCapabilities.equals(that.mTimeCapabilities)
		&& mTimeConfiguration.equals(that.mTimeConfiguration);
		return mCapabilities.equals(that.mCapabilities)
		&& mConfiguration.equals(that.mConfiguration);
		}

		@Override
		public int hashCode() {
		return Objects.hash(mTimeCapabilities, mTimeConfiguration);
		return Objects.hash(mCapabilities, mConfiguration);
		}

		@Override
		public String toString() {
		return "TimeCapabilitiesAndConfig{"
		+ "mTimeCapabilities=" + mTimeCapabilities
		+ ", mTimeConfiguration=" + mTimeConfiguration
		+ "mCapabilities=" + mCapabilities
		+ ", mConfiguration=" + mConfiguration
		+ '}';
		}
		}

services/core/java/com/android/server/timedetector/TimeDetectorShellCommand.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -75,7 +75,7 @@ class TimeDetectorShellCommand extends ShellCommand {
		private int runIsAutoDetectionEnabled() {
		final PrintWriter pw = getOutPrintWriter();
		boolean enabled = mInterface.getCapabilitiesAndConfig()
		.getTimeConfiguration()
		.getConfiguration()
		.isAutoDetectionEnabled();
		pw.println(enabled);
		return 0;