Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4b1bdc02: Merge "DO NOT MERGE Fixing Connectivity" into gingerbread

Browse Source 
Merge commit '4b1bdc0209650436ebe0dad1020080cc891e97b6' into gingerbread-plus-aosp

* commit '4b1bdc0209650436ebe0dad1020080cc891e97b6':
  DO NOT MERGE Fixing Connectivity
This commit is contained in:
Robert Greenwalt
2010-08-20 12:04:07 -07:00
committed by Android Git Automerger
parent 5474b0f860 4b1bdc0209
commit 2b05a95bcc
7 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
telephony/java/com/android/internal/telephony/DefaultPhoneNotifier.java
View File

@@ -102,7 +102,8 @@ public class DefaultPhoneNotifier implements PhoneNotifier {
sender.getActiveApnTypes(),
sender.getInterfaceName(null),
((telephony!=null) ? telephony.getNetworkType() :
TelephonyManager.NETWORK_TYPE_UNKNOWN));
TelephonyManager.NETWORK_TYPE_UNKNOWN),
sender.getGateway(null));
} catch (RemoteException ex) {
// system process is dead
}

3
telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl
View File

@@ -32,7 +32,8 @@ interface ITelephonyRegistry {
void notifyCallForwardingChanged(boolean cfi);
void notifyDataActivity(int state);
void notifyDataConnection(int state, boolean isDataConnectivityPossible,
String reason, String apn, in String[] apnTypes, String interfaceName, int networkType);
String reason, String apn, in String[] apnTypes, String interfaceName, int networkType,
String gateway);
void notifyDataConnectionFailed(String reason);
void notifyCellLocation(in Bundle cellLocation);
}

1
telephony/java/com/android/internal/telephony/Phone.java
View File

@@ -103,6 +103,7 @@ public interface Phone {
static final String DATA_APN_KEY = "apn";
static final String DATA_IFACE_NAME_KEY = "iface";
static final String DATA_GATEWAY_KEY = "gateway";
static final String NETWORK_UNAVAILABLE_KEY = "networkUnvailable";
static final String PHONE_IN_ECM_STATE = "phoneinECMState";

3
telephony/java/com/android/internal/telephony/SipPhoneNotifier.java
View File

@@ -104,7 +104,8 @@ public class SipPhoneNotifier implements PhoneNotifier {
sender.getActiveApnTypes(),
sender.getInterfaceName(null),
((telephony!=null) ? telephony.getNetworkType() :
TelephonyManager.NETWORK_TYPE_UNKNOWN));
TelephonyManager.NETWORK_TYPE_UNKNOWN),
sender.getGateway(null));
} catch (RemoteException ex) {
// system process is dead
}