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>
This commit is contained in:
@@ -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))
|
||||||
|
|||||||
Reference in New Issue
Block a user