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

Commit 03dd9c6a authored by Bryce Lee's avatar Bryce Lee Committed by Automerger Merge Worker
Browse files

Merge "Remove configuration for enabling dream overlay service." into tm-qpr-dev am: 90844a62 

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



Change-Id: Ie2092f311a807a1b76611ad801961a42617a3322
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d8ba0ba3 90844a62

packages/SystemUI/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -713,7 +713,7 @@ 


        <service

            android:name=".dreams.DreamOverlayService"

            android:enabled="@bool/config_dreamOverlayServiceEnabled"

            android:enabled="false"

            android:exported="true" />



        <activity android:name=".keyguard.WorkLockActivity"

packages/SystemUI/res/values/config.xml

+0 −3
Original line number Diff line number Diff line
@@ -689,9 +689,6 @@ 
    <!-- Flag to enable privacy dot views, it shall be true for normal case -->

    <bool name="config_enablePrivacyDot">true</bool>



    <!-- Flag to enable dream overlay service and its registration -->

    <bool name="config_dreamOverlayServiceEnabled">false</bool>



    <!-- Class for the communal source connector to be used -->

    <string name="config_communalSourceConnector" translatable="false"></string>

packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayRegistrant.java

+8 −16
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.content.Context; 
import android.content.Intent;

import android.content.IntentFilter;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager.NameNotFoundException;

import android.content.res.Resources;

import android.os.PatternMatcher;

import android.os.RemoteException;
@@ -31,7 +32,6 @@ import android.service.dreams.IDreamManager; 
import android.util.Log;



import com.android.systemui.CoreStartable;

import com.android.systemui.R;

import com.android.systemui.dagger.qualifiers.Main;



import javax.inject.Inject;
@@ -66,24 +66,16 @@ public class DreamOverlayRegistrant extends CoreStartable { 
        final int enabledState =

                packageManager.getComponentEnabledSetting(mOverlayServiceComponent);



        // The overlay service is only registered when its component setting is enabled.

        boolean register = false;



        // TODO(b/204626521): We should not have to set the component enabled setting if the

        // enabled config flag is properly applied based on the RRO.

        if (enabledState != PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER) {

            final int overlayState = mResources.getBoolean(R.bool.config_dreamOverlayServiceEnabled)

                    ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED

                    : PackageManager.COMPONENT_ENABLED_STATE_DISABLED;



            if (overlayState != enabledState) {

                packageManager

                        .setComponentEnabledSetting(mOverlayServiceComponent, overlayState, 0);

            }

        try {

            register = packageManager.getServiceInfo(mOverlayServiceComponent,

                PackageManager.GET_META_DATA).enabled;

        } catch (NameNotFoundException e) {

            Log.e(TAG, "could not find dream overlay service");

        }



        // The overlay service is only registered when its component setting is enabled.

        boolean register = packageManager.getComponentEnabledSetting(mOverlayServiceComponent)

                == PackageManager.COMPONENT_ENABLED_STATE_ENABLED;



        if (mCurrentRegisteredState == register) {

            return;

        }