diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2010-09-09 14:05:10 -0700 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2010-09-09 14:05:10 -0700 |
| commit | 057d5e9824a01a03c13d5a32d3c7f5023d01586e (patch) | |
| tree | e70aedcf30cce63b43f31de44d4ca786f63b1997 | |
| parent | 1560473ec1e0f7fe63e182dd72a4beb4a1ed1c7b (diff) | |
| download | frameworks_base-057d5e9824a01a03c13d5a32d3c7f5023d01586e.zip frameworks_base-057d5e9824a01a03c13d5a32d3c7f5023d01586e.tar.gz frameworks_base-057d5e9824a01a03c13d5a32d3c7f5023d01586e.tar.bz2 | |
Fix the build
broken merge resolution.
Change-Id: Idf1abef1ef79ddc43b9eaba1e0e523085702e2fe
| -rw-r--r-- | services/java/com/android/server/ConnectivityService.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index 579051c..96a239d 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -1637,7 +1637,6 @@ public class ConnectivityService extends IConnectivityManager.Stub { FeatureUser u = (FeatureUser)msg.obj; u.expire(); break; -<<<<<<< HEAD:services/java/com/android/server/ConnectivityService.java case NetworkStateTracker.EVENT_CLEAR_NET_TRANSITION_WAKELOCK: String causedBy = null; synchronized (ConnectivityService.this) { @@ -1651,7 +1650,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { Slog.d(TAG, "NetTransition Wakelock for " + causedBy + " released by timeout"); } -======= + break; case NetworkStateTracker.EVENT_INET_CONDITION_CHANGE: if (DBG) { Slog.d(TAG, "Inet connectivity change, net=" + @@ -1715,7 +1714,6 @@ public class ConnectivityService extends IConnectivityManager.Stub { } mDefaultInetConditionPublished = mDefaultInetCondition; sendConnectedBroadcast(networkInfo); ->>>>>>> ec52c98d:services/java/com/android/server/ConnectivityService.java break; } } |