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

Commit fe9059b1 authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

Also all EXTRA_USER as input for ACTION_SHOW_ADMIN_SUPPORT_DETAILS 

Test: Built
Bug: 116798569
Change-Id: Idbb1e7c6efbde57c00e96d7d9a2aefb233b94586
parent 035ea3b0

src/com/android/settings/enterprise/ActionDisabledByAdminDialog.java

+8 −4
Original line number Diff line number Diff line
@@ -59,12 +59,16 @@ public class ActionDisabledByAdminDialog extends Activity 
        }

        admin.component = intent.getParcelableExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN);



        if (intent.hasExtra(Intent.EXTRA_USER)) {

            admin.user = intent.getParcelableExtra(Intent.EXTRA_USER);

        } else {

            int userId = intent.getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId());

            if (userId == UserHandle.USER_NULL) {

                admin.user = null;

            } else {

                admin.user = UserHandle.of(userId);

            }

        }

        return admin;

    }