LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the build

Browse Source 
broken merge resolution.

Change-Id: Idf1abef1ef79ddc43b9eaba1e0e523085702e2fe
This commit is contained in:
Robert Greenwalt
2010-09-09 14:05:10 -07:00
parent 24118e8a28
commit cf1a56c8ba
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/ConnectivityService.java
View File

@@ -1637,7 +1637,6 @@ public class ConnectivityService extends IConnectivityManager.Stub {
FeatureUser u = (FeatureUser)msg.obj; FeatureUser u = (FeatureUser)msg.obj;
u.expire(); u.expire();
break; break;
<<<<<<< HEAD:services/java/com/android/server/ConnectivityService.java
case NetworkStateTracker.EVENT_CLEAR_NET_TRANSITION_WAKELOCK: case NetworkStateTracker.EVENT_CLEAR_NET_TRANSITION_WAKELOCK:
String causedBy = null; String causedBy = null;
synchronized (ConnectivityService.this) { synchronized (ConnectivityService.this) {
@@ -1651,7 +1650,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
Slog.d(TAG, "NetTransition Wakelock for " + Slog.d(TAG, "NetTransition Wakelock for " +
causedBy + " released by timeout"); causedBy + " released by timeout");
} }
======= break;
case NetworkStateTracker.EVENT_INET_CONDITION_CHANGE: case NetworkStateTracker.EVENT_INET_CONDITION_CHANGE:
if (DBG) { if (DBG) {
Slog.d(TAG, "Inet connectivity change, net=" + Slog.d(TAG, "Inet connectivity change, net=" +
@@ -1715,7 +1714,6 @@ public class ConnectivityService extends IConnectivityManager.Stub {
} }
mDefaultInetConditionPublished = mDefaultInetCondition; mDefaultInetConditionPublished = mDefaultInetCondition;
sendConnectedBroadcast(networkInfo); sendConnectedBroadcast(networkInfo);
>>>>>>> ec52c98d:services/java/com/android/server/ConnectivityService.java
break; break;
} }
} }