Skip to content

Commit d5bc8d7

Browse files
pfmaggijscott1989
authored andcommitted
Move printData back into SecurityLogsFragment
1 parent 44c9676 commit d5bc8d7

File tree

3 files changed

+16
-15
lines changed

3 files changed

+16
-15
lines changed

src/main/java/com/afwsamples/testdpc/ShellCommand.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import androidx.annotation.NonNull;
4545
import androidx.annotation.Nullable;
4646
import com.afwsamples.testdpc.common.Util;
47+
import com.afwsamples.testdpc.policy.SecurityLogsFragment;
4748
import com.afwsamples.testdpc.util.flags.Flags;
4849
import java.io.File;
4950
import java.io.PrintWriter;
@@ -1474,7 +1475,7 @@ private void printSecurityLogs(List<SecurityEvent> events) {
14741475
sb.append(" (")
14751476
.append(formatter.format(new Date(TimeUnit.NANOSECONDS.toMillis(event.getTimeNanos()))))
14761477
.append("): ");
1477-
Util.printData(sb, event.getData());
1478+
SecurityLogsFragment.printData(sb, event.getData());
14781479
mWriter.printf("%s\n", sb.toString());
14791480
}
14801481
}

src/main/java/com/afwsamples/testdpc/common/Util.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -463,17 +463,4 @@ public static String getStringEventTagFromId(int eventId) {
463463
}
464464
return eventTag;
465465
}
466-
467-
public static void printData(StringBuilder sb, Object data) {
468-
if (data instanceof Integer
469-
|| data instanceof Long
470-
|| data instanceof Float
471-
|| data instanceof String) {
472-
sb.append(data.toString()).append(" ");
473-
} else if (data instanceof Object[]) {
474-
for (Object item : (Object[]) data) {
475-
printData(sb, item);
476-
}
477-
}
478-
}
479466
}

src/main/java/com/afwsamples/testdpc/policy/SecurityLogsFragment.java

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,24 @@ private void processEvents(List<SecurityEvent> logs) {
134134
sb.append(" (")
135135
.append(formatter.format(new Date(TimeUnit.NANOSECONDS.toMillis(event.getTimeNanos()))))
136136
.append("): ");
137-
Util.printData(sb, event.getData());
137+
printData(sb, event.getData());
138138
mAdapter.add(sb.toString());
139139
}
140140
ListView listView = SecurityLogsFragment.this.getListView();
141141
listView.setSelection(listView.getCount() - 1);
142142
}
143143
}
144+
145+
public static void printData(StringBuilder sb, Object data) {
146+
if (data instanceof Integer
147+
|| data instanceof Long
148+
|| data instanceof Float
149+
|| data instanceof String) {
150+
sb.append(data.toString()).append(" ");
151+
} else if (data instanceof Object[]) {
152+
for (Object item : (Object[]) data) {
153+
printData(sb, item);
154+
}
155+
}
156+
}
144157
}

0 commit comments

Comments
 (0)