diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index 31cbe28334f91..04f560d4d90f5 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -6794,11 +6794,9 @@ public final class ActivityThread extends ClientTransactionHandler
 
         // Wait for debugger after we have notified the system to finish attach application
         if (data.debugMode != ApplicationThreadConstants.DEBUG_OFF) {
-            // XXX should have option to change the port.
-            Debug.changeDebugPort(8100);
             if (data.debugMode == ApplicationThreadConstants.DEBUG_WAIT) {
                 Slog.w(TAG, "Application " + data.info.getPackageName()
-                        + " is waiting for the debugger on port 8100...");
+                        + " is waiting for the debugger ...");
 
                 try {
                     mgr.showWaitingForDebugger(mAppThread, true);
@@ -6813,10 +6811,6 @@ public final class ActivityThread extends ClientTransactionHandler
                 } catch (RemoteException ex) {
                     throw ex.rethrowFromSystemServer();
                 }
-
-            } else {
-                Slog.w(TAG, "Application " + data.info.getPackageName()
-                        + " can be debugged on port 8100...");
             }
         }