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

Commit 43d17a67 authored by nharold's avatar nharold Committed by android-build-merger
Browse files

Merge "Check ManagedResource is NonNull before Checking Owner" am: d1ffb134

am: e38e57c2

Change-Id: I59a8143162800f35748b1e145973743855faca09
parents 28f67840 e38e57c2
Loading
Loading
Loading
Loading
+5 −1
Original line number Original line Diff line number Diff line
@@ -206,7 +206,11 @@ public class IpSecService extends IIpSecService.Stub {


        T get(int key) {
        T get(int key) {
            T val = mArray.get(key);
            T val = mArray.get(key);
            // The value should never be null unless the resource doesn't exist
            // (since we do not allow null resources to be added).
            if (val != null) {
                val.checkOwnerOrSystemAndThrow();
                val.checkOwnerOrSystemAndThrow();
            }
            return val;
            return val;
        }
        }