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

Merge "Remove configuration for enabling dream overlay service." into tm-qpr-dev

Browse Source
This commit is contained in:
Bryce Lee
2022-06-08 21:09:47 +00:00
committed by Android (Google) Code Review
parent aef0c2179a 6eba38702f
commit 90844a62e1
3 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/AndroidManifest.xml
View File

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

3
packages/SystemUI/res/values/config.xml
View File

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

26
packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayRegistrant.java
View File

@@ -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,23 +66,15 @@ public class DreamOverlayRegistrant extends CoreStartable {
final int enabledState =
packageManager.getComponentEnabledSetting(mOverlayServiceComponent);
// 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);
}
}
// The overlay service is only registered when its component setting is enabled.
boolean register = packageManager.getComponentEnabledSetting(mOverlayServiceComponent)
== PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
boolean register = false;
try {
register = packageManager.getServiceInfo(mOverlayServiceComponent,
PackageManager.GET_META_DATA).enabled;
} catch (NameNotFoundException e) {
Log.e(TAG, "could not find dream overlay service");
}
if (mCurrentRegisteredState == register) {
return;