Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Add option to return a null Dagger graph"" into tm-qpr-dev am: 6d0057ce3c

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20869587

Change-Id: Id5dc122f813b069806958f1cf5e620b5e6a6ba7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Matt Casey
2023-01-12 01:43:28 +00:00
committed by Automerger Merge Worker
parent 5d809fb759 6d0057ce3c
commit c99356741f
3 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/AndroidManifest.xml
View File

@@ -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" />

9
packages/SystemUI/src/com/android/systemui/SystemUIInitializer.java
View File

@@ -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();

15
packages/SystemUI/src/com/android/systemui/SystemUIInitializerImpl.kt
View File

@@ -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"
} }
} }