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

Commit 835e7c6f authored by Govinda Wasserman's avatar Govinda Wasserman Committed by Android (Google) Code Review
Browse files

Revert "Add option to return a null Dagger graph" 

Revert submission 20664269-b259469497-ss-cross-profile-dagger

Reason for revert: b/263453125

Reverted changes: /q/submissionid:20664269-b259469497-ss-cross-profile-dagger

Change-Id: I24affd9ced5ca4fa4959200d60ecf93b4b03d12a
parent 19e63a79

packages/SystemUI/AndroidManifest.xml

+0 −1
Original line number Diff line number Diff line
@@ -416,7 +416,6 @@ 


        <service android:name=".screenshot.ScreenshotCrossProfileService"

                 android:permission="com.android.systemui.permission.SELF"

                 android:process=":screenshot_cross_profile"

                 android:exported="false" />



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

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

+0 −9
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ import android.os.Handler; 
import android.os.HandlerThread;

import android.util.Log;



import androidx.annotation.Nullable;



import com.android.systemui.dagger.GlobalRootComponent;

import com.android.systemui.dagger.SysUIComponent;

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

    }



    @Nullable

    protected abstract GlobalRootComponent.Builder getGlobalRootComponentBuilder();



    /**
@@ -72,11 +69,6 @@ public abstract class SystemUIInitializer { 
     * Starts the initialization process. This stands up the Dagger graph.

     */

    public void init(boolean fromTest) throws ExecutionException, InterruptedException {

        GlobalRootComponent.Builder globalBuilder = getGlobalRootComponentBuilder();

        if (globalBuilder == null) {

            return;

        }



        mRootComponent = getGlobalRootComponentBuilder()

                .context(mContext)

                .instrumentationTest(fromTest)
@@ -127,7 +119,6 @@ public abstract class SystemUIInitializer { 
                    .setBackAnimation(Optional.ofNullable(null))

                    .setDesktopMode(Optional.ofNullable(null));

        }



        mSysUIComponent = builder.build();

        if (initializeComponents) {

            mSysUIComponent.init();

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

+2 −13
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.systemui



import android.app.Application

import android.content.Context

import com.android.systemui.dagger.DaggerReferenceGlobalRootComponent

import com.android.systemui.dagger.GlobalRootComponent
@@ -25,17 +24,7 @@ import com.android.systemui.dagger.GlobalRootComponent 
 * {@link SystemUIInitializer} that stands up AOSP SystemUI.

 */

class SystemUIInitializerImpl(context: Context) : SystemUIInitializer(context) {



    override fun getGlobalRootComponentBuilder(): GlobalRootComponent.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"

    override fun getGlobalRootComponentBuilder(): GlobalRootComponent.Builder {

        return DaggerReferenceGlobalRootComponent.builder()

    }

}