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

Merge "Fix: avoid the potential attack on SlicePermissionActivity" am: b800bb37f6 am: a473b41f58 am: 4d21a90846

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

Change-Id: I7da3799aadea4a4787fee5f65378c4f3e10772c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-06-30 00:55:02 +00:00
committed by Automerger Merge Worker
parent e6632eede0 4d21a90846
commit cf61d6c798
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/SlicePermissionActivity.java
View File

@@ -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
mUri = getIntent().getParcelableExtra(SliceProvider.EXTRA_BIND_URI); try {
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))