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

Commit 7cf6bd55 authored by Marvin Ramin's avatar Marvin Ramin Committed by Automerger Merge Worker
Browse files

RESTRICT AUTOMERGE Use getLaunchedFromPackage instead of getCallingPackage am: 85987ea1 

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



Change-Id: I1f634283548bcbed1e4c26ce5fb3a652e1856bb5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents abdac907 85987ea1

packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java

+2 −3
Original line number Diff line number Diff line
@@ -98,12 +98,11 @@ public class MediaProjectionPermissionActivity extends Activity 
        final Intent launchingIntent = getIntent();

        mReviewGrantedConsentRequired = launchingIntent.getBooleanExtra(

                EXTRA_USER_REVIEW_GRANTED_CONSENT, false);



        mPackageName = getCallingPackage();

        mPackageName = getLaunchedFromPackage();



        // This activity is launched directly by an app, or system server. System server provides

        // the package name through the intent if so.

        if (mPackageName == null) {

        if (getCallingPackage() == null)  {

            if (launchingIntent.hasExtra(EXTRA_PACKAGE_REUSING_GRANTED_CONSENT)) {

                mPackageName = launchingIntent.getStringExtra(

                        EXTRA_PACKAGE_REUSING_GRANTED_CONSENT);