From 67a10447b33fcc24eb2d6f56fd14d7e95a7305eb Mon Sep 17 00:00:00 2001
From: Bruno Martins <bgcngm@gmail.com>
Date: Wed, 28 Sep 2022 11:55:27 +0100
Subject: [PATCH] TrustInterfaceService: Simplify hasUsbRestrictorInternal code

Change-Id: I4cb05e3749b0939207cd0dc2da1002bf0ceedf7b
---
 .../lineageos/platform/internal/TrustInterfaceService.java | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lineage/lib/main/java/org/lineageos/platform/internal/TrustInterfaceService.java b/lineage/lib/main/java/org/lineageos/platform/internal/TrustInterfaceService.java
index 11b2a0be..473bfe08 100644
--- a/lineage/lib/main/java/org/lineageos/platform/internal/TrustInterfaceService.java
+++ b/lineage/lib/main/java/org/lineageos/platform/internal/TrustInterfaceService.java
@@ -165,11 +165,8 @@ public class TrustInterfaceService extends LineageSystemService {
 
     private boolean hasUsbRestrictorInternal() {
         DevicePolicyManager policyManager = mContext.getSystemService(DevicePolicyManager.class);
-        if (policyManager != null) {
-            return policyManager.canUsbDataSignalingBeDisabled() || mUsbRestrictor != null;
-        } else {
-            return mUsbRestrictor != null;
-        }
+        return mUsbRestrictor != null ||
+                (policyManager != null && policyManager.canUsbDataSignalingBeDisabled());
     }
 
     private boolean postOnBoardingNotification() {