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

Commit 9aab1696 authored by Charles Yo's avatar Charles Yo Committed by Android Build Coastguard Worker
Browse files

Revert "Handle null object params" 

Revert submission 28147757-no-processing-protolog

Reason for revert: b/351458758

Reverted changes: /q/submissionid:28147757-no-processing-protolog
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1688d1db08172ca9d4fef9af99ce0c44c0343b9c)
Merged-In: I5d8b3cc7b2b453f31718111841a2d468a1b7e8be
Change-Id: I5d8b3cc7b2b453f31718111841a2d468a1b7e8be
parent dfda5daa

core/java/com/android/internal/protolog/PerfettoProtoLogImpl.java

+3 −15
Original line number Diff line number Diff line
@@ -476,25 +476,13 @@ public class PerfettoProtoLogImpl implements IProtoLog { 
                                needsIncrementalState = true;

                                break;

                            case LogDataType.LONG:

                                if (o == null) {

                                    longParams.add(0);

                                } else {

                                longParams.add(((Number) o).longValue());

                                }

                                break;

                            case LogDataType.DOUBLE:

                                if (o == null) {

                                    doubleParams.add(0d);

                                } else {

                                doubleParams.add(((Number) o).doubleValue());

                                }

                                break;

                            case LogDataType.BOOLEAN:

                                if (o == null) {

                                    booleanParams.add(false);

                                } else {

                                booleanParams.add((boolean) o);

                                }

                                break;

                        }

                    } catch (ClassCastException ex) {

tests/Internal/src/com/android/internal/protolog/PerfettoProtoLogImplTest.java

+0 −23
Original line number Diff line number Diff line
@@ -711,29 +711,6 @@ public class PerfettoProtoLogImplTest { 
                .isEqualTo("My test null string: null");

    }



    @Test

    public void supportNullParams() throws IOException {

        PerfettoTraceMonitor traceMonitor =

                PerfettoTraceMonitor.newBuilder().enableProtoLog(true)

                        .build();



        try {

            traceMonitor.start();



            mProtoLog.log(LogLevel.DEBUG, TestProtoLogGroup.TEST_GROUP,

                    "My null args: %d, %f, %b", null, null, null);

        } finally {

            traceMonitor.stop(mWriter);

        }



        final ResultReader reader = new ResultReader(mWriter.write(), mTraceConfig);

        final ProtoLogTrace protolog = reader.readProtoLogTrace();



        Truth.assertThat(protolog.messages).hasSize(1);

        Truth.assertThat(protolog.messages.get(0).getMessage())

                .isEqualTo("My null args: 0, 0, false");

    }



    private enum TestProtoLogGroup implements IProtoLogGroup {

        TEST_GROUP(true, true, false, "TEST_TAG");