Notify NetworkPolicyManagerService on tethering changes

am: cfd438e0fd

Change-Id: I43b25305c730966da83acdaccb127c27be0e2332
This commit is contained in:
Christopher Wiley
2016-10-06 19:57:15 +00:00
committed by android-build-merger

View File

@@ -816,7 +816,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
mTestMode = SystemProperties.get("cm.test.mode").equals("true") mTestMode = SystemProperties.get("cm.test.mode").equals("true")
&& SystemProperties.get("ro.build.type").equals("eng"); && SystemProperties.get("ro.build.type").equals("eng");
mTethering = new Tethering(mContext, mNetd, statsService); mTethering = new Tethering(mContext, mNetd, statsService, mPolicyManager);
mPermissionMonitor = new PermissionMonitor(mContext, mNetd); mPermissionMonitor = new PermissionMonitor(mContext, mNetd);
@@ -3036,12 +3036,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
ConnectivityManager.enforceTetherChangePermission(mContext); ConnectivityManager.enforceTetherChangePermission(mContext);
if (isTetheringSupported()) { if (isTetheringSupported()) {
final int status = mTethering.tether(iface); final int status = mTethering.tether(iface);
if (status == ConnectivityManager.TETHER_ERROR_NO_ERROR) {
try {
mPolicyManager.onTetheringChanged(iface, true);
} catch (RemoteException e) {
}
}
return status; return status;
} else { } else {
return ConnectivityManager.TETHER_ERROR_UNSUPPORTED; return ConnectivityManager.TETHER_ERROR_UNSUPPORTED;
@@ -3055,12 +3049,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
if (isTetheringSupported()) { if (isTetheringSupported()) {
final int status = mTethering.untether(iface); final int status = mTethering.untether(iface);
if (status == ConnectivityManager.TETHER_ERROR_NO_ERROR) {
try {
mPolicyManager.onTetheringChanged(iface, false);
} catch (RemoteException e) {
}
}
return status; return status;
} else { } else {
return ConnectivityManager.TETHER_ERROR_UNSUPPORTED; return ConnectivityManager.TETHER_ERROR_UNSUPPORTED;