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

Commit 95cfb4c3 authored by Lei Ju's avatar Lei Ju Committed by Automerger Merge Worker
Browse files

Merge "Register callback before calling other hal APIs" into udc-dev am: f2494bc6 

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



Change-Id: I88c1b0f9ccf7d17f705d9c3075fd8ac409bc2ac7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b0ac5c0c f2494bc6

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

+5 −5
Original line number Original line Diff line number Diff line
@@ -370,11 +370,6 @@ public class ContextHubService extends IContextHubService.Stub { 
            mLastRestartTimestampMap.put(contextHubId,

            mLastRestartTimestampMap.put(contextHubId,

                    new AtomicLong(SystemClock.elapsedRealtimeNanos()));

                    new AtomicLong(SystemClock.elapsedRealtimeNanos()));





            IContextHubClient client = mClientManager.registerClient(

                    contextHubInfo, createDefaultClientCallback(contextHubId),

                    /* attributionTag= */ null, mTransactionManager, mContext.getPackageName());

            defaultClientMap.put(contextHubId, client);



            try {

            try {

                mContextHubWrapper.registerCallback(contextHubId,

                mContextHubWrapper.registerCallback(contextHubId,

                        new ContextHubServiceCallback(contextHubId));

                        new ContextHubServiceCallback(contextHubId));
@@ -383,6 +378,11 @@ public class ContextHubService extends IContextHubService.Stub { 
                        + contextHubId + ")", e);

                        + contextHubId + ")", e);

            }

            }





            IContextHubClient client = mClientManager.registerClient(

                    contextHubInfo, createDefaultClientCallback(contextHubId),

                    /* attributionTag= */ null, mTransactionManager, mContext.getPackageName());

            defaultClientMap.put(contextHubId, client);



            // Do a query to initialize the service cache list of nanoapps

            // Do a query to initialize the service cache list of nanoapps

            // TODO(b/194289715): Remove this when old API is deprecated

            // TODO(b/194289715): Remove this when old API is deprecated

            queryNanoAppsInternal(contextHubId);

            queryNanoAppsInternal(contextHubId);