Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove mIsRegistered check for setUwbEnabled" into sc-dev am: 6c3b00c116

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14943278

Change-Id: I5f23aa84137a1710b5167b0ce8ab8d58b6e9213f
This commit is contained in:
TreeHugger Robot
2021-06-12 15:55:24 +00:00
committed by Automerger Merge Worker
parent 8d0fea1842 6c3b00c116
commit e5cddac7a0
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/uwb/AdapterStateListener.java
View File

@@ -108,16 +108,13 @@ public class AdapterStateListener extends IUwbAdapterStateCallbacks.Stub {
*/ */
public void setEnabled(boolean isEnabled) { public void setEnabled(boolean isEnabled) {
synchronized (this) { synchronized (this) {
if (!mIsRegistered) { try {
return; mAdapter.setEnabled(isEnabled);
} else { } catch (RemoteException e) {
try { Log.w(TAG, "Failed to set adapter state");
mAdapter.setEnabled(isEnabled); throw e.rethrowFromSystemServer();
} catch (RemoteException e) {
Log.w(TAG, "Failed to set adapter state");
throw e.rethrowFromSystemServer();
}
} }
} }
} }