Merge "Start removing Dependency.get(UiOffloadThread.class)" (b1575f6a) · Commits · e / os / android_frameworks_base

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -59,7 +59,6 @@ import com.android.systemui.BatteryMeterView;
		import com.android.systemui.Dependency;
		import com.android.systemui.Prefs;
		import com.android.systemui.R;
		import com.android.systemui.UiOffloadThread;
		import com.android.systemui.assist.AssistManager;
		import com.android.systemui.broadcast.BroadcastDispatcher;
		import com.android.systemui.bubbles.BubbleController;
		@@ -68,6 +67,7 @@ import com.android.systemui.car.CarDeviceProvisionedListener;
		import com.android.systemui.car.CarServiceProvider;
		import com.android.systemui.classifier.FalsingLog;
		import com.android.systemui.colorextraction.SysuiColorExtractor;
		import com.android.systemui.dagger.qualifiers.UiBackground;
		import com.android.systemui.fragments.FragmentHostManager;
		import com.android.systemui.keyguard.DismissCallbackRegistry;
		import com.android.systemui.keyguard.KeyguardViewMediator;
		@@ -141,6 +141,7 @@ import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.util.Map;
		import java.util.Optional;
		import java.util.concurrent.Executor;

		import javax.inject.Named;
		import javax.inject.Provider;
		@@ -273,7 +274,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
		NotificationAlertingManager notificationAlertingManager,
		DisplayMetrics displayMetrics,
		MetricsLogger metricsLogger,
		UiOffloadThread uiOffloadThread,
		@UiBackground Executor uiBgExecutor,
		NotificationMediaManager notificationMediaManager,
		NotificationLockscreenUserManager lockScreenUserManager,
		NotificationRemoteInputManager remoteInputManager,
		@@ -353,7 +354,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
		notificationAlertingManager,
		displayMetrics,
		metricsLogger,
		uiOffloadThread,
		uiBgExecutor,
		notificationMediaManager,
		lockScreenUserManager,
		remoteInputManager,

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBarModule.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -25,12 +25,12 @@ import android.util.DisplayMetrics;
		import com.android.internal.logging.MetricsLogger;
		import com.android.keyguard.KeyguardUpdateMonitor;
		import com.android.keyguard.ViewMediatorCallback;
		import com.android.systemui.UiOffloadThread;
		import com.android.systemui.assist.AssistManager;
		import com.android.systemui.broadcast.BroadcastDispatcher;
		import com.android.systemui.bubbles.BubbleController;
		import com.android.systemui.car.CarServiceProvider;
		import com.android.systemui.colorextraction.SysuiColorExtractor;
		import com.android.systemui.dagger.qualifiers.UiBackground;
		import com.android.systemui.keyguard.DismissCallbackRegistry;
		import com.android.systemui.keyguard.KeyguardViewMediator;
		import com.android.systemui.keyguard.ScreenLifecycle;
		@@ -96,6 +96,7 @@ import com.android.systemui.statusbar.policy.UserSwitcherController;
		import com.android.systemui.volume.VolumeComponent;

		import java.util.Optional;
		import java.util.concurrent.Executor;

		import javax.inject.Named;
		import javax.inject.Provider;
		@@ -143,7 +144,7 @@ public class CarStatusBarModule {
		NotificationAlertingManager notificationAlertingManager,
		DisplayMetrics displayMetrics,
		MetricsLogger metricsLogger,
		UiOffloadThread uiOffloadThread,
		@UiBackground Executor uiBgExecutor,
		NotificationMediaManager notificationMediaManager,
		NotificationLockscreenUserManager lockScreenUserManager,
		NotificationRemoteInputManager remoteInputManager,
		@@ -222,7 +223,7 @@ public class CarStatusBarModule {
		notificationAlertingManager,
		displayMetrics,
		metricsLogger,
		uiOffloadThread,
		uiBgExecutor,
		notificationMediaManager,
		lockScreenUserManager,
		remoteInputManager,

packages/SystemUI/src/com/android/systemui/UiOffloadThread.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@
		* 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
		* limitations under the License.
		*/

		package com.android.systemui;
		@@ -36,7 +36,7 @@ public class UiOffloadThread {
		public UiOffloadThread() {
		}

		public Future<?> submit(Runnable runnable) {
		public Future<?> execute(Runnable runnable) {
		return mExecutorService.submit(runnable);
		}
		}

packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerImpl.java

+7 −6

Original line number	Diff line number	Diff line
		@@ -37,8 +37,8 @@ import com.android.internal.logging.MetricsLogger;
		import com.android.keyguard.KeyguardUpdateMonitor;
		import com.android.keyguard.KeyguardUpdateMonitorCallback;
		import com.android.systemui.Dependency;
		import com.android.systemui.UiOffloadThread;
		import com.android.systemui.analytics.DataCollector;
		import com.android.systemui.dagger.qualifiers.UiBackground;
		import com.android.systemui.plugins.FalsingManager;
		import com.android.systemui.plugins.statusbar.StatusBarStateController;
		import com.android.systemui.plugins.statusbar.StatusBarStateController.StateListener;
		@@ -46,6 +46,7 @@ import com.android.systemui.statusbar.StatusBarState;
		import com.android.systemui.util.sensors.AsyncSensorManager;

		import java.io.PrintWriter;
		import java.util.concurrent.Executor;

		/**
		* When the phone is locked, listens to touch, sensor and phone events and sends them to
		@@ -77,7 +78,7 @@ public class FalsingManagerImpl implements FalsingManager {
		private final DataCollector mDataCollector;
		private final HumanInteractionClassifier mHumanInteractionClassifier;
		private final AccessibilityManager mAccessibilityManager;
		private final UiOffloadThread mUiOffloadThread;
		private final Executor mUiBgExecutor;

		private boolean mEnforceBouncer = false;
		private boolean mBouncerOn = false;
		@@ -137,13 +138,13 @@ public class FalsingManagerImpl implements FalsingManager {
		}
		};

		FalsingManagerImpl(Context context) {
		FalsingManagerImpl(Context context, @UiBackground Executor uiBgExecutor) {
		mContext = context;
		mSensorManager = Dependency.get(AsyncSensorManager.class);
		mAccessibilityManager = context.getSystemService(AccessibilityManager.class);
		mDataCollector = DataCollector.getInstance(mContext);
		mHumanInteractionClassifier = HumanInteractionClassifier.getInstance(mContext);
		mUiOffloadThread = Dependency.get(UiOffloadThread.class);
		mUiBgExecutor = uiBgExecutor;
		mScreenOn = context.getSystemService(PowerManager.class).isInteractive();
		mMetricsLogger = new MetricsLogger();

		@@ -196,7 +197,7 @@ public class FalsingManagerImpl implements FalsingManager {
		}

		// This can be expensive, and doesn't need to happen on the main thread.
		mUiOffloadThread.submit(() -> {
		mUiBgExecutor.execute(() -> {
		mSensorManager.unregisterListener(mSensorEventListener);
		});
		}
		@@ -237,7 +238,7 @@ public class FalsingManagerImpl implements FalsingManager {
		if (s != null) {

		// This can be expensive, and doesn't need to happen on the main thread.
		mUiOffloadThread.submit(() -> {
		mUiBgExecutor.execute(() -> {
		mSensorManager.registerListener(
		mSensorEventListener, s, SensorManager.SENSOR_DELAY_GAME);
		});

packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerProxy.java

+8 −3

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ import com.android.systemui.Dependency;
		import com.android.systemui.classifier.brightline.BrightLineFalsingManager;
		import com.android.systemui.classifier.brightline.FalsingDataProvider;
		import com.android.systemui.dagger.qualifiers.Main;
		import com.android.systemui.dagger.qualifiers.UiBackground;
		import com.android.systemui.plugins.FalsingManager;
		import com.android.systemui.plugins.FalsingPlugin;
		import com.android.systemui.plugins.PluginListener;
		@@ -39,6 +40,7 @@ import com.android.systemui.util.DeviceConfigProxy;
		import com.android.systemui.util.sensors.ProximitySensor;

		import java.io.PrintWriter;
		import java.util.concurrent.Executor;

		import javax.inject.Inject;
		import javax.inject.Singleton;
		@@ -58,13 +60,16 @@ public class FalsingManagerProxy implements FalsingManager {
		private DeviceConfig.OnPropertiesChangedListener mDeviceConfigListener;
		private final DeviceConfigProxy mDeviceConfig;
		private boolean mBrightlineEnabled;
		private Executor mUiBgExecutor;

		@Inject
		FalsingManagerProxy(Context context, PluginManager pluginManager,
		@Main Handler handler,
		ProximitySensor proximitySensor,
		DeviceConfigProxy deviceConfig) {
		DeviceConfigProxy deviceConfig,
		@UiBackground Executor uiBgExecutor) {
		mProximitySensor = proximitySensor;
		mUiBgExecutor = uiBgExecutor;
		mProximitySensor.setTag(PROXIMITY_SENSOR_TAG);
		mProximitySensor.setSensorDelay(SensorManager.SENSOR_DELAY_GAME);
		mDeviceConfig = deviceConfig;
		@@ -87,7 +92,7 @@ public class FalsingManagerProxy implements FalsingManager {
		}

		public void onPluginDisconnected(FalsingPlugin plugin) {
		mInternalFalsingManager = new FalsingManagerImpl(context);
		mInternalFalsingManager = new FalsingManagerImpl(context, mUiBgExecutor);
		}
		};

		@@ -117,7 +122,7 @@ public class FalsingManagerProxy implements FalsingManager {
		mInternalFalsingManager.cleanup();
		}
		if (!brightlineEnabled) {
		mInternalFalsingManager = new FalsingManagerImpl(context);
		mInternalFalsingManager = new FalsingManagerImpl(context, mUiBgExecutor);
		} else {
		mInternalFalsingManager = new BrightLineFalsingManager(
		new FalsingDataProvider(context.getResources().getDisplayMetrics()),