joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Check ManagedResource is NonNull before Checking Owner"

Browse source
This commit is contained in:
nharold 2017-07-17 16:57:01 +00:00 • committed by Gerrit Code Review
commit 0d1e9bb5b8
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
services/core/java/com/android/server/IpSecService.java
View file

@ -206,7 +206,11 @@ public class IpSecService extends IIpSecService.Stub {
T get(int key) {
T val = mArray.get(key);
val.checkOwnerOrSystemAndThrow();
// 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;
}