diff options
| -rw-r--r-- | core/java/android/app/SystemServiceRegistry.java | 4 | ||||
| -rw-r--r-- | lowpan/java/android/net/lowpan/LowpanManager.java | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java index 496ac3bbb8e9..82e48bfb61a7 100644 --- a/core/java/android/app/SystemServiceRegistry.java +++ b/core/java/android/app/SystemServiceRegistry.java @@ -113,7 +113,6 @@ import android.media.tv.tunerresourcemanager.ITunerResourceManager; import android.media.tv.tunerresourcemanager.TunerResourceManager; import android.net.ConnectivityDiagnosticsManager; import android.net.ConnectivityManager; -import android.net.ConnectivityThread; import android.net.EthernetManager; import android.net.IConnectivityManager; import android.net.IEthernetManager; @@ -768,8 +767,7 @@ public final class SystemServiceRegistry { public LowpanManager createService(ContextImpl ctx) throws ServiceNotFoundException { IBinder b = ServiceManager.getServiceOrThrow(Context.LOWPAN_SERVICE); ILowpanManager service = ILowpanManager.Stub.asInterface(b); - return new LowpanManager(ctx.getOuterContext(), service, - ConnectivityThread.getInstanceLooper()); + return new LowpanManager(ctx.getOuterContext(), service); }}); registerService(Context.ETHERNET_SERVICE, EthernetManager.class, diff --git a/lowpan/java/android/net/lowpan/LowpanManager.java b/lowpan/java/android/net/lowpan/LowpanManager.java index 76876ce01c96..33b35e6af7af 100644 --- a/lowpan/java/android/net/lowpan/LowpanManager.java +++ b/lowpan/java/android/net/lowpan/LowpanManager.java @@ -24,6 +24,10 @@ import android.os.IBinder; import android.os.Looper; import android.os.RemoteException; import android.os.ServiceManager; + +import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.os.BackgroundThread; + import java.lang.ref.WeakReference; import java.util.HashMap; import java.util.Map; @@ -97,10 +101,14 @@ public class LowpanManager { * * @param context the application context * @param service the Binder interface - * @param looper the default Looper to run callbacks on * @hide - hide this because it takes in a parameter of type ILowpanManager, which is a system * private class. */ + public LowpanManager(Context context, ILowpanManager service) { + this(context, service, BackgroundThread.get().getLooper()); + } + + @VisibleForTesting public LowpanManager(Context context, ILowpanManager service, Looper looper) { mContext = context; mService = service; |