Merge "Enable UUID support from ContextHubService" into main

1 files changed, 1 insertions, 2 deletions

diff --git a/services/core/java/com/android/server/location/contexthub/IContextHubWrapper.java b/services/core/java/com/android/server/location/contexthub/IContextHubWrapper.java
index 35c61204d251..d359280c2a6f 100644
--- a/services/core/java/com/android/server/location/contexthub/IContextHubWrapper.java
+++ b/services/core/java/com/android/server/location/contexthub/IContextHubWrapper.java
@@ -467,8 +467,7 @@ public abstract class IContextHubWrapper {
             }
 
             public byte[] getUuid() throws RemoteException {
-                //TODO(b/247124878): return the UUID defined in this file when the API is put in use
-                throw new RemoteException("This API is not implemented yet.");
+                return UUID;
             }
 
             @Override