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

Merge "Send PendingIntent for screenshot smart actions" into rvc-dev

Browse Source
This commit is contained in:
Miranda Kephart
2020-06-25 19:39:15 +00:00
committed by Android (Google) Code Review
parent e4e478ed92 381e5b4d66
commit a4d17d9a79
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,7 +58,6 @@ import android.os.Looper;
import android.os.Message; import android.os.Message;
import android.os.PowerManager; import android.os.PowerManager;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.UserHandle;
import android.provider.Settings; import android.provider.Settings;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.util.Log; import android.util.Log;
@@ -1179,11 +1178,15 @@ public class GlobalScreenshot implements ViewTreeObserver.OnComputeInternalInset
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
PendingIntent pendingIntent = intent.getParcelableExtra(EXTRA_ACTION_INTENT); PendingIntent pendingIntent = intent.getParcelableExtra(EXTRA_ACTION_INTENT);
Intent actionIntent = pendingIntent.getIntent();
String actionType = intent.getStringExtra(EXTRA_ACTION_TYPE); String actionType = intent.getStringExtra(EXTRA_ACTION_TYPE);
Slog.d(TAG, "Executing smart action [" + actionType + "]:" + actionIntent); Slog.d(TAG, "Executing smart action [" + actionType + "]:" + pendingIntent.getIntent());
ActivityOptions opts = ActivityOptions.makeBasic(); ActivityOptions opts = ActivityOptions.makeBasic();
context.startActivityAsUser(actionIntent, opts.toBundle(), UserHandle.CURRENT);
try {
pendingIntent.send(context, 0, null, null, null, null, opts.toBundle());
} catch (PendingIntent.CanceledException e) {
Log.e(TAG, "Pending intent canceled", e);
}
ScreenshotSmartActions.notifyScreenshotAction( ScreenshotSmartActions.notifyScreenshotAction(
context, intent.getStringExtra(EXTRA_ID), actionType, true); context, intent.getStringExtra(EXTRA_ID), actionType, true);