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

Commit 325ab28d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[Disable Flags] Add disable flag logging to... 

Merge "[Disable Flags] Add disable flag logging to CollapsedStatusBarFragment." into sc-v2-dev am: 1c3b83a5 am: a0c07c37

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

Change-Id: I8f34835f6ea3c8033e8b69d683e8fd8554137700
parents f18c7804 a0c07c37

packages/SystemUI/src/com/android/systemui/log/dagger/CollapsedSbFragmentLog.java

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

 * Copyright (C) 2019 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.log.dagger;



import static java.lang.annotation.RetentionPolicy.RUNTIME;



import com.android.systemui.log.LogBuffer;



import java.lang.annotation.Documented;

import java.lang.annotation.Retention;



import javax.inject.Qualifier;



/**

 * A {@link LogBuffer} for

 * {@link com.android.systemui.statusbar.phone.CollapsedStatusBarFragment}-related messages.

 */

@Qualifier

@Documented

@Retention(RUNTIME)

public @interface CollapsedSbFragmentLog {

}

packages/SystemUI/src/com/android/systemui/log/dagger/LogModule.java

+11 −0
Original line number Original line Diff line number Diff line
@@ -100,6 +100,17 @@ public class LogModule { 
        return factory.create("PrivacyLog", 100);

        return factory.create("PrivacyLog", 100);

    }

    }





    /**

     * Provides a logging buffer for

     * {@link com.android.systemui.statusbar.phone.CollapsedStatusBarFragment}.

     */

    @Provides

    @SysUISingleton

    @CollapsedSbFragmentLog

    public static LogBuffer provideCollapsedSbFragmentLogBuffer(LogBufferFactory factory) {

        return factory.create("CollapsedSbFragmentLog", 20);

    }



    /** Allows logging buffers to be tweaked via adb on debug builds but not on prod builds. */

    /** Allows logging buffers to be tweaked via adb on debug builds but not on prod builds. */

    @Provides

    @Provides

    @SysUISingleton

    @SysUISingleton

packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java

+11 −0
Original line number Original line Diff line number Diff line
@@ -42,6 +42,7 @@ import com.android.systemui.animation.Interpolators; 
import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.flags.FeatureFlags;

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

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

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.DisableFlagsLogger.DisableState;

import com.android.systemui.statusbar.OperatorNameView;

import com.android.systemui.statusbar.OperatorNameView;

import com.android.systemui.statusbar.OperatorNameViewController;

import com.android.systemui.statusbar.OperatorNameViewController;

import com.android.systemui.statusbar.StatusBarState;

import com.android.systemui.statusbar.StatusBarState;
@@ -93,6 +94,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue 
    private Lazy<Optional<StatusBar>> mStatusBarOptionalLazy;

    private Lazy<Optional<StatusBar>> mStatusBarOptionalLazy;

    private DarkIconManager mDarkIconManager;

    private DarkIconManager mDarkIconManager;

    private final CommandQueue mCommandQueue;

    private final CommandQueue mCommandQueue;

    private final CollapsedStatusBarFragmentLogger mCollapsedStatusBarFragmentLogger;

    private final OperatorNameViewController.Factory mOperatorNameViewControllerFactory;

    private final OperatorNameViewController.Factory mOperatorNameViewControllerFactory;

    private final OngoingCallController mOngoingCallController;

    private final OngoingCallController mOngoingCallController;

    private final SystemStatusAnimationScheduler mAnimationScheduler;

    private final SystemStatusAnimationScheduler mAnimationScheduler;
@@ -131,6 +133,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue 
            StatusBarStateController statusBarStateController,

            StatusBarStateController statusBarStateController,

            Lazy<Optional<StatusBar>> statusBarOptionalLazy,

            Lazy<Optional<StatusBar>> statusBarOptionalLazy,

            CommandQueue commandQueue,

            CommandQueue commandQueue,

            CollapsedStatusBarFragmentLogger collapsedStatusBarFragmentLogger,

            OperatorNameViewController.Factory operatorNameViewControllerFactory

            OperatorNameViewController.Factory operatorNameViewControllerFactory

    ) {

    ) {

        mOngoingCallController = ongoingCallController;

        mOngoingCallController = ongoingCallController;
@@ -144,6 +147,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue 
        mStatusBarStateController = statusBarStateController;

        mStatusBarStateController = statusBarStateController;

        mStatusBarOptionalLazy = statusBarOptionalLazy;

        mStatusBarOptionalLazy = statusBarOptionalLazy;

        mCommandQueue = commandQueue;

        mCommandQueue = commandQueue;

        mCollapsedStatusBarFragmentLogger = collapsedStatusBarFragmentLogger;

        mOperatorNameViewControllerFactory = operatorNameViewControllerFactory;

        mOperatorNameViewControllerFactory = operatorNameViewControllerFactory;

    }

    }
