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 am: eb32604c2b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ica052872b3fa68321d93be37969387c9f3f71497
This commit is contained in:
Remi NGUYEN VAN
2020-12-15 04:48:59 +00:00
committed by Automerger Merge Worker
parent cb6f73708a eb32604c2b
commit 0efc8e6105
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

@@ -117,7 +117,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;
@@ -781,8 +780,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,

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