Merge "Revert "Add option to return a null Dagger graph"" into tm-qpr-dev (6d0057ce) · Commits · e / os / android_frameworks_base

packages/SystemUI/AndroidManifest.xml

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -411,7 +411,6 @@

	<service android:name=".screenshot.ScreenshotCrossProfileService"		<service android:name=".screenshot.ScreenshotCrossProfileService"
	android:permission="com.android.systemui.permission.SELF"		android:permission="com.android.systemui.permission.SELF"
	android:process=":screenshot_cross_profile"
	android:exported="false" />		android:exported="false" />

	<service android:name=".screenrecord.RecordingService" />		<service android:name=".screenrecord.RecordingService" />

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

+0 −9

Original line number	Original line	Diff line number	Diff line
	@@ -22,8 +22,6 @@ import android.os.Handler;
	import android.os.HandlerThread;		import android.os.HandlerThread;
	import android.util.Log;		import android.util.Log;

	import androidx.annotation.Nullable;

	import com.android.systemui.dagger.GlobalRootComponent;		import com.android.systemui.dagger.GlobalRootComponent;
	import com.android.systemui.dagger.SysUIComponent;		import com.android.systemui.dagger.SysUIComponent;
	import com.android.systemui.dagger.WMComponent;		import com.android.systemui.dagger.WMComponent;
	@@ -55,7 +53,6 @@ public abstract class SystemUIInitializer {
	mContext = context;		mContext = context;
	}		}

	@Nullable
	protected abstract GlobalRootComponent.Builder getGlobalRootComponentBuilder();		protected abstract GlobalRootComponent.Builder getGlobalRootComponentBuilder();

	/**		/**
	@@ -72,11 +69,6 @@ public abstract class SystemUIInitializer {
	* Starts the initialization process. This stands up the Dagger graph.		* Starts the initialization process. This stands up the Dagger graph.
	*/		*/
	public void init(boolean fromTest) throws ExecutionException, InterruptedException {		public void init(boolean fromTest) throws ExecutionException, InterruptedException {
	GlobalRootComponent.Builder globalBuilder = getGlobalRootComponentBuilder();
	if (globalBuilder == null) {
	return;
	}

	mRootComponent = getGlobalRootComponentBuilder()		mRootComponent = getGlobalRootComponentBuilder()
	.context(mContext)		.context(mContext)
	.instrumentationTest(fromTest)		.instrumentationTest(fromTest)
	@@ -127,7 +119,6 @@ public abstract class SystemUIInitializer {
	.setBackAnimation(Optional.ofNullable(null))		.setBackAnimation(Optional.ofNullable(null))
	.setDesktopMode(Optional.ofNullable(null));		.setDesktopMode(Optional.ofNullable(null));
	}		}

	mSysUIComponent = builder.build();		mSysUIComponent = builder.build();
	if (initializeComponents) {		if (initializeComponents) {
	mSysUIComponent.init();		mSysUIComponent.init();

packages/SystemUI/src/com/android/systemui/SystemUIInitializerImpl.kt

+2 −13

Original line number	Original line	Diff line number	Diff line
	@@ -16,7 +16,6 @@

	package com.android.systemui		package com.android.systemui

	import android.app.Application
	import android.content.Context		import android.content.Context
	import com.android.systemui.dagger.DaggerReferenceGlobalRootComponent		import com.android.systemui.dagger.DaggerReferenceGlobalRootComponent
	import com.android.systemui.dagger.GlobalRootComponent		import com.android.systemui.dagger.GlobalRootComponent
	@@ -25,17 +24,7 @@ import com.android.systemui.dagger.GlobalRootComponent
	* {@link SystemUIInitializer} that stands up AOSP SystemUI.		* {@link SystemUIInitializer} that stands up AOSP SystemUI.
	*/		*/
	class SystemUIInitializerImpl(context: Context) : SystemUIInitializer(context) {		class SystemUIInitializerImpl(context: Context) : SystemUIInitializer(context) {
			override fun getGlobalRootComponentBuilder(): GlobalRootComponent.Builder {
	override fun getGlobalRootComponentBuilder(): GlobalRootComponent.Builder? {		return DaggerReferenceGlobalRootComponent.builder()
	return when (Application.getProcessName()) {
	SCREENSHOT_CROSS_PROFILE_PROCESS -> null
	else -> DaggerReferenceGlobalRootComponent.builder()
	}
	}

	companion object {
	private const val SYSTEMUI_PROCESS = "com.android.systemui"
	private const val SCREENSHOT_CROSS_PROFILE_PROCESS =
	"$SYSTEMUI_PROCESS:screenshot_cross_profile"
	}		}
	}		}