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

Commit 184aee67 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Allow system services to be optional" into main am: 55b0bcd8 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3462915



Change-Id: I65cc32fb79196054fb4115722b04771425368d62
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7b2b283d 55b0bcd8

src/com/android/settings/development/linuxterminal/LinuxTerminalPreferenceController.java

+5 −5
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ import com.android.settings.R; 
import com.android.settings.core.PreferenceControllerMixin;

import com.android.settingslib.development.DeveloperOptionsPreferenceController;



import java.util.Objects;



/** Preference controller for Linux terminal option in developers option */

public class LinuxTerminalPreferenceController extends DeveloperOptionsPreferenceController

        implements PreferenceControllerMixin {
@@ -59,13 +57,15 @@ public class LinuxTerminalPreferenceController extends DeveloperOptionsPreferenc 
        mTerminalPackageName =

                isPackageInstalled(context.getPackageManager(), packageName) ? packageName : null;



        StorageManager storageManager =

                Objects.requireNonNull(context.getSystemService(StorageManager.class));

        StorageManager storageManager = context.getSystemService(StorageManager.class);

        VirtualMachineManager virtualMachineManager =

                Objects.requireNonNull(context.getSystemService(VirtualMachineManager.class));

                context.getSystemService(VirtualMachineManager.class);



        mIsDeviceCapable =

                getTotalMemory() >= MEMORY_MIN_BYTES

                        && storageManager != null

                        && storageManager.getPrimaryStorageSize() >= STORAGE_MIN_BYTES

                        && virtualMachineManager != null

                        && ((virtualMachineManager.getCapabilities() & CAPABILITY_NON_PROTECTED_VM)

                                != 0);

    }