Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Run LowpanManager on BackgroundThread" am: e9c000eee2 am: f4e6668082

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c501da3c8a7b5217d1574d5e7e4e41e0535e227
This commit is contained in:
Remi NGUYEN VAN
2020-12-15 03:55:01 +00:00
committed by Automerger Merge Worker
parent be3cafd401 f4e6668082
commit eb32604c2b
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/SystemServiceRegistry.java
View File

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

10
lowpan/java/android/net/lowpan/LowpanManager.java
View File

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