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

Commit 33679c32 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Replace com.android.internal.util.Preconditions.checkNotNull with... 

Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull"
parents 892bede4 0b107f5e

services/core/java/com/android/server/os/BugreportManagerServiceImpl.java

+4 −3
Original line number Original line Diff line number Diff line
@@ -38,6 +38,7 @@ import com.android.internal.util.Preconditions; 
import com.android.server.SystemConfig;

import com.android.server.SystemConfig;





import java.io.FileDescriptor;

import java.io.FileDescriptor;

import java.util.Objects;





/**

/**

 * Implementation of the service that provides a privileged API to capture and consume bugreports.

 * Implementation of the service that provides a privileged API to capture and consume bugreports.
@@ -67,9 +68,9 @@ class BugreportManagerServiceImpl extends IDumpstate.Stub { 
            FileDescriptor bugreportFd, FileDescriptor screenshotFd,

            FileDescriptor bugreportFd, FileDescriptor screenshotFd,

            int bugreportMode, IDumpstateListener listener) {

            int bugreportMode, IDumpstateListener listener) {

        mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DUMP, "startBugreport");

        mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DUMP, "startBugreport");

        Preconditions.checkNotNull(callingPackage);

        Objects.requireNonNull(callingPackage);

        Preconditions.checkNotNull(bugreportFd);

        Objects.requireNonNull(bugreportFd);

        Preconditions.checkNotNull(listener);

        Objects.requireNonNull(listener);

        validateBugreportMode(bugreportMode);

        validateBugreportMode(bugreportMode);

        final long identity = Binder.clearCallingIdentity();

        final long identity = Binder.clearCallingIdentity();

        try {

        try {