Merge pull request #12882 from gasolin/issue-922620

Bug 922620 - Wap push service activated by default, r=arthur
mozilla-b2g · Oct 16, 2013 · ede2d97 · ede2d97
2 parents 1248ea0 + bc84661
commit ede2d97
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/build/settings.js b/build/settings.js
@@ -298,7 +298,7 @@ function execute(options) {
    'wifi.disabled_by_wakelock': false,
    'wifi.notification': false,
    'wifi.connect_via_settings': false,
-   'wap.push.enabled': false
+   'wap.push.enabled': true
   };
 
   // We want the console to be disabled for device builds using the user variant.

diff --git a/distribution_tablet/settings.json b/distribution_tablet/settings.json
@@ -1,3 +1,4 @@
 {
- "app.launch_path.blacklist": ["/dialer/index.html#keyboard-view"]
+ "app.launch_path.blacklist": ["/dialer/index.html#keyboard-view"],
+ "wap.push.enabled": false
 }