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

Commit 90881fed authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/22621774', 'googleplex-android-review.googlesource.com/24413934', 'googleplex-android-review.googlesource.com/24664788', 'googleplex-android-review.googlesource.com/24805434', 'googleplex-android-review.googlesource.com/24665127', 'googleplex-android-review.googlesource.com/25165838', 'googleplex-android-review.googlesource.com/25096532', 'googleplex-android-review.googlesource.com/25249793'] into security-aosp-tm-release.

Change-Id: I404ae7482475f8ec39c34dc5d456acaad7118442
parents d203ccf2 1175720b

core/java/android/service/dreams/DreamService.java

+11 −2
Original line number Diff line number Diff line
@@ -1192,8 +1192,17 @@ public class DreamService extends Service implements Window.Callback { 
        if (!flattenedString.contains("/")) {

            return new ComponentName(serviceInfo.packageName, flattenedString);

        }



        return ComponentName.unflattenFromString(flattenedString);

        // Ensure that the component is from the same package as the dream service. If not,

        // treat the component as invalid and return null instead.

        final ComponentName cn = ComponentName.unflattenFromString(flattenedString);

        if (cn == null) return null;

        if (!cn.getPackageName().equals(serviceInfo.packageName)) {

            Log.w(TAG,

                    "Inconsistent package name in component: " + cn.getPackageName()

                            + ", should be: " + serviceInfo.packageName);

            return null;

        }

        return cn;

    }



    /**

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

+17 −5
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ import com.android.systemui.log.SessionTracker; 
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;
@@ -250,6 +251,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
            showPrimarySecurityScreen(false);

        }

    };

    private final DeviceProvisionedController mDeviceProvisionedController;



    private KeyguardSecurityContainerController(KeyguardSecurityContainer view,

            AdminSecondaryLockScreenController.Factory adminSecondaryLockScreenControllerFactory,
@@ -267,7 +269,9 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
            UserSwitcherController userSwitcherController,

            FeatureFlags featureFlags,

            GlobalSettings globalSettings,

            SessionTracker sessionTracker) {

            SessionTracker sessionTracker,

            DeviceProvisionedController deviceProvisionedController

    ) {

        super(view);

        mLockPatternUtils = lockPatternUtils;

        mUpdateMonitor = keyguardUpdateMonitor;
@@ -287,6 +291,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
        mFeatureFlags = featureFlags;

        mGlobalSettings = globalSettings;

        mSessionTracker = sessionTracker;

        mDeviceProvisionedController = deviceProvisionedController;

    }



    @Override
@@ -469,8 +474,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;
@@ -676,6 +684,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
        private final FeatureFlags mFeatureFlags;

        private final UserSwitcherController mUserSwitcherController;

        private final SessionTracker mSessionTracker;

        private final DeviceProvisionedController mDeviceProvisionedController;



        @Inject

        Factory(KeyguardSecurityContainer view,
@@ -694,7 +703,8 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
                UserSwitcherController userSwitcherController,

                FeatureFlags featureFlags,

                GlobalSettings globalSettings,

                SessionTracker sessionTracker) {

                SessionTracker sessionTracker,

                DeviceProvisionedController deviceProvisionedController) {

            mView = view;

            mAdminSecondaryLockScreenControllerFactory = adminSecondaryLockScreenControllerFactory;

            mLockPatternUtils = lockPatternUtils;
@@ -711,6 +721,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
            mGlobalSettings = globalSettings;

            mUserSwitcherController = userSwitcherController;

            mSessionTracker = sessionTracker;

            mDeviceProvisionedController = deviceProvisionedController;

        }



        public KeyguardSecurityContainerController create(
@@ -720,7 +731,8 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
                    mKeyguardUpdateMonitor, mKeyguardSecurityModel, mMetricsLogger, mUiEventLogger,

                    mKeyguardStateController, securityCallback, mSecurityViewFlipperController,

                    mConfigurationController, mFalsingCollector, mFalsingManager,

                    mUserSwitcherController, mFeatureFlags, mGlobalSettings, mSessionTracker);

                    mUserSwitcherController, mFeatureFlags, mGlobalSettings, mSessionTracker,

                    mDeviceProvisionedController);

        }

    }

}

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;
@@ -144,6 +145,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);
@@ -176,6 +181,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/SystemStatusAnimationScheduler.kt

+3 −2
Original line number Diff line number Diff line
@@ -88,8 +88,9 @@ class SystemStatusAnimationScheduler @Inject constructor( 
    }



    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

+3 −1
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ import com.android.systemui.flags.FeatureFlags; 
import com.android.systemui.log.SessionTracker;

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;
@@ -164,7 +165,8 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase { 
                mKeyguardStateController, mKeyguardSecurityViewFlipperController,

                mConfigurationController, mFalsingCollector, mFalsingManager,

                mUserSwitcherController, mFeatureFlags, mGlobalSettings,

                mSessionTracker).create(mSecurityCallback);

                mSessionTracker, mock(DeviceProvisionedController.class))

                  .create(mSecurityCallback);

    }



    @Test