Merge "Fix remove-before-add for IpSecService RefcountedResource"

am: dcd06394d4 Change-Id: Ief286a54a93efd731deeff9fc32815663ab7695d
2019-04-09 10:39:16 -07:00
parent 1c3e46628c dcd06394d4
commit 47fa5b0f7f
1 changed files with 1 additions and 0 deletions
--- a/services/core/java/com/android/server/IpSecService.java
+++ b/services/core/java/com/android/server/IpSecService.java
@@ -208,6 +208,7 @@ public class IpSecService extends IIpSecService.Stub {
                    mBinder.linkToDeath(this, 0);
                } catch (RemoteException e) {
                    binderDied();
+                    e.rethrowFromSystemServer();
                }
            }
        }