From 287cc43fdd3a438640831e3d629fd8147f965f7e Mon Sep 17 00:00:00 2001 From: yash Date: Wed, 4 Dec 2024 13:23:04 +0000 Subject: Use WearBugreportWarningActivity from SystemUI in Shell Bug:378047645 Flag: EXEMPT minor change Test: Verified manually that correct activity is launched in wear bugreport flow: https://screenshot.googleplex.com/43gvuNFZxByh73V, https://screenshot.googleplex.com/CwYuE65wJyjP2RJ Change-Id: I709886407f6e81d6011c9e4d5c39dc6492b44596 --- packages/Shell/src/com/android/shell/BugreportProgressService.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'packages/Shell/src') diff --git a/packages/Shell/src/com/android/shell/BugreportProgressService.java b/packages/Shell/src/com/android/shell/BugreportProgressService.java index 7f25b51e35ca..e0771c60ad3c 100644 --- a/packages/Shell/src/com/android/shell/BugreportProgressService.java +++ b/packages/Shell/src/com/android/shell/BugreportProgressService.java @@ -1317,7 +1317,11 @@ public class BugreportProgressService extends Service { */ private Intent buildWearWarningIntent() { Intent intent = new Intent(); - intent.setClassName(mContext, getPackageName() + ".WearBugreportWarningActivity"); + String systemUIPackage = mContext.getResources().getString( + com.android.internal.R.string.config_systemUi); + String wearBugreportWarningActivity = getResources() + .getString(R.string.system_ui_wear_bugreport_warning_activity); + intent.setClassName(systemUIPackage, wearBugreportWarningActivity); if (mContext.getPackageManager().resolveActivity(intent, /* flags */ 0) == null) { Log.e(TAG, "Cannot find wear bugreport warning activity"); return buildWarningIntent(mContext, /* sendIntent */ null); -- cgit v1.2.3-59-g8ed1b