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

Commit b8b05de2 authored by Steven Moreland's avatar Steven Moreland Committed by Android (Google) Code Review
Browse files

Merge changes from topic "aidl-java-api-ci" into tm-dev 

* changes:
  Implement getInterfaceHash/Version (USB)
  Implement getInterfaceHash/Version (CHRE)
  Implement getInterfaceHash/Version (omapi)
  Implement getInterfaceHash/Version (health)
parents 3fb8f5d5 1b463332

omapi/java/android/se/omapi/SEService.java

+10 −0
Original line number Diff line number Diff line
@@ -118,6 +118,16 @@ public final class SEService { 
                });

            }

        }



        @Override

        public String getInterfaceHash() {

            return ISecureElementListener.HASH;

        }



        @Override

        public int getInterfaceVersion() {

            return ISecureElementListener.VERSION;

        }

    }

    private SEListener mSEListener = new SEListener();

services/core/java/com/android/server/health/HealthRegCallbackAidl.java

+8 −0
Original line number Diff line number Diff line
@@ -115,5 +115,13 @@ public class HealthRegCallbackAidl { 
        public void healthInfoChanged(HealthInfo healthInfo) throws RemoteException {

            mServiceInfoCallback.update(healthInfo);

        }

        @Override

        public String getInterfaceHash() {

            return IHealthInfoCallback.HASH;

        }

        @Override

        public int getInterfaceVersion() {

            return IHealthInfoCallback.VERSION;

        }

    }

}

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

+9 −0
Original line number Diff line number Diff line
@@ -389,6 +389,15 @@ public abstract class IContextHubWrapper { 
                    mCallback.handleTransactionResult(transactionId, success);

                });

            }

            @Override

            public String getInterfaceHash() {

                return android.hardware.contexthub.IContextHubCallback.HASH;

            }



            @Override

            public int getInterfaceVersion() {

                return android.hardware.contexthub.IContextHubCallback.VERSION;

            }

        }



        ContextHubWrapperAidl(android.hardware.contexthub.IContextHub hub) {

services/usb/java/com/android/server/usb/hal/port/UsbPortAidl.java

+10 −0
Original line number Diff line number Diff line
@@ -725,5 +725,15 @@ public final class UsbPortAidl implements UsbPortHal { 
                        e);

            }

        }



        @Override

        public String getInterfaceHash() {

            return IUsbCallback.HASH;

        }



        @Override

        public int getInterfaceVersion() {

            return IUsbCallback.VERSION;

        }

    }

}