Merge "[Settings] Code refactor"
diff --git a/src/com/android/settings/datausage/BillingCyclePreference.java b/src/com/android/settings/datausage/BillingCyclePreference.java
index 8dea7de..47ef56b 100644
--- a/src/com/android/settings/datausage/BillingCyclePreference.java
+++ b/src/com/android/settings/datausage/BillingCyclePreference.java
@@ -96,7 +96,7 @@
}
/**
- * Implementation of MobileDataEnabledListener.Client
+ * Implementation of {@code MobileDataEnabledListener.Client}
*/
public void onMobileDataEnabledChange() {
updateEnabled();
diff --git a/src/com/android/settings/datausage/CellDataPreference.java b/src/com/android/settings/datausage/CellDataPreference.java
index f4f2be7..4a49f33 100644
--- a/src/com/android/settings/datausage/CellDataPreference.java
+++ b/src/com/android/settings/datausage/CellDataPreference.java
@@ -240,7 +240,7 @@
};
/**
- * Implementation of MobileDataEnabledListener.Client
+ * Implementation of {@code MobileDataEnabledListener.Client}
*/
@VisibleForTesting
public void onMobileDataEnabledChange() {
diff --git a/src/com/android/settings/datausage/DataUsageList.java b/src/com/android/settings/datausage/DataUsageList.java
index f747951..0cfb831 100644
--- a/src/com/android/settings/datausage/DataUsageList.java
+++ b/src/com/android/settings/datausage/DataUsageList.java
@@ -201,7 +201,6 @@
public void onDestroy() {
mUidDetailProvider.clearCache();
mUidDetailProvider = null;
- mDataStateListener.stop();
super.onDestroy();
}
@@ -232,7 +231,7 @@
}
/**
- * Implementation of MobileDataEnabledListener.Client
+ * Implementation of {@code MobileDataEnabledListener.Client}
*/
public void onMobileDataEnabledChange() {
updatePolicy();
diff --git a/src/com/android/settings/datausage/DataUsageSummary.java b/src/com/android/settings/datausage/DataUsageSummary.java
index 0796e5a..1a83800 100644
--- a/src/com/android/settings/datausage/DataUsageSummary.java
+++ b/src/com/android/settings/datausage/DataUsageSummary.java
@@ -78,7 +78,7 @@
super.onCreate(icicle);
Context context = getContext();
- // enable ProxySubscriptionMgr with Lifecycle support for all controllers
+ // Enable ProxySubscriptionMgr with Lifecycle support for all controllers
// live within this fragment
mProxySubscriptionMgr = ProxySubscriptionManager.getInstance(context);
mProxySubscriptionMgr.setLifecycle(getLifecycle());
diff --git a/src/com/android/settings/network/MobileDataEnabledListener.java b/src/com/android/settings/network/MobileDataEnabledListener.java
index 4c04282..b030823 100644
--- a/src/com/android/settings/network/MobileDataEnabledListener.java
+++ b/src/com/android/settings/network/MobileDataEnabledListener.java
@@ -25,12 +25,12 @@
private Context mContext;
private Client mClient;
private int mSubId;
- /**
- * There're 2 listeners both activated at the same time.
- * For project that access MOBILE_DATA, only first listener is functional.
- * For project that access "MOBILE_DATA + subId", first listener will be stopped when receiving
- * any onChange from second listener.
- */
+
+ // There're 2 listeners both activated at the same time.
+ // For project that access MOBILE_DATA, only first listener is functional.
+ // For project that access "MOBILE_DATA + subId", first listener will be stopped when receiving
+ // any onChange from second listener.
+
private GlobalSettingsChangeListener mListener;
private GlobalSettingsChangeListener mListenerForSubId;
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java
index 6894d38..9aca92e 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java
@@ -93,7 +93,7 @@
}
@Test
- public void resumePause_shouldListenUnlistenDataStateChange() {
+ public void resume_shouldListenDataStateChange() {
ReflectionHelpers.setField(
mDataUsageList, "mVisibilityLoggerMixin", mock(VisibilityLoggerMixin.class));
ReflectionHelpers.setField(
@@ -104,6 +104,17 @@
verify(mMobileDataEnabledListener).start(anyInt());
mDataUsageList.onPause();
+ }
+
+ @Test
+ public void pause_shouldUnlistenDataStateChange() {
+ ReflectionHelpers.setField(
+ mDataUsageList, "mVisibilityLoggerMixin", mock(VisibilityLoggerMixin.class));
+ ReflectionHelpers.setField(
+ mDataUsageList, "mPreferenceManager", mock(PreferenceManager.class));
+
+ mDataUsageList.onResume();
+ mDataUsageList.onPause();
verify(mMobileDataEnabledListener).stop();
}