commit 5088a5940d0bfd23c33b4fd247bb5ce7bcd2fca1
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Sep 19 23:36:44 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Sep 19 23:36:44 2024 +0000
tree c576dc186be38456923a1da51b3de2b153a01df2
parent fd6f74d38e2e86e0178738477cc17cb2ab23091c
parent bc7a8588e027698ad676599d3e88f26d3465b5cc

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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3274275

Change-Id: Ifa15e030e4945ac388e60618c03942db9c5c09e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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;