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

Commit 936ecd09 authored by Pablo Gamito's avatar Pablo Gamito
Browse files

Add nullability annotations 

Helps make sure we catch NPE before they appear.

Flag: EXEMPT adding annotations
Test: n/a
Change-Id: I971d599c393553bfb08e3edeeb88f9f03b00d99f
parent 19ff015f

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

+3 −4
Original line number Diff line number Diff line
@@ -111,13 +111,12 @@ public class PerfettoProtoLogImpl implements IProtoLog { 
    private final Lock mBackgroundServiceLock = new ReentrantLock();

    private ExecutorService mBackgroundLoggingService = Executors.newSingleThreadExecutor();



    public PerfettoProtoLogImpl(String viewerConfigFilePath, Runnable cacheUpdater) {

    public PerfettoProtoLogImpl(@NonNull String viewerConfigFilePath, Runnable cacheUpdater) {

        this(() -> {

            try {

                return new ProtoInputStream(new FileInputStream(viewerConfigFilePath));

            } catch (FileNotFoundException e) {

                Slog.w(LOG_TAG, "Failed to load viewer config file " + viewerConfigFilePath, e);

                return null;

                throw new RuntimeException("Failed to load viewer config file " + viewerConfigFilePath, e);

            }

        }, cacheUpdater);

    }
@@ -127,7 +126,7 @@ public class PerfettoProtoLogImpl implements IProtoLog { 
    }



    public PerfettoProtoLogImpl(

            @Nullable ViewerConfigInputStreamProvider viewerConfigInputStreamProvider,

            @NonNull ViewerConfigInputStreamProvider viewerConfigInputStreamProvider,

            Runnable cacheUpdater

    ) {

        this(viewerConfigInputStreamProvider,

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

+2 −1
Original line number Diff line number Diff line
@@ -24,12 +24,13 @@ import java.util.Set; 
import java.util.TreeMap;



public class ProtoLogViewerConfigReader {

    @NonNull

    private final ViewerConfigInputStreamProvider mViewerConfigInputStreamProvider;

    private final Map<String, Set<Long>> mGroupHashes = new TreeMap<>();

    private final LongSparseArray<String> mLogMessageMap = new LongSparseArray<>();



    public ProtoLogViewerConfigReader(

            ViewerConfigInputStreamProvider viewerConfigInputStreamProvider) {

            @NonNull ViewerConfigInputStreamProvider viewerConfigInputStreamProvider) {

        this.mViewerConfigInputStreamProvider = viewerConfigInputStreamProvider;

    }

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

+2 −0
Original line number Diff line number Diff line
@@ -16,11 +16,13 @@ 


package com.android.internal.protolog;



import android.annotation.NonNull;

import android.util.proto.ProtoInputStream;



public interface ViewerConfigInputStreamProvider {

    /**

     * @return a ProtoInputStream.

     */

    @NonNull

    ProtoInputStream getInputStream();

}