Merge "Fix key handling"

            mHandler = new P2pHandler(looper);

            mChannelListener = l;

        }

        private final static int INVALID_LISTENER_KEY = 0;

        private ChannelListener mChannelListener;

        private HashMap<Integer, Object> mListenerMap = new HashMap<Integer, Object>();

        private Object mListenerMapLock = new Object();

        }

        int putListener(Object listener) {

            if (listener == null) return 0;

            if (listener == null) return INVALID_LISTENER_KEY;

            int key;

            synchronized (mListenerMapLock) {

                do {

                    key = mListenerKey++;

                } while (key == INVALID_LISTENER_KEY);

                mListenerMap.put(key, listener);

            }

            return key;

        }

        Object getListener(int key) {

            if (key == INVALID_LISTENER_KEY) return null;

            synchronized (mListenerMapLock) {

                return mListenerMap.remove(key);

            }