Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 111539a0 authored by Lei Ju's avatar Lei Ju Committed by Android (Google) Code Review
Browse files

Merge "Implement the getUuid() callback function" into main

parents cb7951b3 ed22ec8b

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ java_library { 
        "android.hardware.contexthub-V1.0-java",

        "android.hardware.contexthub-V1.1-java",

        "android.hardware.contexthub-V1.2-java",

        "android.hardware.contexthub-V2-java",

        "android.hardware.contexthub-V3-java",

        "android.hardware.gnss-V1.0-java",

        "android.hardware.gnss-V2.1-java",

        "android.hardware.health-V1.0-java-constants",

services/core/java/com/android/server/location/contexthub/IContextHubWrapper.java

+7 −0
Original line number Diff line number Diff line
@@ -421,6 +421,9 @@ public abstract class IContextHubWrapper { 
                android.hardware.contexthub.IContextHubCallback.Stub {

            private final int mContextHubId;

            private final ICallback mCallback;

            // 9a17008d-6bf1-445a-9011-6d21bd985b6c

            private static final byte[] UUID = {-102, 23, 0, -115, 107, -15, 68, 90,

                                                -112, 17, 109, 33, -67, -104, 91, 108};



            ContextHubAidlCallback(int contextHubId, ICallback callback) {

                mContextHubId = contextHubId;
@@ -463,6 +466,10 @@ public abstract class IContextHubWrapper { 
                // TODO(271471342): Implement

            }



            public byte[] getUuid() {

                return UUID;

            }



            @Override

            public String getInterfaceHash() {

                return android.hardware.contexthub.IContextHubCallback.HASH;