commit bc7a8588e027698ad676599d3e88f26d3465b5cc
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Sep 19 23:19:55 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 19 23:19:55 2024 +0000
tree 58b9b57c06f209222eea785bdedc6da1226790fd
parent 5d97216d548c94e88cf565a36aad791930af9ecf
parent 817269f9b09f30c2f9def4c6bc8ec3e348504340

Merge "AdbDebuggingManager: Add @Keep to mPublicKey." into main

services/core/java/com/android/server/adb/AdbDebuggingManager.java

diff --git a/services/core/java/com/android/server/adb/AdbDebuggingManager.java b/services/core/java/com/android/server/adb/AdbDebuggingManager.java
index 34c3d7e..a73a991 100644
--- a/services/core/java/com/android/server/adb/AdbDebuggingManager.java
+++ b/services/core/java/com/android/server/adb/AdbDebuggingManager.java
@@ -74,6 +74,7 @@
 import android.util.Xml;
 
 import com.android.internal.R;
+import com.android.internal.annotations.Keep;
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.messages.nano.SystemMessageProto.SystemMessage;
 import com.android.internal.util.FrameworkStatsLog;
@@ -214,7 +215,7 @@
 
     class PairingThread extends Thread implements NsdManager.RegistrationListener {
         private NsdManager mNsdManager;
-        private String mPublicKey;
+        @Keep private String mPublicKey;
         private String mPairingCode;
         private String mGuid;
         private String mServiceName;