Use pid to appname mapping from ddmlib.

Replace LogCatPidToNameMapper with a call to
IDevice.getClientName(pid)

Change-Id: I8c29b5d29cccf29ea22536a3f270f0f8963aba64

4 files changed, 11 insertions, 141 deletions

diff --git a/ddms/libs/ddmuilib/src/com/android/ddmuilib/logcat/LogCatMessageParser.java b/ddms/libs/ddmuilib/src/com/android/ddmuilib/logcat/LogCatMessageParser.java
index b69a433..f1a5816 100644
--- a/ddms/libs/ddmuilib/src/com/android/ddmuilib/logcat/LogCatMessageParser.java
+++ b/ddms/libs/ddmuilib/src/com/android/ddmuilib/logcat/LogCatMessageParser.java
@@ -16,7 +16,9 @@
 
 package com.android.ddmuilib.logcat;
 
+import com.android.ddmlib.IDevice;
 import com.android.ddmlib.Log.LogLevel;
+import com.google.common.primitives.Ints;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -60,7 +62,7 @@ public final class LogCatMessageParser {
      * @return list of LogMessage objects parsed from the input
      */
     public List<LogCatMessage> processLogLines(String[] lines,
-            LogCatPidToNameMapper pidToNameMapper) {
+            IDevice device) {
         List<LogCatMessage> messages = new ArrayList<LogCatMessage>(lines.length);
 
         for (String line : lines) {
@@ -82,9 +84,13 @@ public final class LogCatMessageParser {
                     mCurLogLevel = LogLevel.ASSERT;
                 }
             } else {
+                String pkgName = ""; //$NON-NLS-1$
+                if (device != null) {
+                    Integer pid = Ints.tryParse(mCurPid);
+                    pkgName = device.getClientName(pid == null ? 0 : pid.intValue());
+                }
                 LogCatMessage m = new LogCatMessage(mCurLogLevel, mCurPid, mCurTid,
-                        pidToNameMapper.getName(mCurPid),
-                        mCurTag, mCurTime, line);
+                        pkgName, mCurTag, mCurTime, line);
                 messages.add(m);
             }
         }
