am 4aba8f26: am dc540ea0: Merge "Delete code that checks for the simulator, it\'s long gone." into mnc-dev

* commit '4aba8f26cdf585bf630e8e4020f5fc1f5322e841':
  Delete code that checks for the simulator, it's long gone.
This commit is contained in:
Lorenzo Colitti
2015-06-08 17:04:26 +00:00
committed by Android Git Automerger

View File

@@ -231,14 +231,6 @@ public class NetworkManagementService extends INetworkManagementService.Stub
// make sure this is on the same looper as our NativeDaemonConnector for sync purposes
mFgHandler = new Handler(FgThread.get().getLooper());
if ("simulator".equals(SystemProperties.get("ro.product.device"))) {
mConnector = null;
mThread = null;
mDaemonHandler = null;
mPhoneStateListener = null;
return;
}
// Don't need this wake lock, since we now have a time stamp for when
// the network actually went inactive. (It might be nice to still do this,
// but I don't want to do it through the power manager because that pollutes the