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

Merge "Send intent to let calling app show UI safely without interfering the bugreport/screenshot generation." into rvc-dev am: b43fb9b839 am: 447d74e378 am: 47ec3e7341

Browse Source 
Change-Id: Id181ba73d139c3994b90f469618cc880bd2dce11
This commit is contained in:
Paul Chang
2020-04-24 08:57:26 +00:00
committed by Automerger Merge Worker
parent e2bcf17813 47ec3e7341
commit 3435c94a91
3 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/java/android/os/BugreportManager.java
View File

@@ -27,6 +27,7 @@ import android.annotation.SystemService;
import android.annotation.TestApi;
import android.app.ActivityManager;
import android.content.Context;
import android.content.Intent;
import android.os.Handler;
import android.util.Log;
import android.widget.Toast;
@@ -52,6 +53,8 @@ import java.util.concurrent.Executor;
public final class BugreportManager {
private static final String TAG = "BugreportManager";
private static final String INTENT_UI_INTENSIVE_BUGREPORT_DUMPS_FINISHED =
"com.android.internal.intent.action.UI_INTENSIVE_BUGREPORT_DUMPS_FINISHED";
private final Context mContext;
private final IDumpstate mBinder;
@@ -284,5 +287,27 @@ public final class BugreportManager {
Toast.makeText(mContext, message, Toast.LENGTH_LONG).show();
});
}
@Override
public void onUiIntensiveBugreportDumpsFinished(String callingPackage)
throws RemoteException {
final long identity = Binder.clearCallingIdentity();
try {
mExecutor.execute(() -> {
// Send intent to let calling app to show UI safely without interfering with
// the bugreport/screenshot generation.
// TODO(b/154298410): When S is ready for API change, add a method in
// BugreportCallback so we can just call the callback instead of using
// broadcast.
Intent intent = new Intent(INTENT_UI_INTENSIVE_BUGREPORT_DUMPS_FINISHED);
intent.setPackage(callingPackage);
intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
intent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);
mContext.sendBroadcast(intent, android.Manifest.permission.DUMP);
});
} finally {
Binder.restoreCallingIdentity(identity);
}
}
}
}

9
services/core/java/com/android/server/incident/IncidentCompanionService.java
View File

@@ -50,9 +50,6 @@ import java.util.List;
*/
public class IncidentCompanionService extends SystemService {
static final String TAG = "IncidentCompanionService";
// TODO(b/152289743): Expose below intent.
private static final String INTENT_CHECK_USER_CONSENT =
"com.android.internal.intent.action.CHECK_USER_CONSENT";
/**
* Dump argument for proxying restricted image dumps to the services
@@ -92,12 +89,6 @@ public class IncidentCompanionService extends SystemService {
final long ident = Binder.clearCallingIdentity();
try {
Intent intent = new Intent(INTENT_CHECK_USER_CONSENT);
intent.setPackage(callingPackage);
intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
intent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);
getContext().sendBroadcast(intent, android.Manifest.permission.DUMP);
mPendingReports.authorizeReport(callingUid, callingPackage,
receiverClass, reportId, flags, listener);
} finally {

6
services/core/java/com/android/server/os/BugreportManagerServiceImpl.java
View File

@@ -296,6 +296,12 @@ class BugreportManagerServiceImpl extends IDumpstate.Stub {
mListener.onScreenshotTaken(success);
}
@Override
public void onUiIntensiveBugreportDumpsFinished(String callingPackage)
throws RemoteException {
mListener.onUiIntensiveBugreportDumpsFinished(callingPackage);
}
@Override
public void binderDied() {
synchronized (mLock) {