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

Add API to request Bug Report with a certain title and description

Browse Source 
ActivityManagerService will send the details to dumpstate and
BugreportProgressService will get the details from dumpstate and use
that for the notification.

Bug: 33561517
Test: Modify TelephonyMonitor to use this API and ensure that the
      notification uses that the title and description sent as arguments
      to the API. File a bug using betterBug and ensure that the
      information gets populated automatically.

Change-Id: I455f1df2278e5d569dd19c74245a0704dcf5a321
This commit is contained in:
Naveen Kalla
2017-03-16 19:15:04 -07:00
parent b4e6b5a719
commit ca3d5434e8
3 changed files with 90 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/app/IActivityManager.aidl
View File

@@ -329,6 +329,18 @@ interface IActivityManager {
// No new code should be calling it.
void requestBugReport(int bugreportType);
/**
* Takes a telephony bug report and notifies the user with the title and description
* that are passed to this API as parameters
*
* @param shareTitle should be a valid legible string less than 50 chars long
* @param shareDescription should be less than 91 bytes when encoded into UTF-8 format
*
* @throws IllegalArgumentException if shareTitle or shareDescription is too big or if the
* paremeters cannot be encoding to an UTF-8 charset.
*/
void requestTelephonyBugReport(in String shareTitle, in String shareDescription);
long inputDispatchingTimedOut(int pid, boolean aboveSystem, in String reason);
void clearPendingBackup();
Intent getIntentForIntentSender(in IIntentSender sender);

36
packages/Shell/src/com/android/shell/BugreportProgressService.java
View File

@@ -31,7 +31,6 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.nio.charset.StandardCharsets;
import java.text.NumberFormat;
import java.util.ArrayList;
@@ -99,7 +98,6 @@ import android.view.IWindowManager;
import android.view.View;
import android.view.WindowManager;
import android.view.View.OnFocusChangeListener;
import android.view.inputmethod.EditorInfo;
import android.widget.Button;
import android.widget.EditText;
import android.widget.Toast;
@@ -802,6 +800,17 @@ public class BugreportProgressService extends Service {
if (screenshot != null) {
info.addScreenshot(screenshot);
}
final String shareTitle = intent.getStringExtra(EXTRA_TITLE);
if (!TextUtils.isEmpty(shareTitle)) {
info.title = shareTitle;
final String shareDescription = intent.getStringExtra(EXTRA_DESCRIPTION);
if (!TextUtils.isEmpty(shareDescription)) {
info.shareDescription= shareDescription;
}
Log.d(TAG, "Bugreport title is " + info.title + ","
+ " shareDescription is " + info.shareDescription);
}
info.finished = true;
// Stop running on foreground, otherwise share notification cannot be dismissed.
@@ -977,10 +986,20 @@ public class BugreportProgressService extends Service {
shareIntent.putExtra(EXTRA_ID, info.id);
shareIntent.putExtra(EXTRA_INFO, info);
final String title = mContext.getString(R.string.bugreport_finished_title, info.id);
final String content = takingScreenshot ?
String content;
content = takingScreenshot ?
mContext.getString(R.string.bugreport_finished_pending_screenshot_text)
: mContext.getString(R.string.bugreport_finished_text);
final String title;
if (TextUtils.isEmpty(info.title)) {
title = mContext.getString(R.string.bugreport_finished_title, info.id);
} else {
title = info.title;
if (!TextUtils.isEmpty(info.shareDescription)) {
if(!takingScreenshot) content = info.shareDescription;
}
}
final Notification.Builder builder = newBaseNotification(mContext)
.setContentTitle(title)
.setTicker(title)
@@ -1241,6 +1260,7 @@ public class BugreportProgressService extends Service {
addExtra(buffer, intent, EXTRA_BUGREPORT);
addExtra(buffer, intent, EXTRA_SCREENSHOT);
addExtra(buffer, intent, EXTRA_INFO);
addExtra(buffer, intent, EXTRA_TITLE);
if (intent.hasExtra(EXTRA_ORIGINAL_INTENT)) {
buffer.append(SHORT_EXTRA_ORIGINAL_INTENT).append(": ");
@@ -1646,6 +1666,11 @@ public class BugreportProgressService extends Service {
*/
int screenshotCounter;
/**
* Descriptive text that will be shown to the user in the notification message.
*/
String shareDescription;
/**
* Constructor for tracked bugreports - typically called upon receiving BUGREPORT_STARTED.
*/
@@ -1747,6 +1772,7 @@ public class BugreportProgressService extends Service {
.append("\n\tlast_update: ").append(getFormattedLastUpdate())
.append("\n\taddingDetailsToZip: ").append(addingDetailsToZip)
.append(" addedDetailsToZip: ").append(addedDetailsToZip)
.append("\n\tshareDescription: ").append(shareDescription)
.toString();
}
@@ -1773,6 +1799,7 @@ public class BugreportProgressService extends Service {
finished = in.readInt() == 1;
screenshotCounter = in.readInt();
shareDescription = in.readString();
}
@Override
@@ -1797,6 +1824,7 @@ public class BugreportProgressService extends Service {
dest.writeInt(finished ? 1 : 0);
dest.writeInt(screenshotCounter);
dest.writeString(shareDescription);
}
@Override

46
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -384,6 +384,7 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
import java.lang.ref.WeakReference;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
@@ -593,6 +594,10 @@ public class ActivityManagerService extends IActivityManager.Stub
@VisibleForTesting
static final int NETWORK_STATE_UNBLOCK = 2;
// Max character limit for a notification title. If the notification title is larger than this
// the notification will not be legible to the user.
private static final int MAX_BUGREPORT_TITLE_SIZE = 50;
/** All system services */
SystemServiceManager mSystemServiceManager;
AssistUtils mAssistUtils;
@@ -12622,6 +12627,7 @@ public class ActivityManagerService extends IActivityManager.Stub
* No new code should be calling it.
*/
@Deprecated
@Override
public void requestBugReport(int bugreportType) {
String extraOptions = null;
switch (bugreportType) {
@@ -12651,6 +12657,46 @@ public class ActivityManagerService extends IActivityManager.Stub
SystemProperties.set("ctl.start", "bugreport");
}
/**
* @deprecated This method is only used by a few internal components and it will soon be
* replaced by a proper bug report API (which will be restricted to a few, pre-defined apps).
* No new code should be calling it.
*/
@Deprecated
@Override
public void requestTelephonyBugReport(String shareTitle, String shareDescription) {
if (!TextUtils.isEmpty(shareTitle)) {
if (shareTitle.length() > MAX_BUGREPORT_TITLE_SIZE) {
String errorStr = "shareTitle should be less than " +
MAX_BUGREPORT_TITLE_SIZE + " characters";
throw new IllegalArgumentException(errorStr);
} else {
if (!TextUtils.isEmpty(shareDescription)) {
int length;
try {
length = shareDescription.getBytes("UTF-8").length;
} catch (UnsupportedEncodingException e) {
String errorStr = "shareDescription: UnsupportedEncodingException";
throw new IllegalArgumentException(errorStr);
}
if (length > SystemProperties.PROP_VALUE_MAX) {
String errorStr = "shareTitle should be less than " +
SystemProperties.PROP_VALUE_MAX + " bytes";
throw new IllegalArgumentException(errorStr);
} else {
SystemProperties.set("dumpstate.options.description", shareDescription);
}
}
SystemProperties.set("dumpstate.options.title", shareTitle);
}
}
Slog.d(TAG, "Bugreport notification title " + shareTitle
+ " description " + shareDescription);
requestBugReport(ActivityManager.BUGREPORT_OPTION_TELEPHONY);
}
public static long getInputDispatchingTimeoutLocked(ActivityRecord r) {
return r != null ? getInputDispatchingTimeoutLocked(r.app) : KEY_DISPATCHING_TIMEOUT;
}