DO NOT MERGE: Validate config activities with their rule owners
Test: manual
Bug: 189332346
Bug: 235823407
Bug: 255830464
Change-Id: Iee1b1caca4d6eb2729feb872c3e4954b6c16519c
diff --git a/tests/CarDeveloperOptions/src/com/android/car/developeroptions/notification/AbstractZenModeAutomaticRulePreferenceController.java b/tests/CarDeveloperOptions/src/com/android/car/developeroptions/notification/AbstractZenModeAutomaticRulePreferenceController.java
index 0a48781..c5575e0 100644
--- a/tests/CarDeveloperOptions/src/com/android/car/developeroptions/notification/AbstractZenModeAutomaticRulePreferenceController.java
+++ b/tests/CarDeveloperOptions/src/com/android/car/developeroptions/notification/AbstractZenModeAutomaticRulePreferenceController.java
@@ -26,8 +26,11 @@
import android.content.pm.ComponentInfo;
import android.content.pm.PackageManager;
import android.content.pm.ServiceInfo;
+import android.os.Binder;
import android.provider.Settings;
import android.service.notification.ConditionProviderService;
+import android.util.Log;
+import android.util.Slog;
import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
@@ -36,6 +39,7 @@
import com.android.settingslib.core.lifecycle.Lifecycle;
import java.util.Map;
+import java.util.Objects;
abstract public class AbstractZenModeAutomaticRulePreferenceController extends
AbstractZenModePreferenceController implements PreferenceControllerMixin {
@@ -92,7 +96,7 @@
? ci.metaData.getString(ConditionProviderService.META_DATA_RULE_TYPE)
: ci.metaData.getString(NotificationManager.META_DATA_AUTOMATIC_RULE_TYPE);
- final ComponentName configurationActivity = getSettingsActivity(null, ci);
+ final ComponentName configurationActivity = getSettingsActivity(pm, null, ci);
if (ruleType != null && !ruleType.trim().isEmpty() && configurationActivity != null) {
final ZenRuleInfo ri = new ZenRuleInfo();
ri.serviceComponent =
@@ -110,25 +114,44 @@
return null;
}
- protected static ComponentName getSettingsActivity(AutomaticZenRule rule, ComponentInfo ci) {
+ protected static ComponentName getSettingsActivity(PackageManager pm, AutomaticZenRule rule,
+ ComponentInfo ci) {
+ String owner = rule != null ? rule.getPackageName() : ci.packageName;
+ ComponentName settingsActivity = null;
// prefer config activity on the rule itself; fallback to manifest definition
if (rule != null && rule.getConfigurationActivity() != null) {
- return rule.getConfigurationActivity();
+ settingsActivity = rule.getConfigurationActivity();
+ } else {
+ if (ci == null) {
+ settingsActivity = null;
+ } else if (ci instanceof ActivityInfo) {
+ // new activity backed rule
+ settingsActivity = new ComponentName(ci.packageName, ci.name);
+ } else if (ci.metaData != null) {
+ // old service backed rule
+ final String configurationActivity = ci.metaData.getString(
+ ConditionProviderService.META_DATA_CONFIGURATION_ACTIVITY);
+ if (configurationActivity != null) {
+ settingsActivity = ComponentName.unflattenFromString(configurationActivity);
+ }
+ }
}
- if (ci == null) {
+ if (settingsActivity == null || owner == null) {
+ return settingsActivity;
+ }
+ try {
+ int ownerUid = pm.getPackageUid(owner, 0);
+ int configActivityOwnerUid = pm.getPackageUid(settingsActivity.getPackageName(), 0);
+ if (ownerUid == configActivityOwnerUid) {
+ return settingsActivity;
+ } else {
+ Log.w(TAG, "Config activity not in owner package for " + rule.getName());
+ return null;
+ }
+ } catch (PackageManager.NameNotFoundException e) {
+ Log.e(TAG, "Failed to find config activity");
return null;
}
- // new activity backed rule
- if (ci instanceof ActivityInfo) {
- return new ComponentName(ci.packageName, ci.name);
- }
- // old service backed rule
- final String configurationActivity =
- ci.metaData.getString(ConditionProviderService.META_DATA_CONFIGURATION_ACTIVITY);
- if (configurationActivity != null) {
- return ComponentName.unflattenFromString(configurationActivity);
- }
- return null;
}
public class RuleNameChangeListener implements ZenRuleNameDialog.PositiveClickListener {
diff --git a/tests/CarDeveloperOptions/src/com/android/car/developeroptions/notification/ZenRulePreference.java b/tests/CarDeveloperOptions/src/com/android/car/developeroptions/notification/ZenRulePreference.java
index d6eaf8a..61f3f9a 100644
--- a/tests/CarDeveloperOptions/src/com/android/car/developeroptions/notification/ZenRulePreference.java
+++ b/tests/CarDeveloperOptions/src/com/android/car/developeroptions/notification/ZenRulePreference.java
@@ -168,7 +168,7 @@
: isEvent ? ZenModeEventRuleSettings.ACTION : "";
ComponentInfo si = mServiceListing.findService(rule.getOwner());
ComponentName settingsActivity = AbstractZenModeAutomaticRulePreferenceController.
- getSettingsActivity(rule, si);
+ getSettingsActivity(mPm, rule, si);
mIntent = AbstractZenModeAutomaticRulePreferenceController.getRuleIntent(action,
settingsActivity, mId);
if (mIntent.resolveActivity(mPm) == null) {
