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

Merge "[P2P] Eliminate separate storage of binders - a memory leak" into oc-dr1-dev

Browse Source
This commit is contained in:
Etan Cohen
2017-06-24 00:36:50 +00:00
committed by Android (Google) Code Review
parent a97e66c37a 9304be6f80
commit 0dd8a3cd59
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
wifi/java/android/net/wifi/p2p/WifiP2pManager.java
View File

@@ -291,7 +291,6 @@ public class WifiP2pManager {
"android.net.wifi.p2p.CALLING_PACKAGE";
IWifiP2pManager mService;
private final Map<Channel, Binder> mBinders = new HashMap<>();
private static final int BASE = Protocol.BASE_WIFI_P2P_MANAGER;
@@ -670,11 +669,12 @@ public class WifiP2pManager {
* by doing a call on {@link #initialize}
*/
public static class Channel {
Channel(Context context, Looper looper, ChannelListener l) {
Channel(Context context, Looper looper, ChannelListener l, Binder binder) {
mAsyncChannel = new AsyncChannel();
mHandler = new P2pHandler(looper);
mChannelListener = l;
mContext = context;
mBinder = binder;
}
private final static int INVALID_LISTENER_KEY = 0;
private ChannelListener mChannelListener;
@@ -686,6 +686,8 @@ public class WifiP2pManager {
private final Object mListenerMapLock = new Object();
private int mListenerKey = 0;
/* package */ final Binder mBinder;
private AsyncChannel mAsyncChannel;
private P2pHandler mHandler;
Context mContext;
@@ -892,8 +894,8 @@ public class WifiP2pManager {
*/
public Channel initialize(Context srcContext, Looper srcLooper, ChannelListener listener) {
Binder binder = new Binder();
Channel channel = initalizeChannel(srcContext, srcLooper, listener, getMessenger(binder));
mBinders.put(channel, binder);
Channel channel = initalizeChannel(srcContext, srcLooper, listener, getMessenger(binder),
binder);
return channel;
}
@@ -903,14 +905,15 @@ public class WifiP2pManager {
*/
public Channel initializeInternal(Context srcContext, Looper srcLooper,
ChannelListener listener) {
return initalizeChannel(srcContext, srcLooper, listener, getP2pStateMachineMessenger());
return initalizeChannel(srcContext, srcLooper, listener, getP2pStateMachineMessenger(),
null);
}
private Channel initalizeChannel(Context srcContext, Looper srcLooper, ChannelListener listener,
Messenger messenger) {
Messenger messenger, Binder binder) {
if (messenger == null) return null;
Channel c = new Channel(srcContext, srcLooper, listener);
Channel c = new Channel(srcContext, srcLooper, listener, binder);
if (c.mAsyncChannel.connectSync(srcContext, c.mHandler, messenger)
== AsyncChannel.STATUS_SUCCESSFUL) {
return c;
@@ -1428,8 +1431,9 @@ public class WifiP2pManager {
*/
public void close(Channel c) {
try {
mService.close(mBinders.get(c));
mBinders.remove(c);
if (c != null) {
mService.close(c.mBinder);
}
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}