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

Commit 5221e926 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use RoSystemFeatures API where appropriate" into main am: f5e39c22 am: 008b1fc3 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3446189



Change-Id: I6b44d1d38b53069d6fa2ba4fb577403b0a62a96f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 723b4199 008b1fc3

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

+3 −2
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ 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;
@@ -1325,7 +1326,7 @@ public class LockSettingsService extends ILockSettings.Stub { 
        mContext.enforceCallingOrSelfPermission(

                Manifest.permission.MANAGE_WEAK_ESCROW_TOKEN,

                "Requires MANAGE_WEAK_ESCROW_TOKEN permission.");

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

        if (!RoSystemFeatures.hasFeatureAutomotive(mContext)) {

            throw new IllegalArgumentException(

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

        }
@@ -3613,7 +3614,7 @@ public class LockSettingsService extends ILockSettings.Stub { 
        }



        // Escrow tokens are enabled on automotive builds.

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

        if (RoSystemFeatures.hasFeatureAutomotive(mContext)) {

            return;

        }