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

Commit e2ca6779 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "Fix NullPointerException for stopAdvertisingSet()" am: 3603a03c am: 05ef47a0 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2319492



Change-Id: I7609815587147312cac0a1fd800394297fe35d57
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a6c8fe92 05ef47a0

android/app/src/com/android/bluetooth/gatt/ContextMap.java

+30 −0
Original line number Diff line number Diff line
@@ -460,6 +460,9 @@ import java.util.UUID; 
    void setAdvertiserIdByRegId(int regId, int advertiserId) {

        synchronized (this) {

            AppAdvertiseStats stats = mAppAdvertiseStats.get(regId);

            if (stats == null) {

                return;

            }

            stats.setId(advertiserId);

            mAppAdvertiseStats.remove(regId);

            mAppAdvertiseStats.put(advertiserId, stats);
@@ -472,6 +475,9 @@ import java.util.UUID; 
            int duration, int maxExtAdvEvents) {

        synchronized (this) {

            AppAdvertiseStats stats = mAppAdvertiseStats.get(id);

            if (stats == null) {

                return;

            }

            stats.recordAdvertiseStart(parameters, advertiseData, scanResponse,

                    periodicParameters, periodicData, duration, maxExtAdvEvents);

        }
@@ -480,6 +486,9 @@ import java.util.UUID; 
    void recordAdvertiseStop(int id) {

        synchronized (this) {

            AppAdvertiseStats stats = mAppAdvertiseStats.get(id);

            if (stats == null) {

                return;

            }

            stats.recordAdvertiseStop();

            mAppAdvertiseStats.remove(id);

            mLastAdvertises.add(stats);
@@ -489,6 +498,9 @@ import java.util.UUID; 
    void enableAdvertisingSet(int id, boolean enable, int duration, int maxExtAdvEvents) {

        synchronized (this) {

            AppAdvertiseStats stats = mAppAdvertiseStats.get(id);

            if (stats == null) {

                return;

            }

            stats.enableAdvertisingSet(enable, duration, maxExtAdvEvents);

        }

    }
@@ -496,6 +508,9 @@ import java.util.UUID; 
    void setAdvertisingData(int id, AdvertiseData data) {

        synchronized (this) {

            AppAdvertiseStats stats = mAppAdvertiseStats.get(id);

            if (stats == null) {

                return;

            }

            stats.setAdvertisingData(data);

        }

    }
@@ -503,6 +518,9 @@ import java.util.UUID; 
    void setScanResponseData(int id, AdvertiseData data) {

        synchronized (this) {

            AppAdvertiseStats stats = mAppAdvertiseStats.get(id);

            if (stats == null) {

                return;

            }

            stats.setScanResponseData(data);

        }

    }
@@ -510,6 +528,9 @@ import java.util.UUID; 
    void setAdvertisingParameters(int id, AdvertisingSetParameters parameters) {

        synchronized (this) {

            AppAdvertiseStats stats = mAppAdvertiseStats.get(id);

            if (stats == null) {

                return;

            }

            stats.setAdvertisingParameters(parameters);

        }

    }
@@ -517,6 +538,9 @@ import java.util.UUID; 
    void setPeriodicAdvertisingParameters(int id, PeriodicAdvertisingParameters parameters) {

        synchronized (this) {

            AppAdvertiseStats stats = mAppAdvertiseStats.get(id);

            if (stats == null) {

                return;

            }

            stats.setPeriodicAdvertisingParameters(parameters);

        }

    }
@@ -524,6 +548,9 @@ import java.util.UUID; 
    void setPeriodicAdvertisingData(int id, AdvertiseData data) {

        synchronized (this) {

            AppAdvertiseStats stats = mAppAdvertiseStats.get(id);

            if (stats == null) {

                return;

            }

            stats.setPeriodicAdvertisingData(data);

        }

    }
@@ -531,6 +558,9 @@ import java.util.UUID; 
    void onPeriodicAdvertiseEnabled(int id, boolean enable) {

        synchronized (this) {

            AppAdvertiseStats stats = mAppAdvertiseStats.get(id);

            if (stats == null) {

                return;

            }

            stats.onPeriodicAdvertiseEnabled(enable);

        }

    }