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

Commit e789eeee 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: I902d340cf8025c560d3ae61223e8eba0c6bc5b30
parent 8cac70a6

services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java

+4 −4
Original line number Diff line number Diff line
@@ -74,13 +74,13 @@ import android.util.Slog; 


import com.android.internal.annotations.GuardedBy;

import com.android.internal.app.ISoundTriggerService;

import com.android.internal.util.Preconditions;

import com.android.server.SystemService;



import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.Map;

import java.util.Objects;

import java.util.TreeMap;

import java.util.UUID;

import java.util.concurrent.TimeUnit;
@@ -429,9 +429,9 @@ public class SoundTriggerService extends SystemService { 
        @Override

        public int startRecognitionForService(ParcelUuid soundModelId, Bundle params,

            ComponentName detectionService, SoundTrigger.RecognitionConfig config) {

            Preconditions.checkNotNull(soundModelId);

            Preconditions.checkNotNull(detectionService);

            Preconditions.checkNotNull(config);

            Objects.requireNonNull(soundModelId);

            Objects.requireNonNull(detectionService);

            Objects.requireNonNull(config);



            enforceCallingPermission(Manifest.permission.MANAGE_SOUND_TRIGGER);

services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java

+5 −5
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ import com.android.internal.app.IVoiceInteractor; 
import com.android.internal.content.PackageMonitor;

import com.android.internal.os.BackgroundThread;

import com.android.internal.util.DumpUtils;

import com.android.internal.util.Preconditions;

import com.android.server.FgThread;

import com.android.server.LocalServices;

import com.android.server.SystemService;
@@ -89,6 +88,7 @@ import com.android.server.wm.ActivityTaskManagerInternal; 
import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.util.List;

import java.util.Objects;

import java.util.concurrent.Executor;



/**
@@ -117,11 +117,11 @@ public class VoiceInteractionManagerService extends SystemService { 
        mResolver = context.getContentResolver();

        mDbHelper = new DatabaseHelper(context);

        mServiceStub = new VoiceInteractionManagerServiceStub();

        mAmInternal = Preconditions.checkNotNull(

        mAmInternal = Objects.requireNonNull(

                LocalServices.getService(ActivityManagerInternal.class));

        mAtmInternal = Preconditions.checkNotNull(

        mAtmInternal = Objects.requireNonNull(

                LocalServices.getService(ActivityTaskManagerInternal.class));

        mUserManagerInternal = Preconditions.checkNotNull(

        mUserManagerInternal = Objects.requireNonNull(

                LocalServices.getService(UserManagerInternal.class));



        PermissionManagerServiceInternal permissionManagerInternal = LocalServices.getService(
@@ -149,7 +149,7 @@ public class VoiceInteractionManagerService extends SystemService { 
    @Override

    public void onBootPhase(int phase) {

        if (PHASE_SYSTEM_SERVICES_READY == phase) {

            mShortcutServiceInternal = Preconditions.checkNotNull(

            mShortcutServiceInternal = Objects.requireNonNull(

                    LocalServices.getService(ShortcutServiceInternal.class));

            mSoundTriggerInternal = LocalServices.getService(SoundTriggerInternal.class);

        } else if (phase == PHASE_THIRD_PARTY_APPS_CAN_START) {