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

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

Merge "Synchronize access to mCallbacksList" into tm-dev am: 21363f2e 

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



Change-Id: I602b3ca079e51a0c8d7e1a0b9606c361287963da
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8c81e2aa 21363f2e

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

+24 −20
Original line number Diff line number Diff line
@@ -1058,11 +1058,14 @@ public class ContextHubService extends IContextHubService.Stub { 
        }



        int msgVersion = 0;

        // Synchronize access to mCallbacksList to prevent more than one outstanding broadcast as

        // that will cause a crash.

        synchronized (mCallbacksList) {

            int callbacksCount = mCallbacksList.beginBroadcast();

            if (DEBUG_LOG_ENABLED) {

            Log.v(TAG, "Sending message " + msgType + " version " + msgVersion + " from hubHandle "

                    + contextHubHandle + ", appInstance " + appInstance + ", callBackCount "

                    + callbacksCount);

                Log.v(TAG, "Sending message " + msgType + " version " + msgVersion

                        + " from hubHandle " + contextHubHandle + ", appInstance " + appInstance

                        + ", callBackCount " + callbacksCount);

            }



            if (callbacksCount < 1) {
@@ -1083,6 +1086,7 @@ public class ContextHubService extends IContextHubService.Stub { 
                }

            }

            mCallbacksList.finishBroadcast();

        }

        return 0;

    }