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

Commit d2aba2fc authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6790172 from 45c1b35d to rvc-qpr1-release 

Change-Id: I11ef672c96d02bad6b8170f45bb571c256acd7cd
parents 8fd233b9 45c1b35d

core/java/android/app/AppOpsManager.java

+24 −1
Original line number Diff line number Diff line
@@ -1139,9 +1139,17 @@ public class AppOpsManager { 
    // TODO: Add as AppProtoEnums

    public static final int OP_PHONE_CALL_CAMERA = 101;



    /**

     * Audio is being recorded for hotword detection.

     *

     * @hide

     */

    // TODO: Add as AppProtoEnums

    public static final int OP_RECORD_AUDIO_HOTWORD = 102;



    /** @hide */

    @UnsupportedAppUsage

    public static final int _NUM_OP = 102;

    public static final int _NUM_OP = 103;



    /** Access to coarse location information. */

    public static final String OPSTR_COARSE_LOCATION = "android:coarse_location";
@@ -1472,6 +1480,13 @@ public class AppOpsManager { 
     */

    public static final String OPSTR_PHONE_CALL_CAMERA = "android:phone_call_camera";



    /**

     * Audio is being recorded for hotword detection.

     *

     * @hide

     */

    public static final String OPSTR_RECORD_AUDIO_HOTWORD = "android:record_audio_hotword";



    /** {@link #sAppOpsToNote} not initialized yet for this op */

    private static final byte SHOULD_COLLECT_NOTE_OP_NOT_INITIALIZED = 0;

    /** Should not collect noting of this app-op in {@link #sAppOpsToNote} */
@@ -1663,6 +1678,7 @@ public class AppOpsManager { 
            OP_NO_ISOLATED_STORAGE,             // NO_ISOLATED_STORAGE

            OP_PHONE_CALL_MICROPHONE,           // OP_PHONE_CALL_MICROPHONE

            OP_PHONE_CALL_CAMERA,               // OP_PHONE_CALL_CAMERA

            OP_RECORD_AUDIO_HOTWORD,            // RECORD_AUDIO_HOTWORD

    };



    /**
@@ -1771,6 +1787,7 @@ public class AppOpsManager { 
            OPSTR_NO_ISOLATED_STORAGE,

            OPSTR_PHONE_CALL_MICROPHONE,

            OPSTR_PHONE_CALL_CAMERA,

            OPSTR_RECORD_AUDIO_HOTWORD,

    };



    /**
@@ -1880,6 +1897,7 @@ public class AppOpsManager { 
            "NO_ISOLATED_STORAGE",

            "PHONE_CALL_MICROPHONE",

            "PHONE_CALL_CAMERA",

            "RECORD_AUDIO_HOTWORD",

    };



    /**
@@ -1990,6 +2008,7 @@ public class AppOpsManager { 
            null, // no permission for OP_NO_ISOLATED_STORAGE

            null, // no permission for OP_PHONE_CALL_MICROPHONE

            null, // no permission for OP_PHONE_CALL_CAMERA

            null, // no permission for OP_RECORD_AUDIO_HOTWORD

    };



    /**
@@ -2100,6 +2119,7 @@ public class AppOpsManager { 
            null, // NO_ISOLATED_STORAGE

            null, // PHONE_CALL_MICROPHONE

            null, // PHONE_CALL_MICROPHONE

            null, // RECORD_AUDIO_HOTWORD

    };



    /**
@@ -2209,6 +2229,7 @@ public class AppOpsManager { 
            null, // NO_ISOLATED_STORAGE

            null, // PHONE_CALL_MICROPHONE

            null, // PHONE_CALL_CAMERA

            null, // RECORD_AUDIO_HOTWORD

    };



    /**
@@ -2317,6 +2338,7 @@ public class AppOpsManager { 
            AppOpsManager.MODE_ERRORED, // OP_NO_ISOLATED_STORAGE

            AppOpsManager.MODE_ALLOWED, // PHONE_CALL_MICROPHONE

            AppOpsManager.MODE_ALLOWED, // PHONE_CALL_CAMERA

            AppOpsManager.MODE_ALLOWED, // OP_RECORD_AUDIO_HOTWORD

    };



    /**
@@ -2429,6 +2451,7 @@ public class AppOpsManager { 
            true, // NO_ISOLATED_STORAGE

            false, // PHONE_CALL_MICROPHONE

            false, // PHONE_CALL_CAMERA

            false, // RECORD_AUDIO_HOTWORD

    };



    /**

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

+5 −4
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ import com.android.systemui.bubbles.dagger.BubbleModule; 
import com.android.systemui.car.navigationbar.CarNavigationBar;

import com.android.systemui.car.notification.CarNotificationModule;

import com.android.systemui.car.sideloaded.SideLoadedAppController;

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

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

import com.android.systemui.car.voicerecognition.ConnectedDeviceVoiceRecognitionNotifier;

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

import com.android.systemui.car.window.OverlayWindowModule;
@@ -34,7 +36,6 @@ import com.android.systemui.recents.Recents; 
import com.android.systemui.recents.RecentsModule;

import com.android.systemui.shortcut.ShortcutKeyDispatcher;

import com.android.systemui.stackdivider.Divider;

import com.android.systemui.statusbar.dagger.StatusBarModule;

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

import com.android.systemui.statusbar.notification.dagger.NotificationsModule;

import com.android.systemui.statusbar.phone.StatusBar;
@@ -48,9 +49,9 @@ import dagger.multibindings.ClassKey; 
import dagger.multibindings.IntoMap;



/** Binder for car specific {@link SystemUI} modules. */

@Module(includes = {RecentsModule.class, StatusBarModule.class, NotificationsModule.class,

@Module(includes = {RecentsModule.class, NotificationsModule.class,

        BubbleModule.class, KeyguardModule.class, OverlayWindowModule.class,

        CarNotificationModule.class})

        CarNotificationModule.class, UnusedStatusBarModule.class})

public abstract class CarSystemUIBinder {

    /** Inject into AuthController. */

    @Binds
@@ -153,7 +154,7 @@ public abstract class CarSystemUIBinder { 
    @Binds

    @IntoMap

    @ClassKey(StatusBar.class)

    public abstract SystemUI bindsStatusBar(StatusBar sysui);

    public abstract SystemUI bindsStatusBar(UnusedStatusBar sysui);



    /** Inject into VolumeUI. */

    @Binds

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.DozeServiceHost;

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

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

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

import com.android.systemui.dagger.SystemUIRootComponent;

import com.android.systemui.dagger.qualifiers.Background;
@@ -57,6 +58,7 @@ import com.android.systemui.statusbar.phone.NotificationGroupManager; 
import com.android.systemui.statusbar.phone.NotificationShadeWindowController;

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

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

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

import com.android.systemui.statusbar.policy.BatteryController;

import com.android.systemui.statusbar.policy.BatteryControllerImpl;

import com.android.systemui.statusbar.policy.ConfigurationController;
@@ -175,4 +177,7 @@ public abstract class CarSystemUIModule { 


    @Binds

    abstract DozeHost bindDozeHost(DozeServiceHost dozeServiceHost);



    @Binds

    abstract StatusBar bindStatusBar(UnusedStatusBar statusBar);

}

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

0 → 100644
+224 −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 android.content.Context;

import android.os.Handler;

import android.os.PowerManager;

import android.util.DisplayMetrics;



import com.android.internal.logging.MetricsLogger;

import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.keyguard.ViewMediatorCallback;

import com.android.systemui.InitController;

import com.android.systemui.assist.AssistManager;

import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.bubbles.BubbleController;

import com.android.systemui.colorextraction.SysuiColorExtractor;

import com.android.systemui.keyguard.DismissCallbackRegistry;

import com.android.systemui.keyguard.KeyguardViewMediator;

import com.android.systemui.keyguard.ScreenLifecycle;

import com.android.systemui.keyguard.WakefulnessLifecycle;

import com.android.systemui.plugins.DarkIconDispatcher;

import com.android.systemui.plugins.FalsingManager;

import com.android.systemui.plugins.PluginDependencyProvider;

import com.android.systemui.recents.Recents;

import com.android.systemui.recents.ScreenPinningRequest;

import com.android.systemui.shared.plugins.PluginManager;

import com.android.systemui.stackdivider.Divider;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.KeyguardIndicationController;

import com.android.systemui.statusbar.NavigationBarController;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationMediaManager;

import com.android.systemui.statusbar.NotificationRemoteInputManager;

import com.android.systemui.statusbar.NotificationShadeDepthController;

import com.android.systemui.statusbar.NotificationViewHierarchyManager;

import com.android.systemui.statusbar.PulseExpansionHandler;

import com.android.systemui.statusbar.SuperStatusBarViewFactory;

import com.android.systemui.statusbar.SysuiStatusBarStateController;

import com.android.systemui.statusbar.VibratorHelper;

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

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

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

import com.android.systemui.statusbar.notification.init.NotificationsController;

import com.android.systemui.statusbar.notification.interruption.BypassHeadsUpNotifier;

import com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProvider;

import com.android.systemui.statusbar.notification.logging.NotificationLogger;

import com.android.systemui.statusbar.notification.row.NotificationGutsManager;

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

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

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

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

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.KeyguardDismissUtil;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

import com.android.systemui.statusbar.phone.dagger.StatusBarComponent;

import com.android.systemui.statusbar.policy.BatteryController;

import com.android.systemui.statusbar.policy.ConfigurationController;

import com.android.systemui.statusbar.policy.DeviceProvisionedController;

import com.android.systemui.statusbar.policy.ExtensionController;

import com.android.systemui.statusbar.policy.KeyguardStateController;

import com.android.systemui.statusbar.policy.NetworkController;

import com.android.systemui.statusbar.policy.RemoteInputQuickSettingsDisabler;

import com.android.systemui.statusbar.policy.UserInfoControllerImpl;

import com.android.systemui.statusbar.policy.UserSwitcherController;

import com.android.systemui.volume.VolumeComponent;



import java.util.Optional;

import java.util.concurrent.Executor;



import javax.inject.Provider;



import dagger.Lazy;



/** Unused variant of {@link StatusBar} specifically used in the automotive context. */

public class UnusedStatusBar extends StatusBar {



    public UnusedStatusBar(Context context,

            NotificationsController notificationsController,

            LightBarController lightBarController,

            AutoHideController autoHideController,

            KeyguardUpdateMonitor keyguardUpdateMonitor,

            StatusBarIconController statusBarIconController,

            PulseExpansionHandler pulseExpansionHandler,

            NotificationWakeUpCoordinator notificationWakeUpCoordinator,

            KeyguardBypassController keyguardBypassController,

            KeyguardStateController keyguardStateController,

            HeadsUpManagerPhone headsUpManagerPhone,

            DynamicPrivacyController dynamicPrivacyController,

            BypassHeadsUpNotifier bypassHeadsUpNotifier,

            FalsingManager falsingManager,

            BroadcastDispatcher broadcastDispatcher,

            RemoteInputQuickSettingsDisabler remoteInputQuickSettingsDisabler,

            NotificationGutsManager notificationGutsManager,

            NotificationLogger notificationLogger,

            NotificationInterruptStateProvider notificationInterruptStateProvider,

            NotificationViewHierarchyManager notificationViewHierarchyManager,

            KeyguardViewMediator keyguardViewMediator,

            DisplayMetrics displayMetrics,

            MetricsLogger metricsLogger,

            Executor uiBgExecutor,

            NotificationMediaManager notificationMediaManager,

            NotificationLockscreenUserManager lockScreenUserManager,

            NotificationRemoteInputManager remoteInputManager,

            UserSwitcherController userSwitcherController,

            NetworkController networkController,

            BatteryController batteryController,

            SysuiColorExtractor colorExtractor,

            ScreenLifecycle screenLifecycle,

            WakefulnessLifecycle wakefulnessLifecycle,

            SysuiStatusBarStateController statusBarStateController,

            VibratorHelper vibratorHelper,

            BubbleController bubbleController,

            NotificationGroupManager groupManager,

            VisualStabilityManager visualStabilityManager,

            DeviceProvisionedController deviceProvisionedController,

            NavigationBarController navigationBarController,

            Lazy<AssistManager> assistManagerLazy,

            ConfigurationController configurationController,

            NotificationShadeWindowController notificationShadeWindowController,

            LockscreenLockIconController lockscreenLockIconController,

            DozeParameters dozeParameters,

            ScrimController scrimController,

            KeyguardLiftController keyguardLiftController,

            Lazy<LockscreenWallpaper> lockscreenWallpaperLazy,

            Lazy<BiometricUnlockController> biometricUnlockControllerLazy,

            DozeServiceHost dozeServiceHost,

            PowerManager powerManager,

            ScreenPinningRequest screenPinningRequest,

            DozeScrimController dozeScrimController,

            VolumeComponent volumeComponent,

            CommandQueue commandQueue,

            Optional<Recents> recentsOptional,

            Provider<StatusBarComponent.Builder> statusBarComponentBuilder,

            PluginManager pluginManager,

            Optional<Divider> dividerOptional,

            LightsOutNotifController lightsOutNotifController,

            StatusBarNotificationActivityStarter.Builder statusBarNotifActivityStarterBuilder,

            ShadeController shadeController,

            SuperStatusBarViewFactory superStatusBarViewFactory,

            StatusBarKeyguardViewManager statusBarKeyguardViewManager,

            ViewMediatorCallback viewMediatorCallback,

            InitController initController,

            DarkIconDispatcher darkIconDispatcher,

            Handler timeTickHandler,

            PluginDependencyProvider pluginDependencyProvider,

            KeyguardDismissUtil keyguardDismissUtil,

            ExtensionController extensionController,

            UserInfoControllerImpl userInfoControllerImpl,

            PhoneStatusBarPolicy phoneStatusBarPolicy,

            KeyguardIndicationController keyguardIndicationController,

            DismissCallbackRegistry dismissCallbackRegistry,

            Lazy<NotificationShadeDepthController> notificationShadeDepthControllerLazy,

            StatusBarTouchableRegionManager statusBarTouchableRegionManager) {

        super(context, notificationsController, lightBarController, autoHideController,

                keyguardUpdateMonitor, statusBarIconController, pulseExpansionHandler,

                notificationWakeUpCoordinator, keyguardBypassController, keyguardStateController,

                headsUpManagerPhone, dynamicPrivacyController, bypassHeadsUpNotifier,

                falsingManager,

                broadcastDispatcher, remoteInputQuickSettingsDisabler, notificationGutsManager,

                notificationLogger, notificationInterruptStateProvider,

                notificationViewHierarchyManager, keyguardViewMediator, displayMetrics,

                metricsLogger,

                uiBgExecutor, notificationMediaManager, lockScreenUserManager, remoteInputManager,

                userSwitcherController, networkController, batteryController, colorExtractor,

                screenLifecycle, wakefulnessLifecycle, statusBarStateController, vibratorHelper,

                bubbleController, groupManager, visualStabilityManager, deviceProvisionedController,

                navigationBarController, assistManagerLazy, configurationController,

                notificationShadeWindowController, lockscreenLockIconController, dozeParameters,

                scrimController, keyguardLiftController, lockscreenWallpaperLazy,

                biometricUnlockControllerLazy, dozeServiceHost, powerManager, screenPinningRequest,

                dozeScrimController, volumeComponent, commandQueue, recentsOptional,

                statusBarComponentBuilder, pluginManager, dividerOptional, lightsOutNotifController,

                statusBarNotifActivityStarterBuilder, shadeController, superStatusBarViewFactory,

                statusBarKeyguardViewManager, viewMediatorCallback, initController,

                darkIconDispatcher,

                timeTickHandler, pluginDependencyProvider, keyguardDismissUtil, extensionController,

                userInfoControllerImpl, phoneStatusBarPolicy, keyguardIndicationController,

                dismissCallbackRegistry, notificationShadeDepthControllerLazy,

                statusBarTouchableRegionManager);

    }



    @Override

    public void notifyBiometricAuthModeChanged() {

        // No-op for Automotive devices.

    }



    @Override

    public NavigationBarView getNavigationBarView() {

        // Return null for Automotive devices.

        return null;

    }

}

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

0 → 100644
+285 −0

File added.

Preview size limit exceeded, changes collapsed.