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

Commit 62bf2b96 authored by nharold's avatar nharold Committed by android-build-merger
Browse files

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

Merge "Check ManagedResource is NonNull before Checking Owner" am: d1ffb134 am: e38e57c2 am: 43d17a67
am: d84a546a

Change-Id: Ie439eca6ec805e0c60574f21deef1d49574891c8
parents 725830e3 d84a546a

services/core/java/com/android/server/IpSecService.java

+5 −1
Original line number Diff line number Diff line
@@ -206,7 +206,11 @@ public class IpSecService extends IIpSecService.Stub { 


        T get(int 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();

            }

            return val;

        }