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

Commit d4337b34 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use WearBugreportWarningActivity from SystemUI in Shell" into main

parents 285e082c 287cc43f

packages/Shell/res/values/defaults.xml

0 → 100644
+5 −0
Original line number Diff line number Diff line 
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- Default for Wear bugreport warning activity-->

    <!-- DO NOT TRANSLATE -->

    <string name="system_ui_wear_bugreport_warning_activity" />

</resources>
 
 No newline at end of file

packages/Shell/src/com/android/shell/BugreportProgressService.java

+5 −1
Original line number Diff line number Diff line
@@ -1365,7 +1365,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);