summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/dashboard/conditional/BackgroundDataCondition.java
diff options
context:
space:
mode:
authorJan Nordqvist <jannq@google.com>2018-02-26 13:55:00 -0800
committerJan Nordqvist <jannq@google.com>2018-02-26 17:10:45 -0800
commite2385be5e129322fa137dce0a53e025480bf66ba (patch)
treee3eef5feeee1f96d6140a6c1b9e1e04530c243ed /src/com/android/settings/dashboard/conditional/BackgroundDataCondition.java
parentd4c1d5ee90f76bcdf7f8f539ca704db85f12b289 (diff)
downloadpackages_apps_Settings-e2385be5e129322fa137dce0a53e025480bf66ba.tar.gz
packages_apps_Settings-e2385be5e129322fa137dce0a53e025480bf66ba.tar.bz2
packages_apps_Settings-e2385be5e129322fa137dce0a53e025480bf66ba.zip
Fixed failing launch of Data usage activty from data saver suggestion.
After introducing the new data usage UI behind a feature flag a bug was introduced that causes the data saver suggestion to throw an exception from a missing class reference in "legacy" mode. Bug: 73648306 Test: manual Change-Id: I4fcd2bd0f55931f40738266dca94a55fea5087b3
Diffstat (limited to 'src/com/android/settings/dashboard/conditional/BackgroundDataCondition.java')
-rw-r--r--src/com/android/settings/dashboard/conditional/BackgroundDataCondition.java11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/com/android/settings/dashboard/conditional/BackgroundDataCondition.java b/src/com/android/settings/dashboard/conditional/BackgroundDataCondition.java
index cbac86f239..34172c277e 100644
--- a/src/com/android/settings/dashboard/conditional/BackgroundDataCondition.java
+++ b/src/com/android/settings/dashboard/conditional/BackgroundDataCondition.java
@@ -18,9 +18,12 @@ package com.android.settings.dashboard.conditional;
import android.content.Intent;
import android.graphics.drawable.Icon;
import android.net.NetworkPolicyManager;
+import android.util.FeatureFlagUtils;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.Settings;
+import com.android.settings.core.FeatureFlags;
public class BackgroundDataCondition extends Condition {
@@ -55,8 +58,12 @@ public class BackgroundDataCondition extends Condition {
@Override
public void onPrimaryClick() {
- mManager.getContext().startActivity(new Intent(mManager.getContext(),
- Settings.DataUsageSummaryActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+ final Class activityClass = FeatureFlagUtils.isEnabled(mManager.getContext(),
+ FeatureFlags.DATA_USAGE_SETTINGS_V2)
+ ? Settings.DataUsageSummaryActivity.class
+ : Settings.DataUsageSummaryLegacyActivity.class;
+ mManager.getContext().startActivity(new Intent(mManager.getContext(), activityClass)
+ .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
}
@Override