Merge "Notify SubscriptionInfo change when setOpportunistic or setMetered" (6468c41a) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/SubscriptionController.java

+10 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2349,8 +2349,12 @@ public class SubscriptionController extends ISub.Stub {

	long token = Binder.clearCallingIdentity();		long token = Binder.clearCallingIdentity();
	try {		try {
	return setSubscriptionProperty(subId, SubscriptionManager.IS_OPPORTUNISTIC,		int ret = setSubscriptionProperty(subId, SubscriptionManager.IS_OPPORTUNISTIC,
	String.valueOf(opportunistic ? 1 : 0));		String.valueOf(opportunistic ? 1 : 0));

			if (ret != 0) notifySubscriptionInfoChanged();

			return ret;
	} finally {		} finally {
	Binder.restoreCallingIdentity(token);		Binder.restoreCallingIdentity(token);
	}		}
	@@ -2380,8 +2384,12 @@ public class SubscriptionController extends ISub.Stub {

	long token = Binder.clearCallingIdentity();		long token = Binder.clearCallingIdentity();
	try {		try {
	return setSubscriptionProperty(subId, SubscriptionManager.IS_METERED,		int ret = setSubscriptionProperty(subId, SubscriptionManager.IS_METERED,
	String.valueOf(isMetered ? 1 : 0));		String.valueOf(isMetered ? 1 : 0));

			if (ret != 0) notifySubscriptionInfoChanged();

			return ret;
	} finally {		} finally {
	Binder.restoreCallingIdentity(token);		Binder.restoreCallingIdentity(token);
	}		}