Merge "uwb(support_lib): add protocol_type for oemextension" into main
diff --git a/service/java/com/android/server/uwb/UwbSessionManager.java b/service/java/com/android/server/uwb/UwbSessionManager.java
old mode 100644
new mode 100755
index 95f4ecc..1410112
--- a/service/java/com/android/server/uwb/UwbSessionManager.java
+++ b/service/java/com/android/server/uwb/UwbSessionManager.java
@@ -528,6 +528,7 @@
.setReasonCode(reasonCode)
.setAppPackageName(appPackageName)
.setSessiontoken(mSessionTokenMap.getOrDefault(uwbSession.getSessionId(), 0))
+ .setProtocolName(uwbSession.getProtocolName())
.build()
.toBundle();
try {
diff --git a/service/support_lib/src/com/google/uwb/support/oemextension/SessionStatus.java b/service/support_lib/src/com/google/uwb/support/oemextension/SessionStatus.java
old mode 100644
new mode 100755
index fe04a0e..7e077e0
--- a/service/support_lib/src/com/google/uwb/support/oemextension/SessionStatus.java
+++ b/service/support_lib/src/com/google/uwb/support/oemextension/SessionStatus.java
@@ -36,12 +36,14 @@
private final int mReasonCode;
private final String mAppPackageName;
private final int mSessionToken;
+ private final String mProtocolName;
public static final String KEY_BUNDLE_VERSION = "bundle_version";
public static final String SESSION_ID = "session_id";
public static final String STATE = "state";
public static final String REASON_CODE = "reason_code";
public static final String APP_PACKAGE_NAME = "app_package_name";
public static final String SESSION_TOKEN = "session_token";
+ public static final String PROTOCOL_NAME = "protocol_name";
public static int getBundleVersion() {
return BUNDLE_VERSION_CURRENT;
@@ -68,13 +70,18 @@
return mSessionToken;
}
+ public String getProtocolName() {
+ return mProtocolName;
+ }
+
private SessionStatus(long sessionId, int state, int reasonCode, String appPackageName,
- int sessionToken) {
+ int sessionToken, String protocolName) {
mSessionId = sessionId;
mState = state;
mReasonCode = reasonCode;
mAppPackageName = appPackageName;
mSessionToken = sessionToken;
+ mProtocolName = protocolName;
}
public PersistableBundle toBundle() {
@@ -85,6 +92,7 @@
bundle.putInt(REASON_CODE, mReasonCode);
bundle.putString(APP_PACKAGE_NAME, mAppPackageName);
bundle.putInt(SESSION_TOKEN, mSessionToken);
+ bundle.putString(PROTOCOL_NAME, mProtocolName);
return bundle;
}
@@ -104,6 +112,7 @@
.setReasonCode(bundle.getInt(REASON_CODE))
.setAppPackageName(bundle.getString(APP_PACKAGE_NAME))
.setSessiontoken(bundle.getInt(SESSION_TOKEN))
+ .setProtocolName(bundle.getString(PROTOCOL_NAME, "UnknownProtocolName"))
.build();
}
@@ -114,6 +123,7 @@
private final RequiredParam<Integer> mReasonCode = new RequiredParam<>();
private String mAppPackageName = "UnknownPackageName";
private int mSessionToken = 0;
+ private String mProtocolName = "UnknownProtocolName";
public SessionStatus.Builder setSessionId(long sessionId) {
mSessionId.set(sessionId);
@@ -140,13 +150,19 @@
return this;
}
+ public SessionStatus.Builder setProtocolName(String protocolName) {
+ mProtocolName = protocolName;
+ return this;
+ }
+
public SessionStatus build() {
return new SessionStatus(
mSessionId.get(),
mState.get(),
mReasonCode.get(),
mAppPackageName,
- mSessionToken);
+ mSessionToken,
+ mProtocolName);
}
}
}