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

Commit 81e67566 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/30594943']... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/30594943'] into security-aosp-udc-release.

Change-Id: I5c31e4e5384ffdda23c5bf84a49fc2a40632696c
parents 0a23febf d37b2f8b

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);