diff options
| author | 2023-06-29 23:26:10 +0000 | |
|---|---|---|
| committer | 2023-06-29 23:26:10 +0000 | |
| commit | a473b41f5821708286480ef548afefc5c5ef9ba6 (patch) | |
| tree | b865ce0ba7360664576188eb9f3c6fc545b5ddb6 | |
| parent | 94950d33a117d04799665b15d0e68efe08109173 (diff) | |
| parent | b800bb37f6e0f45558dae5c1b09baeee7e77dab5 (diff) | |
Merge "Fix: avoid the potential attack on SlicePermissionActivity" am: b800bb37f6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2632649
Change-Id: Id4160de89030b52e7875d748df69f7fd86f99795
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/SlicePermissionActivity.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/SlicePermissionActivity.java b/packages/SystemUI/src/com/android/systemui/SlicePermissionActivity.java index 45077d2333b6..6f99a24b7312 100644 --- a/packages/SystemUI/src/com/android/systemui/SlicePermissionActivity.java +++ b/packages/SystemUI/src/com/android/systemui/SlicePermissionActivity.java @@ -51,7 +51,11 @@ public class SlicePermissionActivity extends Activity implements OnClickListener super.onCreate(savedInstanceState); // 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); if (mUri == null || !SliceProvider.SLICE_TYPE.equals(getContentResolver().getType(mUri)) |