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

Commit c090b1e2 authored by Dave Mankoff's avatar Dave Mankoff Committed by Android Build Coastguard Worker
Browse files

Remove Dependency#get call from ToggleSeekBar. 

RestrictedLockUtils#getShowAdminSupportDetailsIntent signature change
such that it no longer requires a context.

Flag: NA
Bug: 138786270
Test: built and flashed
(cherry picked from commit 4db275f0)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:50341746d3b69ba34033e863c9f53c30c56aaa44)
Merged-In: If4ab3030cfa1f9faed5d099077e5e3bab2cba622
Change-Id: If4ab3030cfa1f9faed5d099077e5e3bab2cba622
parent 1b2e0e37

packages/SettingsLib/RestrictedLockUtils/src/com/android/settingslib/RestrictedLockUtils.java

+9 −2
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ public class RestrictedLockUtils { 
     */

    @RequiresApi(Build.VERSION_CODES.M)

    public static void sendShowAdminSupportDetailsIntent(Context context, EnforcedAdmin admin) {

        final Intent intent = getShowAdminSupportDetailsIntent(context, admin);

        final Intent intent = getShowAdminSupportDetailsIntent(admin);

        int targetUserId = UserHandle.myUserId();

        if (admin != null) {

            if (admin.user != null
@@ -98,9 +98,16 @@ public class RestrictedLockUtils { 
    }



    /**

     * Gets the intent to trigger the {@code android.settings.ShowAdminSupportDetailsDialog}.

     * @deprecated No context needed. Use {@link #getShowAdminSupportDetailsIntent(EnforcedAdmin)}.

     */

    public static Intent getShowAdminSupportDetailsIntent(Context context, EnforcedAdmin admin) {

        return getShowAdminSupportDetailsIntent(admin);

    }



    /**

     * Gets the intent to trigger the {@code android.settings.ShowAdminSupportDetailsDialog}.

     */

    public static Intent getShowAdminSupportDetailsIntent(EnforcedAdmin admin) {

        final Intent intent = new Intent(Settings.ACTION_SHOW_ADMIN_SUPPORT_DETAILS);

        if (admin != null) {

            if (admin.component != null) {

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/base/interactor/DisabledByPolicyInteractorTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ class DisabledByPolicyInteractorTest : SysuiTestCase() { 
                DisabledByPolicyInteractor.PolicyResult.TileDisabled(ADMIN)

            )



        val expectedIntent = RestrictedLockUtils.getShowAdminSupportDetailsIntent(context, ADMIN)

        val expectedIntent = RestrictedLockUtils.getShowAdminSupportDetailsIntent(ADMIN)

        assertThat(result).isTrue()

        verify(activityStarter).postStartActivityDismissingKeyguard(intentCaptor.capture(), any())

        assertThat(intentCaptor.value.filterEquals(expectedIntent)).isTrue()

packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -587,7 +587,7 @@ public abstract class QSTileImpl<TState extends State> implements QSTile, Lifecy 
                    name = "handleClick";

                    if (mState.disabledByPolicy) {

                        Intent intent = RestrictedLockUtils.getShowAdminSupportDetailsIntent(

                                mContext, mEnforcedAdmin);

                                mEnforcedAdmin);

                        mActivityStarter.postStartActivityDismissingKeyguard(intent, 0);

                    } else {

                        mQSLogger.logHandleClick(mTileSpec, msg.arg1);

packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailView.java

+2 −2
Original line number Diff line number Diff line
@@ -34,11 +34,11 @@ import com.android.internal.logging.UiEventLogger; 
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.settingslib.RestrictedLockUtils;

import com.android.settingslib.drawable.CircleFramedDrawable;

import com.android.systemui.res.R;

import com.android.systemui.plugins.FalsingManager;

import com.android.systemui.qs.PseudoGridView;

import com.android.systemui.qs.QSUserSwitcherEvent;

import com.android.systemui.qs.user.UserSwitchDialogController;

import com.android.systemui.res.R;

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

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

import com.android.systemui.statusbar.policy.UserSwitcherController;
@@ -186,7 +186,7 @@ public class UserDetailView extends PseudoGridView { 
                    (UserRecord) view.getTag();

            if (userRecord.isDisabledByAdmin()) {

                final Intent intent = RestrictedLockUtils.getShowAdminSupportDetailsIntent(

                        mContext, userRecord.enforcedAdmin);

                        userRecord.enforcedAdmin);

                mController.startActivity(intent);

            } else if (userRecord.isSwitchToEnabled) {

                MetricsLogger.action(mContext, MetricsEvent.QS_SWITCH_USER);

packages/SystemUI/src/com/android/systemui/qs/tiles/base/interactor/DisabledByPolicyInteractor.kt

+1 −4
Original line number Diff line number Diff line
@@ -96,10 +96,7 @@ constructor( 
            is PolicyResult.TileEnabled -> false

            is PolicyResult.TileDisabled -> {

                val intent =

                    RestrictedLockUtils.getShowAdminSupportDetailsIntent(

                        context,

                        policyResult.admin

                    )

                    RestrictedLockUtils.getShowAdminSupportDetailsIntent(policyResult.admin)

                activityStarter.postStartActivityDismissingKeyguard(intent, 0)

                true

            }