Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nfc(api): Port over ComponentName#dumpDebug to internal util

Browse Source 
Bug: 263564478
Test: Compiles
Change-Id: Ie8e54fb86d90b3f908273554d0c54b6ebbb0a82a
This commit is contained in:
Roshan Pius
2023-02-27 10:10:25 -08:00
parent 3a4dcbf480
commit 8c864f7dae
3 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/nfc/cardemulation/ApduServiceInfo.java
View File

@@ -660,7 +660,7 @@ public final class ApduServiceInfo implements Parcelable {
* @param proto the ProtoOutputStream to write to
*/
public void dumpDebug(ProtoOutputStream proto) {
getComponent().dumpDebug(proto, ApduServiceInfoProto.COMPONENT_NAME);
Utils.dumpDebugComponentName(getComponent(), proto, ApduServiceInfoProto.COMPONENT_NAME);
proto.write(ApduServiceInfoProto.DESCRIPTION, getDescription());
proto.write(ApduServiceInfoProto.ON_HOST, mOnHost);
if (!mOnHost) {

2
core/java/android/nfc/cardemulation/NfcFServiceInfo.java
View File

@@ -340,7 +340,7 @@ public final class NfcFServiceInfo implements Parcelable {
* @param proto the ProtoOutputStream to write to
*/
public void dumpDebug(ProtoOutputStream proto) {
getComponent().dumpDebug(proto, NfcFServiceInfoProto.COMPONENT_NAME);
Utils.dumpDebugComponentName(getComponent(), proto, NfcFServiceInfoProto.COMPONENT_NAME);
proto.write(NfcFServiceInfoProto.DESCRIPTION, getDescription());
proto.write(NfcFServiceInfoProto.SYSTEM_CODE, getSystemCode());
proto.write(NfcFServiceInfoProto.NFCID2, getNfcid2());

37
core/java/android/nfc/cardemulation/Utils.java Normal file
View File

@@ -0,0 +1,37 @@
/*
* Copyright (C) 2023 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.nfc.cardemulation;
import android.annotation.NonNull;
import android.content.ComponentName;
import android.content.ComponentNameProto;
import android.util.proto.ProtoOutputStream;
/** @hide */
public final class Utils {
private Utils() {
}
/** Copied from {@link ComponentName#dumpDebug(ProtoOutputStream, long)} */
public static void dumpDebugComponentName(
@NonNull ComponentName componentName, @NonNull ProtoOutputStream proto, long fieldId) {
final long token = proto.start(fieldId);
proto.write(ComponentNameProto.PACKAGE_NAME, componentName.getPackageName());
proto.write(ComponentNameProto.CLASS_NAME, componentName.getClassName());
proto.end(token);
}
}