PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I65cc32fb79196054fb4115722b04771425368d62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2025-01-31 10:46:07 -08:00
committed by Automerger Merge Worker
parent 7b2b283d00 55b0bcd8cb
commit 184aee6710
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/development/linuxterminal/LinuxTerminalPreferenceController.java
View File

@@ -34,8 +34,6 @@ import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController; import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import java.util.Objects;
/** Preference controller for Linux terminal option in developers option */ /** Preference controller for Linux terminal option in developers option */
public class LinuxTerminalPreferenceController extends DeveloperOptionsPreferenceController public class LinuxTerminalPreferenceController extends DeveloperOptionsPreferenceController
implements PreferenceControllerMixin { implements PreferenceControllerMixin {
@@ -59,13 +57,15 @@ public class LinuxTerminalPreferenceController extends DeveloperOptionsPreferenc
mTerminalPackageName = mTerminalPackageName =
isPackageInstalled(context.getPackageManager(), packageName) ? packageName : null; isPackageInstalled(context.getPackageManager(), packageName) ? packageName : null;
StorageManager storageManager = StorageManager storageManager = context.getSystemService(StorageManager.class);
Objects.requireNonNull(context.getSystemService(StorageManager.class));
VirtualMachineManager virtualMachineManager = VirtualMachineManager virtualMachineManager =
Objects.requireNonNull(context.getSystemService(VirtualMachineManager.class)); context.getSystemService(VirtualMachineManager.class);
mIsDeviceCapable = mIsDeviceCapable =
getTotalMemory() >= MEMORY_MIN_BYTES getTotalMemory() >= MEMORY_MIN_BYTES
&& storageManager != null
&& storageManager.getPrimaryStorageSize() >= STORAGE_MIN_BYTES && storageManager.getPrimaryStorageSize() >= STORAGE_MIN_BYTES
&& virtualMachineManager != null
&& ((virtualMachineManager.getCapabilities() & CAPABILITY_NON_PROTECTED_VM) && ((virtualMachineManager.getCapabilities() & CAPABILITY_NON_PROTECTED_VM)
!= 0); != 0);
} }