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

Commit 8c30cf2c authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Allow enforcingAdmin parameter to be nullable to address an NPE." into main

parents 78cb28df fc424bac

packages/SettingsLib/src/com/android/settingslib/enterprise/ActionDisabledByAdminController.java

+2 −2
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ public interface ActionDisabledByAdminController { 
    /**

     * Updates the enforcing admin

     */

    void updateEnforcingAdmin(@NonNull EnforcingAdmin admin);

    void updateEnforcingAdmin(@Nullable EnforcingAdmin admin);



    /**

     * Returns a listener for handling positive button clicks.
@@ -80,7 +80,7 @@ public interface ActionDisabledByAdminController { 
     */

    @Nullable

    default DialogInterface.OnClickListener getPositiveButtonListener(@NonNull Context context,

            @NonNull EnforcingAdmin enforcingAdmin) {

            @Nullable EnforcingAdmin enforcingAdmin) {

        return null;

    }

}

packages/SettingsLib/src/com/android/settingslib/enterprise/BaseActionDisabledByAdminController.java

+4 −3
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.annotation.UserIdInt; 
import android.app.admin.EnforcingAdmin;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;



import com.android.internal.util.Preconditions;

import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
@@ -34,7 +35,7 @@ abstract class BaseActionDisabledByAdminController 


    protected @UserIdInt int mEnforcementAdminUserId;

    protected EnforcedAdmin mEnforcedAdmin;

    protected EnforcingAdmin mEnforcingAdmin;

    protected @Nullable EnforcingAdmin mEnforcingAdmin;

    protected ActionDisabledLearnMoreButtonLauncher mLauncher;

    protected final DeviceAdminStringProvider mStringProvider;
@@ -55,9 +56,9 @@ abstract class BaseActionDisabledByAdminController 
    }



    @Override

    public final void updateEnforcingAdmin(@NonNull EnforcingAdmin admin) {

    public final void updateEnforcingAdmin(@Nullable EnforcingAdmin admin) {

        assertInitialized();

        mEnforcingAdmin = requireNonNull(admin, "admin cannot be null");

        mEnforcingAdmin = admin;

    }



    protected final void assertInitialized() {

packages/SettingsLib/src/com/android/settingslib/enterprise/SupervisedDeviceActionDisabledByAdminController.java

+2 −2
Original line number Diff line number Diff line
@@ -76,8 +76,8 @@ final class SupervisedDeviceActionDisabledByAdminController 
    @Nullable

    @Override

    public DialogInterface.OnClickListener getPositiveButtonListener(@NonNull Context context,

            @NonNull EnforcingAdmin enforcingAdmin) {

        if (TextUtils.isEmpty(enforcingAdmin.getPackageName())) {

            @Nullable EnforcingAdmin enforcingAdmin) {

        if (enforcingAdmin == null || TextUtils.isEmpty(enforcingAdmin.getPackageName())) {

            return null;

        }

        return getPositiveButtonListener(context, enforcingAdmin.getPackageName());