diff options
| author | 2023-06-30 00:05:45 +0000 | |
|---|---|---|
| committer | 2023-06-30 00:05:45 +0000 | |
| commit | 4d21a90846a24e1cb497f61878605a59dedfab5e (patch) | |
| tree | c7be721143dbbddf7d1fdd14a62a5297ea2d43aa | |
| parent | a5d39a1f7b76d1cf3e017e832b547cfbb517f96c (diff) | |
| parent | a473b41f5821708286480ef548afefc5c5ef9ba6 (diff) | |
Merge "Fix: avoid the potential attack on SlicePermissionActivity" am: b800bb37f6 am: a473b41f58
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2632649
Change-Id: I1a778056eea82d48db6643b2ecb28f6262275458
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)) |