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

Commit 15ebe30a authored by Evan Chen's avatar Evan Chen Committed by Android (Google) Code Review
Browse files

Merge "If the attempt to read ObservableUuid data from disk results in no data... 

Merge "If the attempt to read ObservableUuid data from disk results in no data being found (or an error occurs), return an empty list instead of null" into main
parents 931269dd c9c2ea0f

services/companion/java/com/android/server/companion/devicepresence/ObservableUuidStore.java

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ public class ObservableUuidStore { 
            }

            mCachedPerUser.set(userId, cachedObservableUuids);

        }

        return cachedObservableUuids;

        return cachedObservableUuids == null ? new ArrayList<>() : cachedObservableUuids;

    }



    /**