From 74fc3bfc009f736d058797e9ddda500d114e3135 Mon Sep 17 00:00:00 2001 From: Paul Stewart Date: Wed, 16 Mar 2016 11:40:43 -0700 Subject: [PATCH 1/2] Create ConnectivityThread Create a common singleton thread to be shared among all connectivity tasks. Instead of launching separate threads to handle downstream messages from the various service instances used in connectivity, these managers can choose to share this instance. Bug: 27695292 Change-Id: Idd1e37a3e793c5485091509c3d7351e4d29288f0 --- core/java/android/net/ConnectivityThread.java | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 core/java/android/net/ConnectivityThread.java diff --git a/core/java/android/net/ConnectivityThread.java b/core/java/android/net/ConnectivityThread.java new file mode 100644 index 0000000000000..55c3402bf39db --- /dev/null +++ b/core/java/android/net/ConnectivityThread.java @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.net; + +import android.os.HandlerThread; +import android.os.Looper; + +/** + * Shared singleton connectivity thread for the system. This is a thread for + * connectivity operations such as AsyncChannel connections to system services. + * Various connectivity manager objects can use this singleton as a common + * resource for their handlers instead of creating separate threads of their own. + * @hide + */ +public final class ConnectivityThread extends HandlerThread { + private static ConnectivityThread sInstance; + + private ConnectivityThread() { + super("ConnectivityThread"); + } + + private static synchronized ConnectivityThread getInstance() { + if (sInstance == null) { + sInstance = new ConnectivityThread(); + sInstance.start(); + } + return sInstance; + } + + public static ConnectivityThread get() { + return getInstance(); + } + + public static Looper getInstanceLooper() { + return getInstance().getLooper(); + } +} From bf8cbb05e085c4504685883f3dd564f200405bea Mon Sep 17 00:00:00 2001 From: Paul Stewart Date: Thu, 17 Mar 2016 10:11:54 -0700 Subject: [PATCH 2/2] WifiManager: Use ConnectivityThread Instead of minting it's own hander thread, have WifiManager use the looper from ConnectivityThread. Bug: 27432949 Change-Id: Iddeebeb8ab506c912f526c7569f304e10b9d7ab8 --- core/java/android/app/SystemServiceRegistry.java | 4 +++- wifi/java/android/net/wifi/WifiManager.java | 11 ++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java index 9d7f7246a25da..2987fbc4f33de 100644 --- a/core/java/android/app/SystemServiceRegistry.java +++ b/core/java/android/app/SystemServiceRegistry.java @@ -69,6 +69,7 @@ import android.media.soundtrigger.SoundTriggerManager; import android.media.tv.ITvInputManager; import android.media.tv.TvInputManager; import android.net.ConnectivityManager; +import android.net.ConnectivityThread; import android.net.EthernetManager; import android.net.IConnectivityManager; import android.net.IEthernetManager; @@ -500,7 +501,8 @@ final class SystemServiceRegistry { public WifiManager createService(ContextImpl ctx) { IBinder b = ServiceManager.getService(Context.WIFI_SERVICE); IWifiManager service = IWifiManager.Stub.asInterface(b); - return new WifiManager(ctx.getOuterContext(), service); + return new WifiManager(ctx.getOuterContext(), service, + ConnectivityThread.getInstanceLooper()); }}); registerService(Context.WIFI_P2P_SERVICE, WifiP2pManager.class, diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index c040b06778df9..8c1fbc3a6def1 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -671,9 +671,7 @@ public class WifiManager { private AsyncChannel mAsyncChannel; private CountDownLatch mConnected; - - /* TODO(b/27432949): Use a common connectivity thread for this. */ - private HandlerThread mHandlerThread; + private Looper mLooper; /** * Create a new WifiManager instance. @@ -685,9 +683,10 @@ public class WifiManager { * @hide - hide this because it takes in a parameter of type IWifiManager, which * is a system private class. */ - public WifiManager(Context context, IWifiManager service) { + public WifiManager(Context context, IWifiManager service, Looper looper) { mContext = context; mService = service; + mLooper = looper; mTargetSdkVersion = context.getApplicationInfo().targetSdkVersion; } @@ -1978,12 +1977,10 @@ public class WifiManager { "getWifiServiceMessenger() returned null! This is invalid."); } - mHandlerThread = new HandlerThread("WifiManager"); mAsyncChannel = new AsyncChannel(); mConnected = new CountDownLatch(1); - mHandlerThread.start(); - Handler handler = new ServiceHandler(mHandlerThread.getLooper()); + Handler handler = new ServiceHandler(mLooper); mAsyncChannel.connect(mContext, handler, messenger); try { mConnected.await();