Bug 1449829 - Prevent calling getPid() on null IChildProcess r=jchen
authorRandall Barker <rbarker@mozilla.com>
Thu, 29 Mar 2018 09:39:07 -0700
changeset 774820 26e683b91f092124b4cc96bb821384092d034057
parent 774819 c781314211da927e7dc5939728c0a53ebf9227f3
child 774925 b8712aa41c6a9e39ade9a04057403a485f6aab11
push id104516
push userbmo:rbarker@mozilla.com
push dateThu, 29 Mar 2018 16:39:59 +0000
reviewersjchen
bugs1449829
milestone61.0a1
Bug 1449829 - Prevent calling getPid() on null IChildProcess r=jchen MozReview-Commit-ID: 32LuYFqL47n
mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoProcessManager.java
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoProcessManager.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoProcessManager.java
@@ -51,17 +51,17 @@ public final class GeckoProcessManager e
         private IChildProcess mChild;
         private int mPid;
 
         public ChildConnection(String type) {
             mType = type;
         }
 
         public synchronized int getPid() {
-            if (mPid == 0) {
+            if ((mPid == 0) && (mChild != null)) {
                 try {
                     mPid = mChild.getPid();
                 } catch (final RemoteException e) {
                     Log.e(LOGTAG, "Cannot get pid for " + mType, e);
                 }
             }
             return mPid;
         }