Clean up APN notifications. am: d391e894a3

Original change: undetermined

Change-Id: Ie6261737662957616f4ad98e9cac5c931029671f
This commit is contained in:
Robert Greenwalt
2021-05-31 03:43:03 +00:00
committed by Automerger Merge Worker

View File

@@ -597,15 +597,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
network.reconnect();
return Phone.APN_REQUEST_STARTED;
} else {
synchronized(this) {
mFeatureUsers.add(f);
}
mHandler.sendMessageDelayed(mHandler.obtainMessage(
NetworkStateTracker.EVENT_RESTORE_DEFAULT_NETWORK,
f), getRestoreDefaultNetworkDelay());
return network.startUsingNetworkFeature(feature,
getCallingPid(), getCallingUid());
return -1;
}
}
return Phone.APN_TYPE_NOT_AVAILABLE;
@@ -724,8 +716,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
tracker.teardown();
return 1;
} else {
// do it the old fashioned way
return tracker.stopUsingNetworkFeature(feature, pid, uid);
return -1;
}
}