PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update DPM.setProfileOwner call in DeviceAdminAdd

Browse Source 
As DPM.setProfileOwner no longer takes ownerName as an argument, update
call in DeviceAdminAdd to reflect change.

Bug: 240562946
Test: n/a
Change-Id: I2c18e946d73e35659fb1779ca428e8680524d730
This commit is contained in:
Eghosa Ewansiha-Vlachavas
2022-09-02 10:46:04 +00:00
parent 4d6e33e3e8
commit 07695a5859
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
View File

@@ -123,7 +123,6 @@ public class DeviceAdminAdd extends CollapsingToolbarBaseActivity {
AppOpsManager mAppOps; AppOpsManager mAppOps;
DeviceAdminInfo mDeviceAdmin; DeviceAdminInfo mDeviceAdmin;
String mAddMsgText; String mAddMsgText;
String mProfileOwnerName;
ImageView mAdminIcon; ImageView mAdminIcon;
TextView mAdminName; TextView mAdminName;
@@ -189,8 +188,6 @@ public class DeviceAdminAdd extends CollapsingToolbarBaseActivity {
setResult(RESULT_CANCELED); setResult(RESULT_CANCELED);
setFinishOnTouchOutside(true); setFinishOnTouchOutside(true);
mAddingProfileOwner = true; mAddingProfileOwner = true;
mProfileOwnerName =
getIntent().getStringExtra(DevicePolicyManager.EXTRA_PROFILE_OWNER_NAME);
String callingPackage = getCallingPackage(); String callingPackage = getCallingPackage();
if (callingPackage == null || !callingPackage.equals(who.getPackageName())) { if (callingPackage == null || !callingPackage.equals(who.getPackageName())) {
Log.e(TAG, "Unknown or incorrect caller"); Log.e(TAG, "Unknown or incorrect caller");
@@ -338,6 +335,8 @@ public class DeviceAdminAdd extends CollapsingToolbarBaseActivity {
.create(); .create();
dialog.show(); dialog.show();
String profileOwnerName =
getIntent().getStringExtra(DevicePolicyManager.EXTRA_PROFILE_OWNER_NAME);
mActionButton = ((AlertDialog) dialog).getButton(DialogInterface.BUTTON_POSITIVE); mActionButton = ((AlertDialog) dialog).getButton(DialogInterface.BUTTON_POSITIVE);
mActionButton.setFilterTouchesWhenObscured(true); mActionButton.setFilterTouchesWhenObscured(true);
mAddMsg = dialog.findViewById(R.id.add_msg_simplified); mAddMsg = dialog.findViewById(R.id.add_msg_simplified);
@@ -346,7 +345,7 @@ public class DeviceAdminAdd extends CollapsingToolbarBaseActivity {
mAdminWarning.setText( mAdminWarning.setText(
mDPM.getResources().getString(NEW_DEVICE_ADMIN_WARNING_SIMPLIFIED, () -> mDPM.getResources().getString(NEW_DEVICE_ADMIN_WARNING_SIMPLIFIED, () ->
getString(R.string.device_admin_warning_simplified, getString(R.string.device_admin_warning_simplified,
mProfileOwnerName), mProfileOwnerName)); profileOwnerName), profileOwnerName));
return; return;
} }
setContentView(R.layout.device_admin_add); setContentView(R.layout.device_admin_add);
@@ -524,8 +523,7 @@ public class DeviceAdminAdd extends CollapsingToolbarBaseActivity {
} }
if (mAddingProfileOwner) { if (mAddingProfileOwner) {
try { try {
mDPM.setProfileOwner(mDeviceAdmin.getComponent(), mDPM.setProfileOwner(mDeviceAdmin.getComponent(), UserHandle.myUserId());
mProfileOwnerName, UserHandle.myUserId());
} catch (RuntimeException re) { } catch (RuntimeException re) {
setResult(Activity.RESULT_CANCELED); setResult(Activity.RESULT_CANCELED);
} }