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