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

Commit 0ccd2efd authored by Daulet Zhanguzin's avatar Daulet Zhanguzin
Browse files

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

java.util.Objects.requireNonNull

Bug: 126528330

Test: Treehugger
Change-Id: I5bcc7f6dc63ecadd8bcb797d76df8aad6c8400a3
parent 856ce4a1

services/core/java/com/android/server/textclassifier/TextClassificationManagerService.java

+20 −19
Original line number Original line Diff line number Diff line
@@ -62,6 +62,7 @@ import java.io.FileDescriptor; 
import java.io.PrintWriter;

import java.io.PrintWriter;

import java.util.ArrayDeque;

import java.util.ArrayDeque;

import java.util.Map;

import java.util.Map;

import java.util.Objects;

import java.util.Queue;

import java.util.Queue;





/**

/**
@@ -137,7 +138,7 @@ public final class TextClassificationManagerService extends ITextClassifierServi 
    private TextClassificationConstants mSettings;

    private TextClassificationConstants mSettings;





    private TextClassificationManagerService(Context context) {

    private TextClassificationManagerService(Context context) {

        mContext = Preconditions.checkNotNull(context);

        mContext = Objects.requireNonNull(context);

        mLock = new Object();

        mLock = new Object();

        mSettingsListener = new TextClassifierSettingsListener(mContext);

        mSettingsListener = new TextClassifierSettingsListener(mContext);

    }

    }
@@ -156,8 +157,8 @@ public final class TextClassificationManagerService extends ITextClassifierServi 
            @Nullable TextClassificationSessionId sessionId,

            @Nullable TextClassificationSessionId sessionId,

            TextSelection.Request request, ITextClassifierCallback callback)

            TextSelection.Request request, ITextClassifierCallback callback)

            throws RemoteException {

            throws RemoteException {

        Preconditions.checkNotNull(request);

        Objects.requireNonNull(request);

        Preconditions.checkNotNull(callback);

        Objects.requireNonNull(callback);

        final int userId = request.getUserId();

        final int userId = request.getUserId();

        validateInput(mContext, request.getCallingPackageName(), userId);

        validateInput(mContext, request.getCallingPackageName(), userId);
@@ -186,8 +187,8 @@ public final class TextClassificationManagerService extends ITextClassifierServi 
            @Nullable TextClassificationSessionId sessionId,

            @Nullable TextClassificationSessionId sessionId,

            TextClassification.Request request, ITextClassifierCallback callback)

            TextClassification.Request request, ITextClassifierCallback callback)

            throws RemoteException {

            throws RemoteException {

        Preconditions.checkNotNull(request);

        Objects.requireNonNull(request);

        Preconditions.checkNotNull(callback);

        Objects.requireNonNull(callback);

        final int userId = request.getUserId();

        final int userId = request.getUserId();

        validateInput(mContext, request.getCallingPackageName(), userId);

        validateInput(mContext, request.getCallingPackageName(), userId);
@@ -215,8 +216,8 @@ public final class TextClassificationManagerService extends ITextClassifierServi 
            @Nullable TextClassificationSessionId sessionId,

            @Nullable TextClassificationSessionId sessionId,

            TextLinks.Request request, ITextClassifierCallback callback)

            TextLinks.Request request, ITextClassifierCallback callback)

            throws RemoteException {

            throws RemoteException {

        Preconditions.checkNotNull(request);

        Objects.requireNonNull(request);

        Preconditions.checkNotNull(callback);

        Objects.requireNonNull(callback);

        final int userId = request.getUserId();

        final int userId = request.getUserId();

        validateInput(mContext, request.getCallingPackageName(), userId);

        validateInput(mContext, request.getCallingPackageName(), userId);
@@ -244,7 +245,7 @@ public final class TextClassificationManagerService extends ITextClassifierServi 
    public void onSelectionEvent(

    public void onSelectionEvent(

            @Nullable TextClassificationSessionId sessionId, SelectionEvent event)

            @Nullable TextClassificationSessionId sessionId, SelectionEvent event)

            throws RemoteException {

            throws RemoteException {

        Preconditions.checkNotNull(event);

        Objects.requireNonNull(event);

        final int userId = event.getUserId();

        final int userId = event.getUserId();

        validateInput(mContext, event.getPackageName(), userId);

        validateInput(mContext, event.getPackageName(), userId);
@@ -268,7 +269,7 @@ public final class TextClassificationManagerService extends ITextClassifierServi 
    public void onTextClassifierEvent(

    public void onTextClassifierEvent(

            @Nullable TextClassificationSessionId sessionId,

            @Nullable TextClassificationSessionId sessionId,

            TextClassifierEvent event) throws RemoteException {

            TextClassifierEvent event) throws RemoteException {

        Preconditions.checkNotNull(event);

        Objects.requireNonNull(event);

        final String packageName = event.getEventContext() == null

        final String packageName = event.getEventContext() == null

                ? null

                ? null

                : event.getEventContext().getPackageName();

                : event.getEventContext().getPackageName();
@@ -299,8 +300,8 @@ public final class TextClassificationManagerService extends ITextClassifierServi 
            @Nullable TextClassificationSessionId sessionId,

            @Nullable TextClassificationSessionId sessionId,

            TextLanguage.Request request,

            TextLanguage.Request request,

            ITextClassifierCallback callback) throws RemoteException {

            ITextClassifierCallback callback) throws RemoteException {

        Preconditions.checkNotNull(request);

        Objects.requireNonNull(request);

        Preconditions.checkNotNull(callback);

        Objects.requireNonNull(callback);

        final int userId = request.getUserId();

        final int userId = request.getUserId();

        validateInput(mContext, request.getCallingPackageName(), userId);

        validateInput(mContext, request.getCallingPackageName(), userId);
@@ -329,8 +330,8 @@ public final class TextClassificationManagerService extends ITextClassifierServi 
            @Nullable TextClassificationSessionId sessionId,

            @Nullable TextClassificationSessionId sessionId,

            ConversationActions.Request request,

            ConversationActions.Request request,

            ITextClassifierCallback callback) throws RemoteException {

            ITextClassifierCallback callback) throws RemoteException {

        Preconditions.checkNotNull(request);

        Objects.requireNonNull(request);

        Preconditions.checkNotNull(callback);

        Objects.requireNonNull(callback);

        final int userId = request.getUserId();

        final int userId = request.getUserId();

        validateInput(mContext, request.getCallingPackageName(), userId);

        validateInput(mContext, request.getCallingPackageName(), userId);
@@ -360,8 +361,8 @@ public final class TextClassificationManagerService extends ITextClassifierServi 
    public void onCreateTextClassificationSession(

    public void onCreateTextClassificationSession(

            TextClassificationContext classificationContext, TextClassificationSessionId sessionId)

            TextClassificationContext classificationContext, TextClassificationSessionId sessionId)

            throws RemoteException {

            throws RemoteException {

        Preconditions.checkNotNull(sessionId);

        Objects.requireNonNull(sessionId);

        Preconditions.checkNotNull(classificationContext);

        Objects.requireNonNull(classificationContext);

        final int userId = classificationContext.getUserId();

        final int userId = classificationContext.getUserId();

        validateInput(mContext, classificationContext.getPackageName(), userId);

        validateInput(mContext, classificationContext.getPackageName(), userId);
@@ -391,7 +392,7 @@ public final class TextClassificationManagerService extends ITextClassifierServi 
    @Override

    @Override

    public void onDestroyTextClassificationSession(TextClassificationSessionId sessionId)

    public void onDestroyTextClassificationSession(TextClassificationSessionId sessionId)

            throws RemoteException {

            throws RemoteException {

        Preconditions.checkNotNull(sessionId);

        Objects.requireNonNull(sessionId);





        synchronized (mLock) {

        synchronized (mLock) {

            final int userId = mSessionUserIds.containsKey(sessionId)

            final int userId = mSessionUserIds.containsKey(sessionId)
@@ -514,7 +515,7 @@ public final class TextClassificationManagerService extends ITextClassifierServi 
                UserState owningUser, int uid) {

                UserState owningUser, int uid) {

            mName = name;

            mName = name;

            mRequest =

            mRequest =

                    logOnFailure(Preconditions.checkNotNull(request), "handling pending request");

                    logOnFailure(Objects.requireNonNull(request), "handling pending request");

            mOnServiceFailure =

            mOnServiceFailure =

                    logOnFailure(onServiceFailure, "notifying callback of service failure");

                    logOnFailure(onServiceFailure, "notifying callback of service failure");

            mBinder = binder;

            mBinder = binder;
@@ -604,8 +605,8 @@ public final class TextClassificationManagerService extends ITextClassifierServi 




        private UserState(int userId, Context context, Object lock) {

        private UserState(int userId, Context context, Object lock) {

            mUserId = userId;

            mUserId = userId;

            mContext = Preconditions.checkNotNull(context);

            mContext = Objects.requireNonNull(context);

            mLock = Preconditions.checkNotNull(lock);

            mLock = Objects.requireNonNull(lock);

        }

        }





        @GuardedBy("mLock")

        @GuardedBy("mLock")