Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21c4b797 authored Feb 07, 2023 by Sherry Zhou Committed by Android (Google) Code Review Feb 07, 2023

Merge "Fix crash about Weather class in clocks" into tm-qpr-dev

parents fbdca374 31ae0b2a

packages/SystemUI/plugin/src/com/android/systemui/plugins/ClockProviderPlugin.kt

+0 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ import android.view.View
		import com.android.internal.annotations.Keep
		import com.android.systemui.plugins.annotations.ProvidesInterface
		import com.android.systemui.plugins.log.LogBuffer
		import com.android.systemui.statusbar.Weather
		import java.io.PrintWriter
		import java.util.Locale
		import java.util.TimeZone

packages/SystemUI/plugin/src/com/android/systemui/plugins/Weather.kt

+1 −1

Original line number	Diff line number	Diff line
		package com.android.systemui.statusbar
		package com.android.systemui.plugins

		import android.os.Bundle

packages/SystemUI/src/com/android/keyguard/ClockEventController.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ import com.android.systemui.plugins.ClockTickRate
		import com.android.systemui.plugins.log.LogBuffer
		import com.android.systemui.plugins.log.LogLevel.DEBUG
		import com.android.systemui.shared.regionsampling.RegionSampler
		import com.android.systemui.statusbar.Weather
		import com.android.systemui.plugins.Weather
		import com.android.systemui.statusbar.policy.BatteryController
		import com.android.systemui.statusbar.policy.BatteryController.BatteryStateChangeCallback
		import com.android.systemui.statusbar.policy.ConfigurationController

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -147,12 +147,12 @@ import com.android.systemui.dagger.qualifiers.Main;
		import com.android.systemui.dump.DumpManager;
		import com.android.systemui.dump.DumpsysTableLogger;
		import com.android.systemui.log.SessionTracker;
		import com.android.systemui.plugins.Weather;
		import com.android.systemui.plugins.statusbar.StatusBarStateController;
		import com.android.systemui.settings.UserTracker;
		import com.android.systemui.shared.system.TaskStackChangeListener;
		import com.android.systemui.shared.system.TaskStackChangeListeners;
		import com.android.systemui.statusbar.StatusBarState;
		import com.android.systemui.statusbar.Weather;
		import com.android.systemui.statusbar.phone.KeyguardBypassController;
		import com.android.systemui.statusbar.policy.DevicePostureController;
		import com.android.systemui.telephony.TelephonyListenerManager;

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,8 +23,8 @@ import androidx.annotation.NonNull;
		import androidx.annotation.Nullable;

		import com.android.settingslib.fuelgauge.BatteryStatus;
		import com.android.systemui.plugins.Weather;
		import com.android.systemui.statusbar.KeyguardIndicationController;
		import com.android.systemui.statusbar.Weather;

		import java.util.TimeZone;