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

Merge "Force update the disable flags following status bar registration" into tm-qpr-dev

Browse Source
This commit is contained in:
Winson Chung
2022-12-14 22:15:40 +00:00
committed by Android (Google) Code Review
parent a1e82f2ba5 89c94f0abb
commit ef1f84f5f1
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
View File

@@ -16,6 +16,7 @@
package com.android.systemui.statusbar.phone; package com.android.systemui.statusbar.phone;
import static android.app.StatusBarManager.DISABLE_HOME;
import static android.app.StatusBarManager.WINDOW_STATE_HIDDEN; import static android.app.StatusBarManager.WINDOW_STATE_HIDDEN;
import static android.app.StatusBarManager.WINDOW_STATE_SHOWING; import static android.app.StatusBarManager.WINDOW_STATE_SHOWING;
import static android.app.StatusBarManager.WindowVisibleState; import static android.app.StatusBarManager.WindowVisibleState;
@@ -70,6 +71,7 @@ import android.graphics.Point;
import android.hardware.devicestate.DeviceStateManager; import android.hardware.devicestate.DeviceStateManager;
import android.metrics.LogMaker; import android.metrics.LogMaker;
import android.net.Uri; import android.net.Uri;
import android.os.Binder;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
@@ -1047,8 +1049,21 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces {
// set the initial view visibility // set the initial view visibility
int disabledFlags1 = result.mDisabledFlags1; int disabledFlags1 = result.mDisabledFlags1;
int disabledFlags2 = result.mDisabledFlags2; int disabledFlags2 = result.mDisabledFlags2;
mInitController.addPostInitTask( mInitController.addPostInitTask(() -> {
() -> setUpDisableFlags(disabledFlags1, disabledFlags2)); setUpDisableFlags(disabledFlags1, disabledFlags2);
try {
// NOTE(b/262059863): Force-update the disable flags after applying the flags
// returned from registerStatusBar(). The result's disabled flags may be stale
// if StatusBarManager's disabled flags are updated between registering the bar and
// this handling this post-init task. We force an update in this case, and use a new
// token to not conflict with any other disabled flags already requested by SysUI
Binder token = new Binder();
mBarService.disable(DISABLE_HOME, token, mContext.getPackageName());
mBarService.disable(0, token, mContext.getPackageName());
} catch (RemoteException ex) {
ex.rethrowFromSystemServer();
}
});
mFalsingManager.addFalsingBeliefListener(mFalsingBeliefListener); mFalsingManager.addFalsingBeliefListener(mFalsingBeliefListener);