Bug 926343 - Part 3: Bluetooth changes for adding clientId in nsIIccProvider. r=gyeh

This commit is contained in:
Edgar Chen 2013-09-30 18:22:33 +08:00
Родитель d3b654cc3e
Коммит 4e050df812
2 изменённых файлов: 6 добавлений и 3 удалений

Просмотреть файл

@ -665,7 +665,8 @@ BluetoothHfpManager::HandleIccInfoChanged()
NS_ENSURE_TRUE_VOID(icc); NS_ENSURE_TRUE_VOID(icc);
nsCOMPtr<nsIDOMMozIccInfo> iccInfo; nsCOMPtr<nsIDOMMozIccInfo> iccInfo;
icc->GetIccInfo(getter_AddRefs(iccInfo)); // TODO: Bug 921991 - B2G BT: support multiple sim cards
icc->GetIccInfo(0, getter_AddRefs(iccInfo));
NS_ENSURE_TRUE_VOID(iccInfo); NS_ENSURE_TRUE_VOID(iccInfo);
nsCOMPtr<nsIDOMMozGsmIccInfo> gsmIccInfo = do_QueryInterface(iccInfo); nsCOMPtr<nsIDOMMozGsmIccInfo> gsmIccInfo = do_QueryInterface(iccInfo);

Просмотреть файл

@ -276,7 +276,8 @@ BluetoothRilListener::StartIccListening()
do_GetService(NS_RILCONTENTHELPER_CONTRACTID); do_GetService(NS_RILCONTENTHELPER_CONTRACTID);
NS_ENSURE_TRUE(provider, false); NS_ENSURE_TRUE(provider, false);
nsresult rv = provider->RegisterIccMsg(mIccListener); // TODO: Bug 921991 - B2G BT: support multiple sim cards
nsresult rv = provider->RegisterIccMsg(0, mIccListener);
return NS_SUCCEEDED(rv); return NS_SUCCEEDED(rv);
} }
@ -287,7 +288,8 @@ BluetoothRilListener::StopIccListening()
do_GetService(NS_RILCONTENTHELPER_CONTRACTID); do_GetService(NS_RILCONTENTHELPER_CONTRACTID);
NS_ENSURE_TRUE(provider, false); NS_ENSURE_TRUE(provider, false);
nsresult rv = provider->UnregisterIccMsg(mIccListener); // TODO: Bug 921991 - B2G BT: support multiple sim cards
nsresult rv = provider->UnregisterIccMsg(0, mIccListener);
return NS_SUCCEEDED(rv); return NS_SUCCEEDED(rv);
} }