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

Small Tweaks to Screenshot Intelligence log messages for better

Browse Source 
debugging.

Test: Device logcat
Bug: 145687348
Change-Id: I03c06c4ab7494899867a98df5d65000cfc2caccf
This commit is contained in:
Satakshi
2019-12-04 16:08:18 -08:00
committed by Satakshi Rana
parent 4d4e91db5e
commit 386efae863
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
View File

@@ -804,8 +804,8 @@ public class GlobalScreenshot {
List<Notification.Action> actions = smartActionsFuture.get(timeoutMs, List<Notification.Action> actions = smartActionsFuture.get(timeoutMs,
TimeUnit.MILLISECONDS); TimeUnit.MILLISECONDS);
long waitTimeMs = SystemClock.uptimeMillis() - startTimeMs; long waitTimeMs = SystemClock.uptimeMillis() - startTimeMs;
Slog.d(TAG, String.format("Wait time for smart actions: %d ms", Slog.d(TAG, String.format("Got %d smart actions. Wait time: %d ms",
waitTimeMs)); actions.size(), waitTimeMs));
notifyScreenshotOp(screenshotId, smartActionsProvider, notifyScreenshotOp(screenshotId, smartActionsProvider,
ScreenshotNotificationSmartActionsProvider.ScreenshotOp.WAIT_FOR_SMART_ACTIONS, ScreenshotNotificationSmartActionsProvider.ScreenshotOp.WAIT_FOR_SMART_ACTIONS,
ScreenshotNotificationSmartActionsProvider.ScreenshotOpStatus.SUCCESS, ScreenshotNotificationSmartActionsProvider.ScreenshotOpStatus.SUCCESS,
@@ -813,7 +813,8 @@ public class GlobalScreenshot {
return actions; return actions;
} catch (Throwable e) { } catch (Throwable e) {
long waitTimeMs = SystemClock.uptimeMillis() - startTimeMs; long waitTimeMs = SystemClock.uptimeMillis() - startTimeMs;
Slog.d(TAG, "Failed to obtain screenshot notification smart actions.", e); Slog.e(TAG, String.format("Error getting smart actions. Wait time: %d ms", waitTimeMs),
e);
ScreenshotNotificationSmartActionsProvider.ScreenshotOpStatus status = ScreenshotNotificationSmartActionsProvider.ScreenshotOpStatus status =
(e instanceof TimeoutException) (e instanceof TimeoutException)
? ScreenshotNotificationSmartActionsProvider.ScreenshotOpStatus.TIMEOUT ? ScreenshotNotificationSmartActionsProvider.ScreenshotOpStatus.TIMEOUT
@@ -942,14 +943,16 @@ public class GlobalScreenshot {
public static class SmartActionsReceiver extends BroadcastReceiver { public static class SmartActionsReceiver extends BroadcastReceiver {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
PendingIntent actionIntent = intent.getParcelableExtra(EXTRA_ACTION_INTENT); PendingIntent pendingIntent = intent.getParcelableExtra(EXTRA_ACTION_INTENT);
Intent actionIntent = pendingIntent.getIntent();
String actionType = intent.getStringExtra(EXTRA_ACTION_TYPE);
Slog.d(TAG, "Executing smart action [" + actionType + "]:" + actionIntent);
ActivityOptions opts = ActivityOptions.makeBasic(); ActivityOptions opts = ActivityOptions.makeBasic();
context.startActivityAsUser(actionIntent.getIntent(), opts.toBundle(), context.startActivityAsUser(actionIntent, opts.toBundle(),
UserHandle.CURRENT); UserHandle.CURRENT);
Slog.d(TAG, "Screenshot notification smart action is invoked.");
notifyScreenshotAction(context, intent.getStringExtra(EXTRA_ID), notifyScreenshotAction(context, intent.getStringExtra(EXTRA_ID),
intent.getStringExtra(EXTRA_ACTION_TYPE), actionType,
true); true);
} }
} }

6
packages/SystemUI/src/com/android/systemui/screenshot/SaveImageInBackgroundTask.java
View File

@@ -456,9 +456,9 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> {
SystemUiDeviceConfigFlags SystemUiDeviceConfigFlags
.SCREENSHOT_NOTIFICATION_SMART_ACTIONS_TIMEOUT_MS, .SCREENSHOT_NOTIFICATION_SMART_ACTIONS_TIMEOUT_MS,
1000); 1000);
List<Notification.Action> smartActions = buildSmartActions( List<Notification.Action> smartActions = GlobalScreenshot.getSmartActions(mScreenshotId,
GlobalScreenshot.getSmartActions(mScreenshotId, smartActionsFuture, smartActionsFuture, timeoutMs, mSmartActionsProvider);
timeoutMs, mSmartActionsProvider), context); smartActions = buildSmartActions(smartActions, context);
for (Notification.Action action : smartActions) { for (Notification.Action action : smartActions) {
notificationBuilder.addAction(action); notificationBuilder.addAction(action);
} }