LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Create telephony-common and mms-common

Browse Source 
These have been created to reduce the size and complexity
of frameworks/base.

mms-common was created by moving all of
  frameworks/base/core/java/com/google/android/mms
to:
   frameworks/opt/mms

telephony-common was created by moving some of
   frameworks/base/telephony
to:
   frameworks/opt/telephony

Change-Id: If6cb3c6ff952767fc10210f923dc0e4b343cd4ad
This commit is contained in:
Wink Saville
2012-07-10 12:37:54 -07:00
parent da0ba6beec
commit 64e3f78abb
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/java/com/android/server/ConnectivityService.java
View File

@@ -77,6 +77,7 @@ import android.util.SparseIntArray;
import com.android.internal.net.LegacyVpnInfo;
import com.android.internal.net.VpnConfig;
import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneConstants;
import com.android.server.am.BatteryStatsService;
import com.android.server.connectivity.Tethering;
import com.android.server.connectivity.Vpn;
@@ -1008,7 +1009,7 @@ private NetworkStateTracker makeWimaxStateTracker() {
try {
if (!ConnectivityManager.isNetworkTypeValid(networkType) ||
mNetConfigs[networkType] == null) {
return Phone.APN_REQUEST_FAILED;
return PhoneConstants.APN_REQUEST_FAILED;
}
FeatureUser f = new FeatureUser(networkType, feature, binder);
@@ -1027,7 +1028,7 @@ private NetworkStateTracker makeWimaxStateTracker() {
uidRules = mUidRules.get(Binder.getCallingUid(), RULE_ALLOW_ALL);
}
if (networkMetered && (uidRules & RULE_REJECT_METERED) != 0) {
return Phone.APN_REQUEST_FAILED;
return PhoneConstants.APN_REQUEST_FAILED;
}
NetworkStateTracker network = mNetTrackers[usedNetworkType];
@@ -1039,7 +1040,7 @@ private NetworkStateTracker makeWimaxStateTracker() {
if (ni.isAvailable() == false) {
if (!TextUtils.equals(feature,Phone.FEATURE_ENABLE_DUN_ALWAYS)) {
if (DBG) log("special network not available ni=" + ni.getTypeName());
return Phone.APN_TYPE_NOT_AVAILABLE;
return PhoneConstants.APN_TYPE_NOT_AVAILABLE;
} else {
// else make the attempt anyway - probably giving REQUEST_STARTED below
if (DBG) {
@@ -1088,10 +1089,10 @@ private NetworkStateTracker makeWimaxStateTracker() {
} finally {
Binder.restoreCallingIdentity(token);
}
return Phone.APN_ALREADY_ACTIVE;
return PhoneConstants.APN_ALREADY_ACTIVE;
}
if (VDBG) log("special network already connecting");
return Phone.APN_REQUEST_STARTED;
return PhoneConstants.APN_REQUEST_STARTED;
}
// check if the radio in play can make another contact
@@ -1102,7 +1103,7 @@ private NetworkStateTracker makeWimaxStateTracker() {
feature);
}
network.reconnect();
return Phone.APN_REQUEST_STARTED;
return PhoneConstants.APN_REQUEST_STARTED;
} else {
// need to remember this unsupported request so we respond appropriately on stop
synchronized(this) {
@@ -1115,7 +1116,7 @@ private NetworkStateTracker makeWimaxStateTracker() {
return -1;
}
}
return Phone.APN_TYPE_NOT_AVAILABLE;
return PhoneConstants.APN_TYPE_NOT_AVAILABLE;
} finally {
if (DBG) {
final long execTime = SystemClock.elapsedRealtime() - startTime;
@@ -2037,7 +2038,7 @@ private NetworkStateTracker makeWimaxStateTracker() {
// @see bug/4455071
/** Notify TetheringService if interface name has been changed. */
if (TextUtils.equals(mNetTrackers[netType].getNetworkInfo().getReason(),
Phone.REASON_LINK_PROPERTIES_CHANGED)) {
PhoneConstants.REASON_LINK_PROPERTIES_CHANGED)) {
if (isTetheringSupported()) {
mTethering.handleTetherIfaceChange();
}