Prevent setting tracking protection state on suspended Sessions. Fixes #2360 (#2361)

bluemarvin · MortimerGoro · commit f4e1dca84e1a · 2019-11-22T19:25:40.000+01:00
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/Session.java b/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/Session.java
@@ -781,7 +781,9 @@ protected void resetMultiprocess() {
     protected void setTrackingProtection(final boolean aEnabled) {
         if (mState.mSettings.isTrackingProtectionEnabled() != aEnabled) {
             mState.mSettings.setTrackingProtectionEnabled(aEnabled);
-            mState.mSession.getSettings().setUseTrackingProtection(aEnabled);
+            if (mState.mSession != null) {
+                mState.mSession.getSettings().setUseTrackingProtection(aEnabled);
+            }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -781,7 +781,9 @@ protected void resetMultiprocess() {`
`781`	`781`	`protected void setTrackingProtection(final boolean aEnabled) {`
`782`	`782`	`if (mState.mSettings.isTrackingProtectionEnabled() != aEnabled) {`
`783`	`783`	`mState.mSettings.setTrackingProtectionEnabled(aEnabled);`
`784`		`- mState.mSession.getSettings().setUseTrackingProtection(aEnabled);`
	`784`	`+ if (mState.mSession != null) {`
	`785`	`+ mState.mSession.getSettings().setUseTrackingProtection(aEnabled);`
	`786`	`+ }`
`785`	`787`	`}`
`786`	`788`	`}`
`787`	`789`