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

Commit dd1096fd authored by Ajay Panicker's avatar Ajay Panicker Committed by android-build-merger
Browse files

Merge "Properly label app as unregistered and add NPE protection" into nyc-dev 

am: 36cd4ed2

* commit '36cd4ed2':
  Properly label app as unregistered and add NPE protection

Change-Id: I257b811c9fcfc3f4e4516701091f9d810682b64e
parents ece89907 36cd4ed2

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

+2 −2
Original line number Diff line number Diff line
@@ -214,8 +214,8 @@ import com.android.bluetooth.btservice.BluetoothProto; 
            }

        }



        if (isRegistered) {

        ContextMap.App appEntry = contextMap.getByName(appName);

        if (appEntry != null && isRegistered) {

            sb.append("  Application ID                     : " +

                      appEntry.id + "\n");

            sb.append("  UUID                               : " +

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

+2 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ import com.android.bluetooth.btservice.BluetoothProto; 
                App entry = i.next();

                if (entry.id == id) {

                    entry.unlinkToDeath();

                    mAppScanStats.get(entry.name).isRegistered = false;

                    entry.appScanStats.isRegistered = false;

                    i.remove();

                    break;

                }
@@ -359,6 +359,7 @@ import com.android.bluetooth.btservice.BluetoothProto; 
            while (i.hasNext()) {

                App entry = i.next();

                entry.unlinkToDeath();

                entry.appScanStats.isRegistered = false;

                i.remove();

            }

        }