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

Commit 4764fba1 authored by Heemin Seog's avatar Heemin Seog
Browse files

Modify aspects of the phone sysui which is not relevant to car sysui 

Don't use phone DozeServiceHost (which refers to phone sysui views). And
don't call notifyBiometricAuthModeChanged

Bug: 156400243
Test: atest android.server.wm.lifecycle.ActivityLifecycleTopResumedStateTests
Change-Id: I37e849141cc1ffe2e9bd8b0841ac33901ff845e9
Merged-In: I37e849141cc1ffe2e9bd8b0841ac33901ff845e9
parent 2a56a979

packages/CarSystemUI/src/com/android/systemui/CarSystemUIModule.java

+5 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import com.android.systemui.car.CarDeviceProvisionedControllerImpl; 
import com.android.systemui.car.keyguard.CarKeyguardViewController;

import com.android.systemui.car.statusbar.CarStatusBar;

import com.android.systemui.car.statusbar.CarStatusBarKeyguardViewManager;

import com.android.systemui.car.statusbar.DozeServiceHost;

import com.android.systemui.car.statusbar.DummyNotificationShadeWindowController;

import com.android.systemui.car.volume.CarVolumeDialogComponent;

import com.android.systemui.dagger.SystemUIRootComponent;
@@ -37,6 +38,7 @@ import com.android.systemui.dagger.qualifiers.Background; 
import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.dock.DockManager;

import com.android.systemui.dock.DockManagerImpl;

import com.android.systemui.doze.DozeHost;

import com.android.systemui.plugins.qs.QSFactory;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.power.EnhancedEstimates;
@@ -174,4 +176,7 @@ public abstract class CarSystemUIModule { 
    @Binds

    abstract NotificationShadeWindowController bindNotificationShadeWindowController(

            DummyNotificationShadeWindowController notificationShadeWindowController);



    @Binds

    abstract DozeHost bindDozeHost(DozeServiceHost dozeServiceHost);

}

packages/CarSystemUI/src/com/android/systemui/car/statusbar/CarStatusBar.java

+5 −0
Original line number Diff line number Diff line
@@ -424,6 +424,11 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
        // No op.

    }



    @Override

    public void notifyBiometricAuthModeChanged() {

        // No op.

    }



    @Override

    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        //When executing dump() function simultaneously, we need to serialize them

packages/CarSystemUI/src/com/android/systemui/car/statusbar/DozeServiceHost.java

0 → 100644
+130 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.car.statusbar;



import com.android.systemui.doze.DozeHost;



import javax.inject.Inject;

import javax.inject.Singleton;



/** No-op implementation of {@link DozeHost} for use by car sysui, which does not support dozing. */

@Singleton

public class DozeServiceHost implements DozeHost {



    @Inject

    public DozeServiceHost() {}



    @Override

    public void addCallback(Callback callback) {

        // No op.

    }



    @Override

    public void removeCallback(Callback callback) {

        // No op.

    }



    @Override

    public void startDozing() {

        // No op.

    }



    @Override

    public void pulseWhileDozing(PulseCallback callback, int reason) {

        // No op.

    }



    @Override

    public void stopDozing() {

        // No op.

    }



    @Override

    public void dozeTimeTick() {

        // No op.

    }



    @Override

    public boolean isPowerSaveActive() {

        return false;

    }



    @Override

    public boolean isPulsingBlocked() {

        return true;

    }



    @Override

    public boolean isProvisioned() {

        return false;

    }



    @Override

    public boolean isBlockingDoze() {

        return true;

    }



    @Override

    public void extendPulse(int reason) {

        // No op.

    }



    @Override

    public void setAnimateWakeup(boolean animateWakeup) {

        // No op.

    }



    @Override

    public void setAnimateScreenOff(boolean animateScreenOff) {

        // No op.

    }



    @Override

    public void onSlpiTap(float x, float y) {

        // No op.

    }



    @Override

    public void setDozeScreenBrightness(int value) {

        // No op.

    }



    @Override

    public void prepareForGentleSleep(Runnable onDisplayOffCallback) {

        // No op.

    }



    @Override

    public void cancelGentleSleep() {

        // No op.

    }



    @Override

    public void onIgnoreTouchWhilePulsing(boolean ignore) {

        // No op.

    }



    @Override

    public void stopPulsing() {

        // No op.

    }



    @Override

    public boolean isDozeSuppressed() {

        return true;

    }

}

packages/SystemUI/src/com/android/systemui/dagger/DependencyBinder.java

+0 −7
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import com.android.systemui.appops.AppOpsController; 
import com.android.systemui.appops.AppOpsControllerImpl;

import com.android.systemui.classifier.FalsingManagerProxy;

import com.android.systemui.controls.dagger.ControlsModule;

import com.android.systemui.doze.DozeHost;

import com.android.systemui.globalactions.GlobalActionsComponent;

import com.android.systemui.globalactions.GlobalActionsImpl;

import com.android.systemui.plugins.ActivityStarter;
@@ -38,7 +37,6 @@ import com.android.systemui.statusbar.NotificationRemoteInputManager; 
import com.android.systemui.statusbar.StatusBarStateControllerImpl;

import com.android.systemui.statusbar.SysuiStatusBarStateController;

import com.android.systemui.statusbar.phone.DarkIconDispatcherImpl;

import com.android.systemui.statusbar.phone.DozeServiceHost;

import com.android.systemui.statusbar.phone.ManagedProfileController;

import com.android.systemui.statusbar.phone.ManagedProfileControllerImpl;

import com.android.systemui.statusbar.phone.StatusBarIconController;
@@ -256,11 +254,6 @@ public abstract class DependencyBinder { 
    @Binds

    public abstract FalsingManager provideFalsingManager(FalsingManagerProxy falsingManagerImpl);



    /**

     */

    @Binds

    public abstract DozeHost provideDozeHost(DozeServiceHost dozeServiceHost);



    /**

     */

    @Binds

packages/SystemUI/src/com/android/systemui/dagger/SystemUIDefaultModule.java

+5 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import com.android.systemui.dagger.qualifiers.Background; 
import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.dock.DockManager;

import com.android.systemui.dock.DockManagerImpl;

import com.android.systemui.doze.DozeHost;

import com.android.systemui.plugins.qs.QSFactory;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.power.EnhancedEstimates;
@@ -43,6 +44,7 @@ import com.android.systemui.statusbar.CommandQueue; 
import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationLockscreenUserManagerImpl;

import com.android.systemui.statusbar.notification.NotificationEntryManager;

import com.android.systemui.statusbar.phone.DozeServiceHost;

import com.android.systemui.statusbar.phone.HeadsUpManagerPhone;

import com.android.systemui.statusbar.phone.KeyguardBypassController;

import com.android.systemui.statusbar.phone.KeyguardEnvironmentImpl;
@@ -148,4 +150,7 @@ public abstract class SystemUIDefaultModule { 
    @Binds

    abstract KeyguardViewController bindKeyguardViewController(

            StatusBarKeyguardViewManager statusBarKeyguardViewManager);



    @Binds

    abstract DozeHost provideDozeHost(DozeServiceHost dozeServiceHost);

}