Merge "Revert^2 "[Pod] Move SystemClock to util.time pod."" into main (6cdc5cd2) · Commits · e / os / android_frameworks_base

packages/SystemUI/Android.bp

+2 −4

Original line number	Diff line number	Diff line
		@@ -639,7 +639,7 @@ java_library {
		name: "SystemUI-tests-concurrency",
		srcs: [
		"src/com/android/systemui/util/concurrency/DelayableExecutor.java",
		"src/com/android/systemui/util/time/SystemClock.java",
		"pods/com/android/systemui/util/time/SystemClock.java",
		"tests/utils/src/com/android/systemui/util/concurrency/FakeExecutor.java",
		"tests/utils/src/com/android/systemui/util/time/FakeSystemClock.java",
		],
		@@ -787,9 +787,7 @@ android_library {
		],
		static_libs: [
		"//frameworks/libs/systemui:compilelib",
		"com.android.systemui.dagger-api",
		"com.android.systemui.util.settings-api",
		"com.android.systemui.retail-impl",
		"com.android.systemui.pods-aosp-handheld",
		"SystemUI-tests-base",
		"androidx.test.uiautomator_uiautomator",
		"androidx.core_core-animation-testing",

+3 −0

Original line number	Diff line number	Diff line
		@@ -64,6 +64,9 @@ java_library {
		"com.android.systemui.dagger-api",
		"com.android.systemui.retail-impl",
		"com.android.systemui.util.settings-api",
		"com.android.systemui.util.time-api",
		"com.android.systemui.util.time-impl",

		],
		visibility: ["//frameworks/base/packages/SystemUI:__pkg__"],
		}

0 → 100644

+48 −0

Original line number	Diff line number	Diff line
		//
		// Copyright (C) 2025 The Android Open Source Project
		//
		// Licensed under the Apache License, Version 2.0 (the "License");
		// you may not use this file except in compliance with the License.
		// You may obtain a copy of the License at
		//
		// http://www.apache.org/licenses/LICENSE-2.0
		//
		// Unless required by applicable law or agreed to in writing, software
		// distributed under the License is distributed on an "AS IS" BASIS,
		// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		// See the License for the specific language governing permissions and
		// limitations under the License.
		//

		package {
		default_applicable_licenses: ["frameworks_base_packages_SystemUI_license"],
		}

		java_library {
		name: "com.android.systemui.util.time-api",
		srcs: [
		"*.java",
		"*.kt",
		],
		defaults: [
		"SystemUI_pod_defaults_api",
		],
		}

		java_library {
		name: "com.android.systemui.util.time-impl",
		srcs: [
		"impl/*.java",
		"impl/*.kt",
		],
		libs: [
		"com.android.systemui.dagger-api",
		"dagger2",
		],
		static_libs: [
		"com.android.systemui.util.time-api",
		],
		defaults: [
		"SystemUI_pod_defaults_impl",
		],
		}

+0 −0

File moved.

+3 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,9 @@
		* limitations under the License.
		*/

		package com.android.systemui.util.time;
		package com.android.systemui.util.time.impl;

		import com.android.systemui.util.time.SystemClock;

		import javax.inject.Inject;