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

Commit de33e2e8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix: avoid the potential attack on SlicePermissionActivity" am:... 

Merge "Fix: avoid the potential attack on SlicePermissionActivity" am: b800bb37 am: a473b41f am: 4d21a908 am: cf61d6c7 am: 2d269dde am: 5bf44c16

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



Change-Id: Ie2228dd96cb8ee2b092684aaa1a67063f97edc07
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 159e0acc 5bf44c16

packages/SystemUI/src/com/android/systemui/SlicePermissionActivity.java

+5 −1
Original line number Original line Diff line number Diff line
@@ -51,7 +51,11 @@ public class SlicePermissionActivity extends Activity implements OnClickListener 
        super.onCreate(savedInstanceState);

        super.onCreate(savedInstanceState);





        // Verify intent is valid

        // Verify intent is valid

        try {

            mUri = getIntent().getParcelableExtra(SliceProvider.EXTRA_BIND_URI);

            mUri = getIntent().getParcelableExtra(SliceProvider.EXTRA_BIND_URI);

        } catch (Exception e) {

            Log.w(TAG, "Failed to getParcelableExtra", e);

        }

        mCallingPkg = getIntent().getStringExtra(SliceProvider.EXTRA_PKG);

        mCallingPkg = getIntent().getStringExtra(SliceProvider.EXTRA_PKG);

        if (mUri == null

        if (mUri == null

                || !SliceProvider.SLICE_TYPE.equals(getContentResolver().getType(mUri))

                || !SliceProvider.SLICE_TYPE.equals(getContentResolver().getType(mUri))