VpnDialogs: enforce calling permissions. (339abf1f) · Commits · e / os / android_frameworks_base

packages/VpnDialogs/AndroidManifest.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@

		<application android:label="VpnDialogs">
		<activity android:name=".ConfirmDialog"
		android:permission="android.permission.VPN"
		android:theme="@style/transparent">
		<intent-filter>
		<action android:name="android.intent.action.MAIN"/>

+7 −1

Original line number	Diff line number	Diff line
		@@ -58,6 +58,13 @@ public class ManageDialog extends Activity implements Handler.Callback,
		@Override
		protected void onResume() {
		super.onResume();

		if (getCallingPackage() != null) {
		Log.e(TAG, getCallingPackage() + " cannot start this activity");
		finish();
		return;
		}

		try {
		mConfig = getIntent().getParcelableExtra("config");

		@@ -83,7 +90,6 @@ public class ManageDialog extends Activity implements Handler.Callback,
		} else {
		PackageManager pm = getPackageManager();
		ApplicationInfo app = pm.getApplicationInfo(mConfig.packagz, 0);

		mDialog = new AlertDialog.Builder(this)
		.setIcon(app.loadIcon(pm))
		.setTitle(app.loadLabel(pm))