diff options
| author | 2023-09-21 16:52:36 +0000 | |
|---|---|---|
| committer | 2023-09-21 16:52:36 +0000 | |
| commit | 14fa56bfab61568fe78a0d173c074e2aee72013f (patch) | |
| tree | 0513f0b1f496a34ff8677dbb2ada28ef61ace074 | |
| parent | a5348266306378b5755dcc4f73e985d6e24581a0 (diff) | |
| parent | 7f0c0e70c32073d01ace370d54d0abb266d5000e (diff) | |
Merge "Add package information to user aspect ratio intent" into udc-qpr-dev am: 7f0c0e70c3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24823111
Change-Id: I3ae2417b7fdf59701fcc2e1a28eac17df7148aa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIController.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIController.java index c111ce623c1a..0e6b20332a4f 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIController.java @@ -22,10 +22,13 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.app.TaskInfo; import android.app.TaskInfo.CameraCompatControlState; +import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.res.Configuration; import android.hardware.display.DisplayManager; +import android.net.Uri; +import android.os.UserHandle; import android.provider.Settings; import android.util.ArraySet; import android.util.Log; @@ -577,7 +580,13 @@ public class CompatUIController implements OnDisplaysChangedListener, final Intent intent = new Intent(Settings.ACTION_MANAGE_USER_ASPECT_RATIO_SETTINGS); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK); - mContext.startActivity(intent); + final ComponentName appComponent = taskInfo.topActivity; + if (appComponent != null) { + final Uri packageUri = Uri.parse("package:" + appComponent.getPackageName()); + intent.setData(packageUri); + } + final UserHandle userHandle = UserHandle.of(taskInfo.userId); + mContext.startActivityAsUser(intent, userHandle); } private void removeLayouts(int taskId) { |