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

Commit 51b50236 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24413225',... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24413225', 'googleplex-android-review.googlesource.com/24665407', 'googleplex-android-review.googlesource.com/24805656', 'googleplex-android-review.googlesource.com/24664848', 'googleplex-android-review.googlesource.com/25165839', 'googleplex-android-review.googlesource.com/25096530'] into security-aosp-udc-release.

Change-Id: I5439746628fdd1059f312ccb4bb3ac4f33ea578d
parents 2e2bd22c bdf1cce5

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java

+9 −2
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ import com.android.systemui.plugins.ActivityStarter; 
import com.android.systemui.plugins.FalsingManager;

import com.android.systemui.shared.system.SysUiStatsLog;

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

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

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

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

import com.android.systemui.util.ViewController;
@@ -362,6 +363,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
                    showPrimarySecurityScreen(false);

                }

            };

    private final DeviceProvisionedController mDeviceProvisionedController;



    @Inject

    public KeyguardSecurityContainerController(KeyguardSecurityContainer view,
@@ -377,6 +379,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
            FalsingCollector falsingCollector,

            FalsingManager falsingManager,

            UserSwitcherController userSwitcherController,

            DeviceProvisionedController deviceProvisionedController,

            FeatureFlags featureFlags,

            GlobalSettings globalSettings,

            SessionTracker sessionTracker,
@@ -411,6 +414,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
        mViewMediatorCallback = viewMediatorCallback;

        mAudioManager = audioManager;

        mKeyguardFaceAuthInteractor = keyguardFaceAuthInteractor;

        mDeviceProvisionedController = deviceProvisionedController;

    }



    @Override
@@ -763,8 +767,11 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
                case SimPuk:

                    // Shortcut for SIM PIN/PUK to go to directly to user's security screen or home

                    SecurityMode securityMode = mSecurityModel.getSecurityMode(targetUserId);

                    if (securityMode == SecurityMode.None || mLockPatternUtils.isLockScreenDisabled(

                            KeyguardUpdateMonitor.getCurrentUser())) {

                    boolean isLockscreenDisabled = mLockPatternUtils.isLockScreenDisabled(

                            KeyguardUpdateMonitor.getCurrentUser())

                            || !mDeviceProvisionedController.isUserSetup(targetUserId);



                    if (securityMode == SecurityMode.None && isLockscreenDisabled) {

                        finish = true;

                        eventSubtype = BOUNCER_DISMISS_SIM;

                        uiEvent = BouncerUiEvent.BOUNCER_DISMISS_SIM;

packages/SystemUI/src/com/android/systemui/appops/AppOpsControllerImpl.java

+28 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ import com.android.systemui.util.time.SystemClock; 
import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.List;

import java.util.Map;

import java.util.Set;



import javax.inject.Inject;
@@ -145,6 +146,10 @@ public class AppOpsControllerImpl extends BroadcastReceiver implements AppOpsCon 
    protected void setListening(boolean listening) {

        mListening = listening;

        if (listening) {

            // System UI could be restarted while ops are active, so fetch the currently active ops

            // once System UI starts listening again.

            fetchCurrentActiveOps();



            mAppOps.startWatchingActive(OPS, this);

            mAppOps.startWatchingNoted(OPS, this);

            mAudioManager.registerAudioRecordingCallback(mAudioRecordingCallback, mBGHandler);
@@ -177,6 +182,29 @@ public class AppOpsControllerImpl extends BroadcastReceiver implements AppOpsCon 
        }

    }



    private void fetchCurrentActiveOps() {

        List<AppOpsManager.PackageOps> packageOps = mAppOps.getPackagesForOps(OPS);

        for (AppOpsManager.PackageOps op : packageOps) {

            for (AppOpsManager.OpEntry entry : op.getOps()) {

                for (Map.Entry<String, AppOpsManager.AttributedOpEntry> attributedOpEntry :

                        entry.getAttributedOpEntries().entrySet()) {

                    if (attributedOpEntry.getValue().isRunning()) {

                        onOpActiveChanged(

                                entry.getOpStr(),

                                op.getUid(),

                                op.getPackageName(),

                                /* attributionTag= */ attributedOpEntry.getKey(),

                                /* active= */ true,

                                // AppOpsManager doesn't have a way to fetch attribution flags or

                                // chain ID given an op entry, so default them to none.

                                AppOpsManager.ATTRIBUTION_FLAGS_NONE,

                                AppOpsManager.ATTRIBUTION_CHAIN_ID_NONE);

                    }

                }

            }

        }

    }



    /**

     * Adds a callback that will get notifified when an AppOp of the type the controller tracks

     * changes

packages/SystemUI/src/com/android/systemui/statusbar/events/SystemStatusAnimationSchedulerImpl.kt

+3 −2
Original line number Diff line number Diff line
@@ -128,8 +128,9 @@ constructor( 
    override fun onStatusEvent(event: StatusEvent) {

        Assert.isMainThread()



        // Ignore any updates until the system is up and running

        if (isTooEarly() || !isImmersiveIndicatorEnabled()) {

        // Ignore any updates until the system is up and running. However, for important events that

        // request to be force visible (like privacy), ignore whether it's too early.

        if ((isTooEarly() && !event.forceVisible) || !isImmersiveIndicatorEnabled()) {

            return

        }

packages/SystemUI/src/com/android/systemui/statusbar/events/SystemStatusAnimationSchedulerLegacyImpl.kt

+3 −2
Original line number Diff line number Diff line
@@ -93,8 +93,9 @@ constructor( 
    @SystemAnimationState override fun getAnimationState() = animationState



    override fun onStatusEvent(event: StatusEvent) {

        // Ignore any updates until the system is up and running

        if (isTooEarly() || !isImmersiveIndicatorEnabled()) {

        // Ignore any updates until the system is up and running. However, for important events that

        // request to be force visible (like privacy), ignore whether it's too early.

        if ((isTooEarly() && !event.forceVisible) || !isImmersiveIndicatorEnabled()) {

            return

        }

packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.java

+2 −1
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ import com.android.systemui.log.SessionTracker; 
import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.plugins.FalsingManager;

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

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

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

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

import com.android.systemui.util.settings.GlobalSettings;
@@ -213,7 +214,7 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase { 
                mKeyguardUpdateMonitor, mKeyguardSecurityModel, mMetricsLogger, mUiEventLogger,

                mKeyguardStateController, mKeyguardSecurityViewFlipperController,

                mConfigurationController, mFalsingCollector, mFalsingManager,

                mUserSwitcherController, mFeatureFlags, mGlobalSettings,

                mUserSwitcherController, mock(DeviceProvisionedController.class), mFeatureFlags, mGlobalSettings,

                mSessionTracker, Optional.of(mSideFpsController), mFalsingA11yDelegate,

                mTelephonyManager, mViewMediatorCallback, mAudioManager,

                mock(KeyguardFaceAuthInteractor.class));