From 037c0f42b33239078df8de517a0756993e345063 Mon Sep 17 00:00:00 2001 From: August <2819763+Dangku@users.noreply.github.com> Date: Fri, 23 Feb 2024 21:57:15 +0800 Subject: [PATCH] Revert "Settings: disable hwc overlays default to fix screen flickering issue" This reverts commit 4238692344ff2108d2cd612638bd465ee129c1a9. --- .../com/android/settings/FallbackHome.java | 40 ------------------- 1 file changed, 40 deletions(-) diff --git a/packages/apps/Settings/src/com/android/settings/FallbackHome.java b/packages/apps/Settings/src/com/android/settings/FallbackHome.java index 316dac8129..40867aa072 100644 --- a/packages/apps/Settings/src/com/android/settings/FallbackHome.java +++ b/packages/apps/Settings/src/com/android/settings/FallbackHome.java @@ -17,7 +17,6 @@ package com.android.settings; import android.app.Activity; -import android.app.AppGlobals; import android.app.WallpaperColors; import android.app.WallpaperManager; import android.app.WallpaperManager.OnColorsChangedListener; @@ -26,12 +25,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.pm.ResolveInfo; -import android.content.pm.IPackageManager; import android.os.AsyncTask; -import android.os.IBinder; -import android.os.Parcel; -import android.os.RemoteException; -import android.os.ServiceManager; import android.os.Bundle; import android.os.Handler; import android.os.Message; @@ -53,13 +47,6 @@ public class FallbackHome extends Activity { private boolean mProvisioned; private WallpaperManager mWallManager; - private static final int SETTING_VALUE_ON = 1; - private static final String SURFACE_FLINGER_SERVICE_KEY = "SurfaceFlinger"; - private static final String SURFACE_COMPOSER_INTERFACE_KEY = "android.ui.ISurfaceComposer"; - private static final int SURFACE_FLINGER_DISABLE_OVERLAYS_CODE = 1008; - - private static IBinder mSurfaceFlinger; - private final Runnable mProgressTimeoutRunnable = () -> { View v = getLayoutInflater().inflate( R.layout.fallback_home_finishing_boot, null /* root */); @@ -112,37 +99,10 @@ public class FallbackHome extends Activity { } getWindow().getDecorView().setSystemUiVisibility(flags); - if (mSurfaceFlinger == null) { - mSurfaceFlinger = ServiceManager.getService(SURFACE_FLINGER_SERVICE_KEY); - } - - initHardwareOverlaysSetting(SETTING_VALUE_ON); - registerReceiver(mReceiver, new IntentFilter(Intent.ACTION_USER_UNLOCKED)); maybeFinish(); } - /* bpi, disable hwc overlays default */ - public void initHardwareOverlaysSetting(int val) { - if (mSurfaceFlinger == null) { - return; - } - - IPackageManager pm = AppGlobals.getPackageManager(); - // magic communication with surface flinger. - try { - if (pm.isFirstBoot()) { - final Parcel data = Parcel.obtain(); - data.writeInterfaceToken(SURFACE_COMPOSER_INTERFACE_KEY); - data.writeInt(val); - mSurfaceFlinger.transact(SURFACE_FLINGER_DISABLE_OVERLAYS_CODE, data, null, 0 /* flags */); - data.recycle(); - } - } catch (RemoteException ex) { - // intentional no-op - } - } - @Override protected void onResume() { super.onResume();