Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash when showing the media projection dialog on work profile

Browse Source 
Bug: 222713428
Test: Manual
Change-Id: Ic969b8270162c18227447d79fe55dbfaa75bfb83
This commit is contained in:
Jordan Demeulenaere
2022-03-09 12:12:53 +01:00
parent f89f27e005
commit 79faca2203
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java
View File

@@ -54,7 +54,7 @@ public class MediaProjectionPermissionActivity extends Activity
private int mUid;
private IMediaProjectionManager mService;
private SystemUIDialog mDialog;
private AlertDialog mDialog;
@Override
public void onCreate(Bundle icicle) {
@@ -141,13 +141,18 @@ public class MediaProjectionPermissionActivity extends Activity
dialogTitle = getString(R.string.media_projection_dialog_title, appName);
}
mDialog = new SystemUIDialog(this);
mDialog.setTitle(dialogTitle);
mDialog.setIcon(R.drawable.ic_media_projection_permission);
mDialog.setMessage(dialogText);
mDialog.setPositiveButton(R.string.media_projection_action_text, this);
mDialog.setNeutralButton(android.R.string.cancel, this);
mDialog.setOnCancelListener(this);
mDialog = new AlertDialog.Builder(this, R.style.Theme_SystemUI_Dialog)
.setTitle(dialogTitle)
.setIcon(R.drawable.ic_media_projection_permission)
.setMessage(dialogText)
.setPositiveButton(R.string.media_projection_action_text, this)
.setNeutralButton(android.R.string.cancel, this)
.setOnCancelListener(this)
.create();
SystemUIDialog.registerDismissListener(mDialog);
SystemUIDialog.applyFlags(mDialog);
SystemUIDialog.setDialogSize(mDialog);
mDialog.create();
mDialog.getButton(DialogInterface.BUTTON_POSITIVE).setFilterTouchesWhenObscured(true);
@@ -186,7 +191,7 @@ public class MediaProjectionPermissionActivity extends Activity
private Intent getMediaProjectionIntent(int uid, String packageName)
throws RemoteException {
IMediaProjection projection = mService.createProjection(uid, packageName,
MediaProjectionManager.TYPE_SCREEN_CAPTURE, false /* permanentGrant */);
MediaProjectionManager.TYPE_SCREEN_CAPTURE, false /* permanentGrant */);
Intent intent = new Intent();
intent.putExtra(MediaProjectionManager.EXTRA_MEDIA_PROJECTION, projection.asBinder());
return intent;