diff options
author | Roshan Pius <rpius@google.com> | 2024-02-07 00:39:47 +0000 |
---|---|---|
committer | Android Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | 2024-02-07 00:39:47 +0000 |
commit | eb7504eae8ccd705c5277e6edef07b2a724230b0 (patch) | |
tree | 18a11421620f732c046858561fa4e7786026aa4d | |
parent | 3f32e37ae29646a263a70c225c5ebcd3c7725209 (diff) | |
download | Uwb-eb7504eae8ccd705c5277e6edef07b2a724230b0.tar.gz |
uwb(service): Rename isUwbChipEnabled -> isUwbEnabledInternal
To avoid confusion with the new hardware state being introduced.
Bug: 322372275
Test: atest UwbManagerTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ddb1951b10c515474ce4cbc5c07f7c9dc5c92f0a)
Merged-In: I87d41d876cfb75ed11ab16a108bb8678f2e27503
Change-Id: I87d41d876cfb75ed11ab16a108bb8678f2e27503
-rw-r--r-- | service/java/com/android/server/uwb/UwbServiceCore.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/service/java/com/android/server/uwb/UwbServiceCore.java b/service/java/com/android/server/uwb/UwbServiceCore.java index a25b72b3..d75801d3 100644 --- a/service/java/com/android/server/uwb/UwbServiceCore.java +++ b/service/java/com/android/server/uwb/UwbServiceCore.java @@ -207,7 +207,7 @@ public class UwbServiceCore implements INativeUwbManager.DeviceNotification, return getAdapterState() != AdapterStateCallback.STATE_DISABLED; } - private boolean isUwbChipEnabled() { + private boolean isUwbEnabledInternal() { synchronized (UwbServiceCore.this) { return getInternalAdapterState() != AdapterStateCallback.STATE_DISABLED; } @@ -758,10 +758,10 @@ public class UwbServiceCore implements INativeUwbManager.DeviceNotification, public synchronized void setEnabled(boolean enabled) { int task = enabled ? TASK_ENABLE : TASK_DISABLE; - if (enabled && isUwbChipEnabled()) { - Log.w(TAG, "Uwb chip is already enabled"); - } else if (!enabled && !isUwbChipEnabled()) { - Log.w(TAG, "Uwb chip is already disabled"); + if (enabled && isUwbEnabledInternal()) { + Log.w(TAG, "Uwb is already enabled"); + } else if (!enabled && !isUwbEnabledInternal()) { + Log.w(TAG, "Uwb is already disabled"); } mUwbTask.execute(task); @@ -921,7 +921,7 @@ public class UwbServiceCore implements INativeUwbManager.DeviceNotification, } private void handleEnable() { - if (isUwbChipEnabled()) { + if (isUwbEnabledInternal()) { Log.i(TAG, "UWB chip is already enabled, notify adapter state = " + getAdapterState()); return; @@ -996,7 +996,7 @@ public class UwbServiceCore implements INativeUwbManager.DeviceNotification, } private void handleDisable() { - if (!isUwbChipEnabled()) { + if (!isUwbEnabledInternal()) { Log.i(TAG, "UWB chip is already disabled, notify adapter state = " + getAdapterState()); return; |