fix bug from merge conflict resolution

oxyii · Jun 28, 2016 · 8624904 · 8624904
1 parent c7fa9ac
commit 8624904
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/android/app/src/main/java/com/microsoft/codepush/react/CodePushNativeModule.java b/android/app/src/main/java/com/microsoft/codepush/react/CodePushNativeModule.java
@@ -452,7 +452,7 @@ public void recordStatusReported(ReadableMap statusReport) {
     public void restartApp(boolean onlyIfUpdateIsPending, Promise promise) {
         // If this is an unconditional restart request, or there
         // is current pending update, then reload the app.
-        if (!onlyIfUpdateIsPending || CodePush.this.isPendingUpdate(null)) {
+        if (!onlyIfUpdateIsPending || mSettingsManager.isPendingUpdate(null)) {
             loadBundle();
             promise.resolve(true);
             return;