diff options
author | Roshan Pius <rpius@google.com> | 2022-05-16 20:18:24 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-05-16 20:18:24 +0000 |
commit | 3202c91c7fe0b62e4430fa665d9263678225941f (patch) | |
tree | a7deac1870cc65e6734d0cd24ce0551244cfdc54 | |
parent | 19913471a158e5210cdd03cb410ec6c051813fc7 (diff) | |
parent | cf6930be39d3e8e0b2718ce7b1c121c943e2513f (diff) | |
download | Uwb-3202c91c7fe0b62e4430fa665d9263678225941f.tar.gz |
uwb(service): Dont cache specificationinfo am: 77b7c18509 am: cf6930be39
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Uwb/+/18407647
Change-Id: I5d8af67350a20325595408bb2094a83d7a973819
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | service/java/com/android/server/uwb/UwbServiceCore.java | 22 | ||||
-rw-r--r-- | service/tests/src/com/android/server/uwb/UwbServiceCoreTest.java | 11 |
2 files changed, 5 insertions, 28 deletions
diff --git a/service/java/com/android/server/uwb/UwbServiceCore.java b/service/java/com/android/server/uwb/UwbServiceCore.java index c199cd5a..4b55d780 100644 --- a/service/java/com/android/server/uwb/UwbServiceCore.java +++ b/service/java/com/android/server/uwb/UwbServiceCore.java @@ -94,7 +94,6 @@ public class UwbServiceCore implements INativeUwbManager.DeviceNotification, private final UwbMetrics mUwbMetrics; private final UwbCountryCode mUwbCountryCode; private final UwbInjector mUwbInjector; - private GenericSpecificationParams mSpecificationParams; private /* @UwbManager.AdapterStateCallback.State */ int mState; private @StateChangeReason int mLastStateChangedReason; private IUwbVendorUciCallback mCallBack = null; @@ -219,11 +218,7 @@ public class UwbServiceCore implements INativeUwbManager.DeviceNotification, } @Override - public void onCountryCodeChanged(@Nullable String countryCode) { - // Clear the cached capabilities on country code changes. - Log.v(TAG, "Clearing cached specification params on country code change"); - mSpecificationParams = null; - } + public void onCountryCodeChanged(@Nullable String countryCode) { } public void registerAdapterStateCallbacks(IUwbAdapterStateCallbacks adapterStateCallbacks) throws RemoteException { @@ -250,23 +245,16 @@ public class UwbServiceCore implements INativeUwbManager.DeviceNotification, mCallBack = null; } - private void updateSpecificationInfo() { + public PersistableBundle getSpecificationInfo() { + // TODO(b/211445008): Consolidate to a single uwb thread. Pair<Integer, GenericSpecificationParams> specificationParams = mConfigurationManager.getCapsInfo( GenericParams.PROTOCOL_NAME, GenericSpecificationParams.class); if (specificationParams.first != UwbUciConstants.STATUS_CODE_OK) { Log.e(TAG, "Failed to retrieve specification params"); - return; - } - mSpecificationParams = specificationParams.second; - } - - public PersistableBundle getSpecificationInfo() { - if (mSpecificationParams == null) { - updateSpecificationInfo(); + return new PersistableBundle(); } - if (mSpecificationParams == null) return new PersistableBundle(); - return mSpecificationParams.toBundle(); + return specificationParams.second.toBundle(); } public long getTimestampResolutionNanos() { diff --git a/service/tests/src/com/android/server/uwb/UwbServiceCoreTest.java b/service/tests/src/com/android/server/uwb/UwbServiceCoreTest.java index c17e91c8..e25f7abc 100644 --- a/service/tests/src/com/android/server/uwb/UwbServiceCoreTest.java +++ b/service/tests/src/com/android/server/uwb/UwbServiceCoreTest.java @@ -225,17 +225,6 @@ public class UwbServiceCoreTest { verifyGetSpecificationInfoSuccess(); } - @Test - public void testGetSpecificationInfoUsesCache() throws Exception { - verifyGetSpecificationInfoSuccess(); - clearInvocations(mUwbConfigurationManager); - - PersistableBundle specifications = mUwbServiceCore.getSpecificationInfo(); - assertThat(specifications).isNotNull(); - - verifyNoMoreInteractions(mUwbConfigurationManager); - } - private void enableUwb() throws Exception { when(mNativeUwbManager.doInitialize()).thenReturn(true); when(mUwbCountryCode.setCountryCode(anyBoolean())).thenReturn(true); |