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

Commit 49c9de98 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 7eb46295 ee9d2244

services/core/java/com/android/server/uri/UriGrantsManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ import java.util.ArrayList; 
import java.util.Collections;

import java.util.Iterator;

import java.util.List;

import java.util.Objects;



/** Manages uri grants. */

public class UriGrantsManagerService extends IUriGrantsManager.Stub {
@@ -215,7 +216,7 @@ public class UriGrantsManagerService extends IUriGrantsManager.Stub { 
    public ParceledListSlice<android.content.UriPermission> getUriPermissions(

            String packageName, boolean incoming, boolean persistedOnly) {

        enforceNotIsolatedCaller("getUriPermissions");

        Preconditions.checkNotNull(packageName, "packageName");

        Objects.requireNonNull(packageName, "packageName");



        final int callingUid = Binder.getCallingUid();

        final int callingUserId = UserHandle.getUserId(callingUid);