Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9c000ee authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Gerrit Code Review
Browse files

Merge "Run LowpanManager on BackgroundThread"

parents 14e70a65 cad94201

core/java/android/app/SystemServiceRegistry.java

+1 −3
Original line number Original line Diff line number Diff line
@@ -113,7 +113,6 @@ import android.media.tv.tunerresourcemanager.ITunerResourceManager; 
import android.media.tv.tunerresourcemanager.TunerResourceManager;

import android.media.tv.tunerresourcemanager.TunerResourceManager;

import android.net.ConnectivityDiagnosticsManager;

import android.net.ConnectivityDiagnosticsManager;

import android.net.ConnectivityManager;

import android.net.ConnectivityManager;

import android.net.ConnectivityThread;

import android.net.EthernetManager;

import android.net.EthernetManager;

import android.net.IConnectivityManager;

import android.net.IConnectivityManager;

import android.net.IEthernetManager;

import android.net.IEthernetManager;
@@ -768,8 +767,7 @@ public final class SystemServiceRegistry { 
            public LowpanManager createService(ContextImpl ctx) throws ServiceNotFoundException {

            public LowpanManager createService(ContextImpl ctx) throws ServiceNotFoundException {

                IBinder b = ServiceManager.getServiceOrThrow(Context.LOWPAN_SERVICE);

                IBinder b = ServiceManager.getServiceOrThrow(Context.LOWPAN_SERVICE);

                ILowpanManager service = ILowpanManager.Stub.asInterface(b);

                ILowpanManager service = ILowpanManager.Stub.asInterface(b);

                return new LowpanManager(ctx.getOuterContext(), service,

                return new LowpanManager(ctx.getOuterContext(), service);

                        ConnectivityThread.getInstanceLooper());

            }});

            }});





        registerService(Context.ETHERNET_SERVICE, EthernetManager.class,

        registerService(Context.ETHERNET_SERVICE, EthernetManager.class,

lowpan/java/android/net/lowpan/LowpanManager.java

+9 −1
Original line number Original line Diff line number Diff line
@@ -24,6 +24,10 @@ import android.os.IBinder; 
import android.os.Looper;

import android.os.Looper;

import android.os.RemoteException;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.ServiceManager;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.os.BackgroundThread;



import java.lang.ref.WeakReference;

import java.lang.ref.WeakReference;

import java.util.HashMap;

import java.util.HashMap;

import java.util.Map;

import java.util.Map;
@@ -97,10 +101,14 @@ public class LowpanManager { 
     *

     *

     * @param context the application context

     * @param context the application context

     * @param service the Binder interface

     * @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

     * @hide - hide this because it takes in a parameter of type ILowpanManager, which is a system

     *     private class.

     *     private class.

     */

     */

    public LowpanManager(Context context, ILowpanManager service) {

        this(context, service, BackgroundThread.get().getLooper());

    }



    @VisibleForTesting

    public LowpanManager(Context context, ILowpanManager service, Looper looper) {

    public LowpanManager(Context context, ILowpanManager service, Looper looper) {

        mContext = context;

        mContext = context;

        mService = service;

        mService = service;