Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e31ea365 authored by Miranda Kephart's avatar Miranda Kephart Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12000161

Change-Id: Ic4f0cfd341567e6ed9ae9c835ce87adc7cefec61
parents c6483075 a4d17d9a

packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java

+7 −4
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ import android.os.Looper; 
import android.os.Message;

import android.os.PowerManager;

import android.os.RemoteException;

import android.os.UserHandle;

import android.provider.Settings;

import android.util.DisplayMetrics;

import android.util.Log;
@@ -1179,11 +1178,15 @@ public class GlobalScreenshot implements ViewTreeObserver.OnComputeInternalInset 
        @Override

        public void onReceive(Context context, Intent 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);

            Slog.d(TAG, "Executing smart action [" + actionType + "]:" + pendingIntent.getIntent());

            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(

                    context, intent.getStringExtra(EXTRA_ID), actionType, true);