Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16a37b94 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "AdbDebuggingManager: Add @Keep to mPublicKey." into main am: bc7a8588 am: 5088a594 

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



Change-Id: Id59d3fa2a6f3b863ce41cc0d10c65e4beff6549d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 17b4e791 5088a594

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

+2 −1
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ import android.util.Slog; 
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 @@ public class AdbDebuggingManager { 


    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;