network: add support for the new 'ModemManager1' interface
ModemManager >= 0.7 comes with a new DBus interface. This patch makes the shell work with the new interface if the modem is detected as being exposed by the new ModemManager (based on the device.udi string reported by NM). https://bugzilla.gnome.org/show_bug.cgi?id=687359.
This commit is contained in:
@ -698,7 +698,18 @@ const NMDeviceModem = new Lang.Class({
|
||||
this._connectionType = 'ppp';
|
||||
|
||||
this._capabilities = device.current_capabilities;
|
||||
if (this._capabilities & NetworkManager.DeviceModemCapabilities.GSM_UMTS) {
|
||||
// Support new ModemManager1 devices
|
||||
if (device.udi.indexOf('/org/freedesktop/ModemManager1/Modem') == 0) {
|
||||
is_wwan = true;
|
||||
this.mobileDevice = new ModemManager.BroadbandModem(device.udi, device.current_capabilities);
|
||||
if (this._capabilities & NetworkManager.DeviceModemCapabilities.GSM_UMTS) {
|
||||
this._connectionType = NetworkManager.SETTING_GSM_SETTING_NAME;
|
||||
} else if (this._capabilities & NetworkManager.DeviceModemCapabilities.LTE) {
|
||||
this._connectionType = NetworkManager.SETTING_GSM_SETTING_NAME;
|
||||
} else if (this._capabilities & NetworkManager.DeviceModemCapabilities.CDMA_EVDO) {
|
||||
this._connectionType = NetworkManager.SETTING_CDMA_SETTING_NAME;
|
||||
}
|
||||
} else if (this._capabilities & NetworkManager.DeviceModemCapabilities.GSM_UMTS) {
|
||||
is_wwan = true;
|
||||
this.mobileDevice = new ModemManager.ModemGsm(device.udi);
|
||||
this._connectionType = NetworkManager.SETTING_GSM_SETTING_NAME;
|
||||
|
Reference in New Issue
Block a user