summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2012-04-24 11:36:38 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-04-24 11:36:38 -0700
commita20ec538e5bed0e629b0930494cb793940d21eec (patch)
tree17bfac1920656fbf340d9876adb427c07b23a342 /src
parent3e9263a9721faf37599b9fd7765685804c1aeb0f (diff)
parentd92e0419b10d378c1f480be7088c469e1d1dd5f8 (diff)
downloadpackages_apps_Settings-a20ec538e5bed0e629b0930494cb793940d21eec.zip
packages_apps_Settings-a20ec538e5bed0e629b0930494cb793940d21eec.tar.gz
packages_apps_Settings-a20ec538e5bed0e629b0930494cb793940d21eec.tar.bz2
Merge "Fix data usage settings button visibility."
Diffstat (limited to 'src')
-rw-r--r--src/com/android/settings/DataUsageSummary.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 62c86d8..7d45461 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -794,6 +794,7 @@ public class DataUsageSummary extends Fragment {
final boolean matchFound = pm.resolveActivity(mAppSettingsIntent, 0) != null;
mAppSettings.setEnabled(matchFound);
+ mAppSettings.setVisibility(View.VISIBLE);
} else {
mAppSettingsIntent = null;
@@ -1060,6 +1061,8 @@ public class DataUsageSummary extends Fragment {
private OnClickListener mAppSettingsListener = new OnClickListener() {
@Override
public void onClick(View v) {
+ if (!isAdded()) return;
+
// TODO: target torwards entire UID instead of just first package
startActivity(mAppSettingsIntent);
}