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

Commit e18a77df authored by Anthony Stange's avatar Anthony Stange Committed by Automerger Merge Worker
Browse files

Merge "Update contexthub framework based on latest v1.2 spec" into sc-dev am: 8d976939 

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

Change-Id: Ib77e9ef43250d0e38dfb2aed239bce38591e185e
parents 191cec38 8d976939

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

+1 −1
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ public class ContextHubClientBroker extends IContextHubClient.Stub 


            int contextHubId = mAttachedContextHubInfo.getId();

            try {

                result = mContextHubProxy.sendMessageToHub(contextHubId, messageToNanoApp);

                result = mContextHubProxy.getHub().sendMessageToHub(contextHubId, messageToNanoApp);

            } catch (RemoteException e) {

                Log.e(TAG, "RemoteException in sendMessageToNanoApp (target hub ID = "

                        + contextHubId + ")", e);

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

+0 −24
Original line number Diff line number Diff line
@@ -103,12 +103,6 @@ public abstract class IContextHubWrapper { 
    public abstract void registerCallback(

            int hubId, IContexthubCallback callback) throws RemoteException;



    /**

     * Calls the appropriate sendMessageToHub function depending on the HAL version.

     */

    public abstract int sendMessageToHub(int hubId,

            android.hardware.contexthub.V1_0.ContextHubMsg message) throws RemoteException;



    /**

     * @return A valid instance of Contexthub HAL 1.0.

     */
@@ -180,11 +174,6 @@ public abstract class IContextHubWrapper { 
            mHub.registerCallback(hubId, callback);

        }



        public int sendMessageToHub(int hubId,

                android.hardware.contexthub.V1_0.ContextHubMsg message) throws RemoteException {

            return mHub.sendMessageToHub(hubId, message);

        }



        public android.hardware.contexthub.V1_0.IContexthub getHub() {

            return mHub;

        }
@@ -234,11 +223,6 @@ public abstract class IContextHubWrapper { 
            mHub.registerCallback(hubId, callback);

        }



        public int sendMessageToHub(int hubId,

                android.hardware.contexthub.V1_0.ContextHubMsg message) throws RemoteException {

            return mHub.sendMessageToHub(hubId, message);

        }



        public android.hardware.contexthub.V1_0.IContexthub getHub() {

            return mHub;

        }
@@ -304,14 +288,6 @@ public abstract class IContextHubWrapper { 
            mHub.registerCallback_1_2(hubId, callback);

        }



        public int sendMessageToHub(int hubId,

                android.hardware.contexthub.V1_0.ContextHubMsg message) throws RemoteException {

            android.hardware.contexthub.V1_2.ContextHubMsg newMessage =

                    new android.hardware.contexthub.V1_2.ContextHubMsg();

            newMessage.msg_1_0 = message;

            return mHub.sendMessageToHub_1_2(hubId, newMessage);

        }



        public android.hardware.contexthub.V1_0.IContexthub getHub() {

            return mHub;

        }