Merge "Fix: avoid the potential attack on SlicePermissionActivity"

This commit is contained in:
Treehugger Robot
2023-06-29 22:36:31 +00:00
committed by Gerrit Code Review

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))