@@ -244,7 +248,14 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue 
        if (displayId != getContext().getDisplayId()) {

        if (displayId != getContext().getDisplayId()) {

            return;

            return;

        }

        }



        int state1BeforeAdjustment = state1;

        state1 = adjustDisableFlags(state1);

        state1 = adjustDisableFlags(state1);



        mCollapsedStatusBarFragmentLogger.logDisableFlagChange(

                new DisableState(state1BeforeAdjustment, state2),

                new DisableState(state1, state2));



        final int old1 = mDisabled1;

        final int old1 = mDisabled1;

        final int diff1 = state1 ^ old1;

        final int diff1 = state1 ^ old1;

        final int old2 = mDisabled2;

        final int old2 = mDisabled2;

packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragmentLogger.kt

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

 * Copyright (C) 2021 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.statusbar.phone



import com.android.systemui.log.LogBuffer

import com.android.systemui.log.LogLevel

import com.android.systemui.log.dagger.CollapsedSbFragmentLog

import com.android.systemui.statusbar.DisableFlagsLogger

import javax.inject.Inject



/** Used by [CollapsedStatusBarFragment] to log messages to a [LogBuffer]. */

class CollapsedStatusBarFragmentLogger @Inject constructor(

        @CollapsedSbFragmentLog private val buffer: LogBuffer,

        private val disableFlagsLogger: DisableFlagsLogger,

) {



    /** Logs a string representing the old and new disable flag states to [buffer]. */

    fun logDisableFlagChange(

            oldState: DisableFlagsLogger.DisableState,

            newState: DisableFlagsLogger.DisableState) {

        buffer.log(

                TAG,

                LogLevel.INFO,

                {

                    int1 = oldState.disable1

                    int2 = oldState.disable2

                    long1 = newState.disable1.toLong()

                    long2 = newState.disable2.toLong()

                },

                {

                    disableFlagsLogger.getDisableFlagsString(

                            DisableFlagsLogger.DisableState(int1, int2),

                            DisableFlagsLogger.DisableState(long1.toInt(), long2.toInt())

                    )

                }

        )

    }

}



private const val TAG = "CollapsedSbFragment"
 
 No newline at end of file

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -454,6 +454,7 @@ public class StatusBar extends SystemUI implements 
    @Nullable

    @Nullable

    protected LockscreenWallpaper mLockscreenWallpaper;

    protected LockscreenWallpaper mLockscreenWallpaper;

    private final AutoHideController mAutoHideController;

    private final AutoHideController mAutoHideController;

    private final CollapsedStatusBarFragmentLogger mCollapsedStatusBarFragmentLogger;





    private final Point mCurrentDisplaySize = new Point();

    private final Point mCurrentDisplaySize = new Point();
@@ -743,6 +744,7 @@ public class StatusBar extends SystemUI implements 
            DozeScrimController dozeScrimController,

            DozeScrimController dozeScrimController,

            VolumeComponent volumeComponent,

            VolumeComponent volumeComponent,

            CommandQueue commandQueue,

            CommandQueue commandQueue,

            CollapsedStatusBarFragmentLogger collapsedStatusBarFragmentLogger,

            StatusBarComponent.Factory statusBarComponentFactory,

            StatusBarComponent.Factory statusBarComponentFactory,

            PluginManager pluginManager,

            PluginManager pluginManager,

            Optional<LegacySplitScreen> splitScreenOptional,

            Optional<LegacySplitScreen> splitScreenOptional,
@@ -842,6 +844,7 @@ public class StatusBar extends SystemUI implements 
        mNotificationShadeDepthControllerLazy = notificationShadeDepthControllerLazy;

        mNotificationShadeDepthControllerLazy = notificationShadeDepthControllerLazy;

        mVolumeComponent = volumeComponent;

        mVolumeComponent = volumeComponent;

        mCommandQueue = commandQueue;

        mCommandQueue = commandQueue;

        mCollapsedStatusBarFragmentLogger = collapsedStatusBarFragmentLogger;

        mStatusBarComponentFactory = statusBarComponentFactory;

        mStatusBarComponentFactory = statusBarComponentFactory;

        mPluginManager = pluginManager;

        mPluginManager = pluginManager;

        mSplitScreenOptional = splitScreenOptional;

        mSplitScreenOptional = splitScreenOptional;
@@ -1215,6 +1218,7 @@ public class StatusBar extends SystemUI implements 
                                mStatusBarStateController,

                                mStatusBarStateController,

                                () -> Optional.of(this),

                                () -> Optional.of(this),

                                mCommandQueue,

                                mCommandQueue,

                                mCollapsedStatusBarFragmentLogger,

                                mOperatorNameViewControllerFactory

                                mOperatorNameViewControllerFactory

                        ),

                        ),

                        CollapsedStatusBarFragment.TAG)

                        CollapsedStatusBarFragment.TAG)