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

Commit 17fd1190 authored by Eric Biggers's avatar Eric Biggers Committed by Android (Google) Code Review
Browse files

Merge "Revert "Use RoSystemFeatures API where appropriate"" into main

parents d7af5609 2ee8e774

services/core/java/com/android/server/locksettings/LockSettingsService.java

+2 −3
Original line number Diff line number Diff line
@@ -132,7 +132,6 @@ import com.android.internal.annotations.GuardedBy; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.messages.nano.SystemMessageProto.SystemMessage;

import com.android.internal.notification.SystemNotificationChannels;

import com.android.internal.pm.RoSystemFeatures;

import com.android.internal.util.ArrayUtils;

import com.android.internal.util.DumpUtils;

import com.android.internal.util.IndentingPrintWriter;
@@ -1297,7 +1296,7 @@ public class LockSettingsService extends ILockSettings.Stub { 
        mContext.enforceCallingOrSelfPermission(

                Manifest.permission.MANAGE_WEAK_ESCROW_TOKEN,

                "Requires MANAGE_WEAK_ESCROW_TOKEN permission.");

        if (!RoSystemFeatures.hasFeatureAutomotive(mContext)) {

        if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)) {

            throw new IllegalArgumentException(

                    "Weak escrow token are only for automotive devices.");

        }
@@ -3559,7 +3558,7 @@ public class LockSettingsService extends ILockSettings.Stub { 
        }



        // Escrow tokens are enabled on automotive builds.

        if (RoSystemFeatures.hasFeatureAutomotive(mContext)) {

        if (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)) {

            return;

        }