Make BaseNetworkObserver available to core code

Currently BaseNetworkObserver is in frameworks/base/services, but
there is code in frameworks/base/core that could use it. This
code typically extends INetworkManagementEventObserver.stub
because BaseNetworkObserver is not available.

Move BaseNetworkObserver to frameworks/base/core without changing
its package name, and use it to simplify two callers. The third
caller, Tethering, is much larger, and I'm not sure it's
appropriate to change it.

Bug: 10232006
Change-Id: Ifc0f2e619e3424e27e35730c048a1cc523df345e
This commit is contained in:
Lorenzo Colitti
2013-08-20 19:51:30 +09:00
parent 4faa027df0
commit df86a9f2e9
3 changed files with 10 additions and 15 deletions

View File

@@ -27,6 +27,8 @@ import android.os.RemoteException;
import android.os.ServiceManager;
import android.util.Log;
import com.android.server.net.BaseNetworkObserver;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
@@ -62,7 +64,7 @@ public class EthernetDataTracker implements NetworkStateTracker {
private INetworkManagementService mNMService;
private static class InterfaceObserver extends INetworkManagementEventObserver.Stub {
private static class InterfaceObserver extends BaseNetworkObserver {
private EthernetDataTracker mTracker;
InterfaceObserver(EthernetDataTracker tracker) {
@@ -70,10 +72,12 @@ public class EthernetDataTracker implements NetworkStateTracker {
mTracker = tracker;
}
@Override
public void interfaceStatusChanged(String iface, boolean up) {
Log.d(TAG, "Interface status changed: " + iface + (up ? "up" : "down"));
}
@Override
public void interfaceLinkStateChanged(String iface, boolean up) {
if (mIface.equals(iface)) {
Log.d(TAG, "Interface " + iface + " link " + (up ? "up" : "down"));
@@ -89,21 +93,15 @@ public class EthernetDataTracker implements NetworkStateTracker {
}
}
@Override
public void interfaceAdded(String iface) {
mTracker.interfaceAdded(iface);
}
@Override
public void interfaceRemoved(String iface) {
mTracker.interfaceRemoved(iface);
}
public void limitReached(String limitName, String iface) {
// Ignored.
}
public void interfaceClassDataActivityChanged(String label, boolean active) {
// Ignored.
}
}
private EthernetDataTracker() {

View File

@@ -0,0 +1,57 @@
/*
* Copyright (C) 2011 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.server.net;
import android.net.INetworkManagementEventObserver;
/**
* Base {@link INetworkManagementEventObserver} that provides no-op
* implementations which can be overridden.
*
* @hide
*/
public class BaseNetworkObserver extends INetworkManagementEventObserver.Stub {
@Override
public void interfaceStatusChanged(String iface, boolean up) {
// default no-op
}
@Override
public void interfaceRemoved(String iface) {
// default no-op
}
@Override
public void interfaceLinkStateChanged(String iface, boolean up) {
// default no-op
}
@Override
public void interfaceAdded(String iface) {
// default no-op
}
@Override
public void interfaceClassDataActivityChanged(String label, boolean active) {
// default no-op
}
@Override
public void limitReached(String limitName, String iface) {
// default no-op
}
}