Merge "Fix: avoid the potential attack on SlicePermissionActivity" am: b800bb37f6 am: a473b41f58 am: 4d21a90846 am: cf61d6c798 am: 2d269dde64
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2632649 Change-Id: I175c498d37a1b8631a9706c7e9380ad41bae6324 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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))
|
||||
|
||||
Reference in New Issue
Block a user