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

Merge "resolved conflicts for merge of 1dac6bd9 to mnc-dev" into mnc-dev

Browse Source
This commit is contained in:
Wei Liu
2015-06-19 05:54:53 +00:00
committed by Android (Google) Code Review
parent 0961480879 9fbee9ba98
commit 940335ba5b
1 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
packages/Shell/src/com/android/shell/BugreportReceiver.java
View File

@@ -27,6 +27,7 @@ import android.app.PendingIntent;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.res.Configuration;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.FileUtils;
@@ -77,21 +78,12 @@ public class BugreportReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
final Configuration conf = context.getResources().getConfiguration();
final File bugreportFile = getFileExtra(intent, EXTRA_BUGREPORT);
final File screenshotFile = getFileExtra(intent, EXTRA_SCREENSHOT);
// Files are kept on private storage, so turn into Uris that we can
// grant temporary permissions for.
final Uri bugreportUri = FileProvider.getUriForFile(context, AUTHORITY, bugreportFile);
final Uri screenshotUri = FileProvider.getUriForFile(context, AUTHORITY, screenshotFile);
boolean isPlainText = bugreportFile.getName().toLowerCase().endsWith(".txt");
if (!isPlainText) {
// Already zipped, send it right away.
sendBugreportNotification(context, bugreportFile, screenshotFile);
} else {
// Asynchronously zip the file first, then send it.
sendZippedBugreportNotification(context, bugreportFile, screenshotFile);
if ((conf.uiMode & Configuration.UI_MODE_TYPE_MASK) != Configuration.UI_MODE_TYPE_WATCH) {
triggerLocalNotification(context, bugreportFile, screenshotFile);
}
// Clean up older bugreports in background
@@ -107,6 +99,29 @@ public class BugreportReceiver extends BroadcastReceiver {
}.execute();
}
/**
* Responsible for triggering a notification that allows the user to start a
* "share" intent with the bug report. On watches we have other methods to allow the user to
* start this intent (usually by triggering it on another connected device); we don't need to
* display the notification in this case.
*/
private void triggerLocalNotification(final Context context, final File bugreportFile,
final File screenshotFile) {
// Files are kept on private storage, so turn into Uris that we can
// grant temporary permissions for.
final Uri bugreportUri = FileProvider.getUriForFile(context, AUTHORITY, bugreportFile);
final Uri screenshotUri = FileProvider.getUriForFile(context, AUTHORITY, screenshotFile);
boolean isPlainText = bugreportFile.getName().toLowerCase().endsWith(".txt");
if (!isPlainText) {
// Already zipped, send it right away.
sendBugreportNotification(context, bugreportFile, screenshotFile);
} else {
// Asynchronously zip the file first, then send it.
sendZippedBugreportNotification(context, bugreportFile, screenshotFile);
}
}
private static Intent buildWarningIntent(Context context, Intent sendIntent) {
final Intent intent = new Intent(context, BugreportWarningActivity.class);
intent.putExtra(Intent.EXTRA_INTENT, sendIntent);