diff options
| author | 2025-01-10 17:40:27 -0800 | |
|---|---|---|
| committer | 2025-01-10 17:40:27 -0800 | |
| commit | 008b1fc331e12701ac8a9ed1e1672da36e03cd00 (patch) | |
| tree | de9c5433b3a90b99a1f563837588b1ca548506a3 | |
| parent | afec391b2ab6fb7f4a18509dd7434a393f047372 (diff) | |
| parent | f5e39c2289c31d935be3a2776ea60f047e4808eb (diff) | |
Merge "Use RoSystemFeatures API where appropriate" into main am: f5e39c2289
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3446189
Change-Id: I46f3cf6425cd4a992c1901002ebca5588a49b7a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/locksettings/LockSettingsService.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java index 0d0cdd83cc73..a0e543300ce7 100644 --- a/services/core/java/com/android/server/locksettings/LockSettingsService.java +++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java @@ -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; } |