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

Commit a67b5a08 authored by Paul Chang's avatar Paul Chang Committed by Automerger Merge Worker
Browse files

Merge "Let bug report shortcut handle the case that bug report handler app is...

Merge "Let bug report shortcut handle the case that bug report handler app is not available" into rvc-dev am: 713ce748 am: bebe93f2

Change-Id: I2cb9dc7ab7da545eaa4845fab2cc4c7cc2a85ef8
parents c2f6522e bebe93f2
Loading
Loading
Loading
Loading
+30 −2
Original line number Diff line number Diff line
@@ -16,15 +16,20 @@

package com.android.server.am;

import static android.app.AppOpsManager.OP_NONE;
import static com.android.server.am.ActivityManagerDebugConfig.TAG_AM;
import static com.android.server.am.ActivityManagerDebugConfig.TAG_WITH_CLASS_NAME;

import android.app.Activity;
import android.app.BroadcastOptions;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.os.Binder;
import android.os.BugreportManager;
import android.os.BugreportParams;
import android.os.UserHandle;
import android.provider.Settings;
import android.text.TextUtils;
@@ -110,9 +115,17 @@ public final class BugReportHandlerUtil {
        options.setBackgroundActivityStartsAllowed(true);
        final long identity = Binder.clearCallingIdentity();
        try {
            context.sendBroadcastAsUser(intent, UserHandle.of(handlerUser),
            // Handler app's BroadcastReceiver should call setResultCode(Activity.RESULT_OK) to
            // let ResultBroadcastReceiver know the handler app is available.
            context.sendOrderedBroadcastAsUser(intent,
                    UserHandle.of(handlerUser),
                    android.Manifest.permission.DUMP,
                    options.toBundle());
                    OP_NONE, options.toBundle(),
                    new ResultBroadcastReceiver(),
                    /* scheduler= */ null,
                    Activity.RESULT_CANCELED,
                    /* initialData= */ null,
                    /* initialExtras= */ null);
        } catch (RuntimeException e) {
            Slog.e(TAG, "Error while trying to launch bugreport handler app.", e);
            return false;
@@ -176,4 +189,19 @@ public final class BugReportHandlerUtil {
            Binder.restoreCallingIdentity(identity);
        }
    }

    private static class ResultBroadcastReceiver extends BroadcastReceiver {
        @Override
        public void onReceive(Context context, Intent intent) {
            if (getResultCode() == Activity.RESULT_OK) {
                return;
            }

            Slog.w(TAG, "Request bug report because handler app seems to be not available.");
            BugreportManager bugreportManager = context.getSystemService(BugreportManager.class);
            bugreportManager.requestBugreport(
                    new BugreportParams(BugreportParams.BUGREPORT_MODE_INTERACTIVE),
                    /* shareTitle= */null, /* shareDescription= */ null);
        }
    }
}