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

Merge "Register change Uri and notify changes in bugreportServices." into nyc-dev

Browse Source
This commit is contained in:
Ben Lin
2016-05-24 17:48:22 +00:00
committed by Android (Google) Code Review
parent b143e3de34 c6905cfb11
commit 5d5ddfa80e
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -815,6 +815,14 @@ public class BugreportProgressService extends Service {
*/ */
private void onBugreportFinished(int id, Intent intent) { private void onBugreportFinished(int id, Intent intent) {
final File bugreportFile = getFileExtra(intent, EXTRA_BUGREPORT); final File bugreportFile = getFileExtra(intent, EXTRA_BUGREPORT);
// Since BugreportProvider and BugreportProgressService aren't tightly coupled,
// we need to make sure they are explicitly tied to a single unique notification URI
// so that the service can alert the provider of changes it has done (ie. new bug
// reports)
// See { @link Cursor#setNotificationUri } and {@link ContentResolver#notifyChanges }
final Uri notificationUri = BugreportStorageProvider.getNotificationUri();
mContext.getContentResolver().notifyChange(notificationUri, null, false);
if (bugreportFile == null) { if (bugreportFile == null) {
// Should never happen, dumpstate always set the file. // Should never happen, dumpstate always set the file.
Log.wtf(TAG, "Missing " + EXTRA_BUGREPORT + " on intent " + intent); Log.wtf(TAG, "Missing " + EXTRA_BUGREPORT + " on intent " + intent);

10
packages/Shell/src/com/android/shell/BugreportStorageProvider.java
View File

@@ -19,9 +19,11 @@ package com.android.shell;
import android.database.Cursor; import android.database.Cursor;
import android.database.MatrixCursor; import android.database.MatrixCursor;
import android.database.MatrixCursor.RowBuilder; import android.database.MatrixCursor.RowBuilder;
import android.net.Uri;
import android.os.CancellationSignal; import android.os.CancellationSignal;
import android.os.FileUtils; import android.os.FileUtils;
import android.os.ParcelFileDescriptor; import android.os.ParcelFileDescriptor;
import android.provider.DocumentsContract;
import android.provider.DocumentsContract.Document; import android.provider.DocumentsContract.Document;
import android.provider.DocumentsContract.Root; import android.provider.DocumentsContract.Root;
import android.provider.DocumentsProvider; import android.provider.DocumentsProvider;
@@ -32,6 +34,7 @@ import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
public class BugreportStorageProvider extends DocumentsProvider { public class BugreportStorageProvider extends DocumentsProvider {
private static final String AUTHORITY = "com.android.shell.documents";
private static final String DOC_ID_ROOT = "bugreport"; private static final String DOC_ID_ROOT = "bugreport";
private static final String[] DEFAULT_ROOT_PROJECTION = new String[] { private static final String[] DEFAULT_ROOT_PROJECTION = new String[] {
@@ -103,6 +106,7 @@ public class BugreportStorageProvider extends DocumentsProvider {
for (File file : files) { for (File file : files) {
addFileRow(result, file); addFileRow(result, file);
} }
result.setNotificationUri(getContext().getContentResolver(), getNotificationUri());
} }
} }
return result; return result;
@@ -130,6 +134,12 @@ public class BugreportStorageProvider extends DocumentsProvider {
} }
} }
// This is used by BugreportProgressService so that the notification uri shared by
// BugreportProgressService and BugreportStorageProvider are guaranteed the same and unique
protected static Uri getNotificationUri() {
return DocumentsContract.buildChildDocumentsUri(AUTHORITY, DOC_ID_ROOT);
}
private static String[] resolveRootProjection(String[] projection) { private static String[] resolveRootProjection(String[] projection) {
return projection != null ? projection : DEFAULT_ROOT_PROJECTION; return projection != null ? projection : DEFAULT_ROOT_PROJECTION;
} }