equal
deleted
inserted
replaced
101 void CNetworkManager::RegisterObserverL( MSIPNetworkObserver& aObserver, |
101 void CNetworkManager::RegisterObserverL( MSIPNetworkObserver& aObserver, |
102 TInt aIapId, |
102 TInt aIapId, |
103 TInt aError ) |
103 TInt aError ) |
104 { |
104 { |
105 __SIP_LOG("CNetworkManager::RegisterObserverL, Start") |
105 __SIP_LOG("CNetworkManager::RegisterObserverL, Start") |
106 // A bearer monitor plugin is not needed on emulator, except when doing |
|
107 // unit testing |
|
108 #if ((defined (__WINS__) || defined(__WINSCW__)) && !defined(CPPUNIT_TEST) ) |
|
109 |
|
110 aError++; aIapId++; aObserver; // Avoid compiler warnings |
|
111 return; |
|
112 |
|
113 #else |
|
114 |
106 |
115 // Try to find an existing observer entry from the registry |
107 // Try to find an existing observer entry from the registry |
116 TInt index = FindRegistryEntry( aObserver ); |
108 TInt index = FindRegistryEntry( aObserver ); |
117 if( index != KErrNotFound ) |
109 if( index != KErrNotFound ) |
118 { |
110 { |
136 entry.iReportedState = MSIPNetworkObserver::ENetworkUnknown; |
128 entry.iReportedState = MSIPNetworkObserver::ENetworkUnknown; |
137 CleanupClosePushL( *bearer ); |
129 CleanupClosePushL( *bearer ); |
138 iObservers.AppendL( entry ); |
130 iObservers.AppendL( entry ); |
139 CleanupStack::Pop( bearer ); |
131 CleanupStack::Pop( bearer ); |
140 } |
132 } |
141 #endif |
|
142 } |
133 } |
143 |
134 |
144 // ----------------------------------------------------------------------------- |
135 // ----------------------------------------------------------------------------- |
145 // CNetworkManager::Deregister |
136 // CNetworkManager::Deregister |
146 // ----------------------------------------------------------------------------- |
137 // ----------------------------------------------------------------------------- |
493 // ----------------------------------------------------------------------------- |
484 // ----------------------------------------------------------------------------- |
494 // |
485 // |
495 const TSIPAccessNetworkInfo& CNetworkManager::RegisterAccessNetworkObserver( |
486 const TSIPAccessNetworkInfo& CNetworkManager::RegisterAccessNetworkObserver( |
496 MSIPNetworkInfoObserver& aObserver ) |
487 MSIPNetworkInfoObserver& aObserver ) |
497 { |
488 { |
498 // A bearer monitor plugin is not needed on emulator, except when doing |
489 |
499 // unit testing |
|
500 #if ((defined (__WINS__) || defined(__WINSCW__)) && !defined(CPPUNIT_TEST) ) |
|
501 aObserver; // Avoid compiler warnings |
|
502 |
|
503 //Since the real plugin is not started in emulator, pass hardcoded values |
|
504 //to ConnectionMgr so that the P-Access-Network-Info header can be tested. |
|
505 iAccessNetworkInfo = DummyAccessNetworkValues(); |
|
506 |
|
507 #else |
|
508 iNetworkInfoObserver = &aObserver; |
490 iNetworkInfoObserver = &aObserver; |
509 #endif |
|
510 |
|
511 return iAccessNetworkInfo; |
491 return iAccessNetworkInfo; |
512 } |
492 } |
513 |
493 |
514 // ----------------------------------------------------------------------------- |
494 // ----------------------------------------------------------------------------- |
515 // CNetworkManager::DummyAccessNetworkValues |
495 // CNetworkManager::DummyAccessNetworkValues |