diff --git a/ddms/libs/ddmuilib/src/com/android/ddmuilib/logcat/LogCatPidToNameMapper.java b/ddms/libs/ddmuilib/src/com/android/ddmuilib/logcat/LogCatPidToNameMapper.java
deleted file mode 100644
index a4455d0..0000000
--- a/ddms/libs/ddmuilib/src/com/android/ddmuilib/logcat/LogCatPidToNameMapper.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (C) 2011 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 com.android.ddmuilib.logcat;
-
-import com.android.ddmlib.AndroidDebugBridge;
-import com.android.ddmlib.AndroidDebugBridge.IClientChangeListener;
-import com.android.ddmlib.AndroidDebugBridge.IDeviceChangeListener;
-import com.android.ddmlib.Client;
-import com.android.ddmlib.ClientData;
-import com.android.ddmlib.IDevice;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * This class maintains a mapping between the PID and the application name for all
- * running apps on a device. It does this by implementing callbacks to two events:
- * {@link AndroidDebugBridge.IDeviceChangeListener} and
- * {@link AndroidDebugBridge.IClientChangeListener}.
- */
-public class LogCatPidToNameMapper {
-    /** Default name used when the actual name cannot be determined. */
-    public static final String UNKNOWN_APP = "";
-
-    private IClientChangeListener mClientChangeListener;
-    private IDeviceChangeListener mDeviceChangeListener;
-    private IDevice mDevice;
-    private Map<String, String> mPidToName;
-
-    public LogCatPidToNameMapper(IDevice device) {
-        mDevice = device;
-        mClientChangeListener = constructClientChangeListener();
-        AndroidDebugBridge.addClientChangeListener(mClientChangeListener);
-
-        mDeviceChangeListener = constructDeviceChangeListener();
-        AndroidDebugBridge.addDeviceChangeListener(mDeviceChangeListener);
-
-        mPidToName = new HashMap<String, String>();
-
-        updateClientList(device);
-    }
-
-    private IClientChangeListener constructClientChangeListener() {
-        return new IClientChangeListener() {
-            @Override
-            public void clientChanged(Client client, int changeMask) {
-                if ((changeMask & Client.CHANGE_NAME) == Client.CHANGE_NAME) {
-                    ClientData cd = client.getClientData();
-                    updateClientName(cd);
-                }
-            }
-        };
-    }
-
-    private void updateClientName(ClientData cd) {
-        String name = cd.getClientDescription();
-        if (name != null) {
-            int pid = cd.getPid();
-            if (mPidToName != null) {
-                mPidToName.put(Integer.toString(pid), name);
-            }
-        }
-    }
-
-    private IDeviceChangeListener constructDeviceChangeListener() {
-        return new IDeviceChangeListener() {
-            @Override
-            public void deviceDisconnected(IDevice device) {
-            }
-
-            @Override
-            public void deviceConnected(IDevice device) {
-            }
-
-            @Override
-            public void deviceChanged(IDevice device, int changeMask) {
-                if (changeMask == IDevice.CHANGE_CLIENT_LIST) {
-                    updateClientList(device);
-                }
-            }
-        };
-    }
-
-    private void updateClientList(IDevice device) {
-        if (mDevice == null) {
-            return;
-        }
-
-        if (!mDevice.equals(device)) {
-            return;
-        }
-
-        mPidToName = new HashMap<String, String>();
-        for (Client c : device.getClients()) {
-            ClientData cd = c.getClientData();
-            String name = cd.getClientDescription();
-            int pid = cd.getPid();
-
-            /* The name will be null for apps that have just been created.
-             * In such a case, we fill in the default name, and wait for the
-             * clientChangeListener to do the update with the correct name.
-             */
-            if (name == null) {
-                name = UNKNOWN_APP;
-            }
-
-            mPidToName.put(Integer.toString(pid), name);
-        }
-    }
-
-    /**
-     * Get the application name corresponding to given pid.
-     * @param pid application's pid
-     * @return application name if available, else {@link LogCatPidToNameMapper#UNKNOWN_APP}.
-     */
-    public String getName(String pid) {
-        String name = mPidToName.get(pid);
-        return name != null ? name : UNKNOWN_APP;
-    }
-}
diff --git a/ddms/libs/ddmuilib/src/com/android/ddmuilib/logcat/LogCatReceiver.java b/ddms/libs/ddmuilib/src/com/android/ddmuilib/logcat/LogCatReceiver.java
index da3e86f..8d4e7fe 100644
--- a/ddms/libs/ddmuilib/src/com/android/ddmuilib/logcat/LogCatReceiver.java
+++ b/ddms/libs/ddmuilib/src/com/android/ddmuilib/logcat/LogCatReceiver.java
@@ -45,7 +45,6 @@ public final class LogCatReceiver {
     private LogCatOutputReceiver mCurrentLogCatOutputReceiver;
     private Set<ILogCatBufferChangeListener> mLogCatMessageListeners;
     private LogCatMessageParser mLogCatMessageParser;
-    private LogCatPidToNameMapper mPidToNameMapper;
     private IPreferenceStore mPrefStore;
 
     /**
@@ -62,8 +61,6 @@ public final class LogCatReceiver {
 
         mLogCatMessageListeners = new HashSet<ILogCatBufferChangeListener>();
         mLogCatMessageParser = new LogCatMessageParser();
-        mPidToNameMapper = new LogCatPidToNameMapper(mCurrentDevice);
-
         mLogMessages = new LogCatMessageList(getFifoSize());
 
         startReceiverThread();
@@ -157,7 +154,7 @@ public final class LogCatReceiver {
 
     private void processLogLines(String[] lines) {
         List<LogCatMessage> newMessages = mLogCatMessageParser.processLogLines(lines,
-                mPidToNameMapper);
+                mCurrentDevice);
         processLogMessages(newMessages);
     }
 
diff --git a/ddms/libs/ddmuilib/tests/src/com/android/ddmuilib/logcat/LogCatMessageParserTest.java b/ddms/libs/ddmuilib/tests/src/com/android/ddmuilib/logcat/LogCatMessageParserTest.java
index dfde250..3b5029c 100644
--- a/ddms/libs/ddmuilib/tests/src/com/android/ddmuilib/logcat/LogCatMessageParserTest.java
+++ b/ddms/libs/ddmuilib/tests/src/com/android/ddmuilib/logcat/LogCatMessageParserTest.java
@@ -63,7 +63,7 @@ public final class LogCatMessageParserTest extends TestCase {
     @Override
     protected void setUp() throws Exception {
         LogCatMessageParser parser = new LogCatMessageParser();
-        mParsedMessages = parser.processLogLines(MESSAGES, new LogCatPidToNameMapper(null));
+        mParsedMessages = parser.processLogLines(MESSAGES, null);
     }
 
     /** Check that the correct number of messages are received. */