am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started
* commit 'e3904c4f09b1a828e2d1f2f3536cdc8eca84a6aa':
Added a check if a custom activity can be started
diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java
index 95d3496..d6cfd75 100644
--- a/src/com/android/settings/users/AppRestrictionsFragment.java
+++ b/src/com/android/settings/users/AppRestrictionsFragment.java
@@ -28,6 +28,7 @@
import android.content.Intent;
import android.content.IntentFilter;
import android.content.RestrictionEntry;
+import android.content.pm.ActivityInfo;
import android.content.pm.ApplicationInfo;
import android.content.pm.IPackageManager;
import android.content.pm.PackageInfo;
@@ -839,6 +840,7 @@
p.setOnPreferenceClickListener(new OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
+ assertSafeToStartCustomActivity(customIntent);
int requestCode = generateCustomActivityRequestCode(
RestrictionsResultReceiver.this.preference);
AppRestrictionsFragment.this.startActivityForResult(
@@ -853,6 +855,25 @@
preference.setRestrictions(restrictions);
}
}
+
+ private void assertSafeToStartCustomActivity(Intent intent) {
+ // Activity can be started if it belongs to the same app
+ if (intent.getPackage() != null && intent.getPackage().equals(packageName)) {
+ return;
+ }
+ // Activity can be started if intent resolves to multiple activities
+ List<ResolveInfo> resolveInfos = AppRestrictionsFragment.this.mPackageManager
+ .queryIntentActivities(intent, 0 /* no flags */);
+ if (resolveInfos.size() != 1) {
+ return;
+ }
+ // Prevent potential privilege escalation
+ ActivityInfo activityInfo = resolveInfos.get(0).activityInfo;
+ if (!packageName.equals(activityInfo.packageName)) {
+ throw new SecurityException("Application " + packageName
+ + " is not allowed to start activity " + intent);
+ };
+ }
}
private void onRestrictionsReceived(AppRestrictionsPreference preference, String packageName,