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

Commit eb32604c authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Merge "Run LowpanManager on BackgroundThread" am: e9c000ee am: f4e66680 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513142

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c501da3c8a7b5217d1574d5e7e4e41e0535e227
parents be3cafd4 f4e66680

core/java/android/app/SystemServiceRegistry.java

+1 −3
Original line number Diff line number Diff line
@@ -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,

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

+9 −1
Original line number Diff line number Diff line
@@ -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;