Merge "[Settings] Correct spelling in source code"
am: 22c5c7d4a4
Change-Id: Ia9322a82c58385c4aed2f4b3ffa0d85aed7b123f
This commit is contained in:
@@ -77,7 +77,7 @@ public class ProxySubscriptionManager implements LifecycleObserver {
|
|||||||
mActiveSubscriptionsListeners =
|
mActiveSubscriptionsListeners =
|
||||||
new ArrayList<OnActiveSubscriptionChangedListener>();
|
new ArrayList<OnActiveSubscriptionChangedListener>();
|
||||||
|
|
||||||
mSubsciptionsMonitor = new ActiveSubsciptionsListener(looper, context) {
|
mSubscriptionMonitor = new ActiveSubsciptionsListener(looper, context) {
|
||||||
public void onChanged() {
|
public void onChanged() {
|
||||||
notifyAllListeners();
|
notifyAllListeners();
|
||||||
}
|
}
|
||||||
@@ -85,16 +85,16 @@ public class ProxySubscriptionManager implements LifecycleObserver {
|
|||||||
mAirplaneModeMonitor = new GlobalSettingsChangeListener(looper,
|
mAirplaneModeMonitor = new GlobalSettingsChangeListener(looper,
|
||||||
context, Settings.Global.AIRPLANE_MODE_ON) {
|
context, Settings.Global.AIRPLANE_MODE_ON) {
|
||||||
public void onChanged(String field) {
|
public void onChanged(String field) {
|
||||||
mSubsciptionsMonitor.clearCache();
|
mSubscriptionMonitor.clearCache();
|
||||||
notifyAllListeners();
|
notifyAllListeners();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
mSubsciptionsMonitor.start();
|
mSubscriptionMonitor.start();
|
||||||
}
|
}
|
||||||
|
|
||||||
private Lifecycle mLifecycle;
|
private Lifecycle mLifecycle;
|
||||||
private ActiveSubsciptionsListener mSubsciptionsMonitor;
|
private ActiveSubsciptionsListener mSubscriptionMonitor;
|
||||||
private GlobalSettingsChangeListener mAirplaneModeMonitor;
|
private GlobalSettingsChangeListener mAirplaneModeMonitor;
|
||||||
|
|
||||||
private List<OnActiveSubscriptionChangedListener> mActiveSubscriptionsListeners;
|
private List<OnActiveSubscriptionChangedListener> mActiveSubscriptionsListeners;
|
||||||
@@ -130,17 +130,17 @@ public class ProxySubscriptionManager implements LifecycleObserver {
|
|||||||
|
|
||||||
@OnLifecycleEvent(ON_START)
|
@OnLifecycleEvent(ON_START)
|
||||||
void onStart() {
|
void onStart() {
|
||||||
mSubsciptionsMonitor.start();
|
mSubscriptionMonitor.start();
|
||||||
}
|
}
|
||||||
|
|
||||||
@OnLifecycleEvent(ON_STOP)
|
@OnLifecycleEvent(ON_STOP)
|
||||||
void onStop() {
|
void onStop() {
|
||||||
mSubsciptionsMonitor.stop();
|
mSubscriptionMonitor.stop();
|
||||||
}
|
}
|
||||||
|
|
||||||
@OnLifecycleEvent(ON_DESTROY)
|
@OnLifecycleEvent(ON_DESTROY)
|
||||||
void onDestroy() {
|
void onDestroy() {
|
||||||
mSubsciptionsMonitor.close();
|
mSubscriptionMonitor.close();
|
||||||
mAirplaneModeMonitor.close();
|
mAirplaneModeMonitor.close();
|
||||||
|
|
||||||
if (mLifecycle != null) {
|
if (mLifecycle != null) {
|
||||||
@@ -157,7 +157,7 @@ public class ProxySubscriptionManager implements LifecycleObserver {
|
|||||||
* @return a SubscriptionManager
|
* @return a SubscriptionManager
|
||||||
*/
|
*/
|
||||||
public SubscriptionManager get() {
|
public SubscriptionManager get() {
|
||||||
return mSubsciptionsMonitor.getSubscriptionManager();
|
return mSubscriptionMonitor.getSubscriptionManager();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -166,7 +166,7 @@ public class ProxySubscriptionManager implements LifecycleObserver {
|
|||||||
* @return max. number of active subscription info(s)
|
* @return max. number of active subscription info(s)
|
||||||
*/
|
*/
|
||||||
public int getActiveSubscriptionInfoCountMax() {
|
public int getActiveSubscriptionInfoCountMax() {
|
||||||
return mSubsciptionsMonitor.getActiveSubscriptionInfoCountMax();
|
return mSubscriptionMonitor.getActiveSubscriptionInfoCountMax();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -175,7 +175,7 @@ public class ProxySubscriptionManager implements LifecycleObserver {
|
|||||||
* @return A list of active subscription info
|
* @return A list of active subscription info
|
||||||
*/
|
*/
|
||||||
public List<SubscriptionInfo> getActiveSubscriptionsInfo() {
|
public List<SubscriptionInfo> getActiveSubscriptionsInfo() {
|
||||||
return mSubsciptionsMonitor.getActiveSubscriptionsInfo();
|
return mSubscriptionMonitor.getActiveSubscriptionsInfo();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -185,7 +185,7 @@ public class ProxySubscriptionManager implements LifecycleObserver {
|
|||||||
* @return A subscription info which is active list
|
* @return A subscription info which is active list
|
||||||
*/
|
*/
|
||||||
public SubscriptionInfo getActiveSubscriptionInfo(int subId) {
|
public SubscriptionInfo getActiveSubscriptionInfo(int subId) {
|
||||||
return mSubsciptionsMonitor.getActiveSubscriptionInfo(subId);
|
return mSubscriptionMonitor.getActiveSubscriptionInfo(subId);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -194,7 +194,7 @@ public class ProxySubscriptionManager implements LifecycleObserver {
|
|||||||
* @return A list of accessible subscription info
|
* @return A list of accessible subscription info
|
||||||
*/
|
*/
|
||||||
public List<SubscriptionInfo> getAccessibleSubscriptionsInfo() {
|
public List<SubscriptionInfo> getAccessibleSubscriptionsInfo() {
|
||||||
return mSubsciptionsMonitor.getAccessibleSubscriptionsInfo();
|
return mSubscriptionMonitor.getAccessibleSubscriptionsInfo();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -204,14 +204,14 @@ public class ProxySubscriptionManager implements LifecycleObserver {
|
|||||||
* @return A subscription info which is accessible list
|
* @return A subscription info which is accessible list
|
||||||
*/
|
*/
|
||||||
public SubscriptionInfo getAccessibleSubscriptionInfo(int subId) {
|
public SubscriptionInfo getAccessibleSubscriptionInfo(int subId) {
|
||||||
return mSubsciptionsMonitor.getAccessibleSubscriptionInfo(subId);
|
return mSubscriptionMonitor.getAccessibleSubscriptionInfo(subId);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Clear data cached within proxy
|
* Clear data cached within proxy
|
||||||
*/
|
*/
|
||||||
public void clearCache() {
|
public void clearCache() {
|
||||||
mSubsciptionsMonitor.clearCache();
|
mSubscriptionMonitor.clearCache();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Reference in New Issue
Block a user