Bug 1180795 - KidFox: Disable first-run screen for restricted profile.r=sebastian
authorAllison Naaktgeboren <ally@mozilla.com>
Thu, 30 Jul 2015 13:02:10 -0700
changeset 287164 f327907afbb1398a63ccb5456078a36b68fc0ee3
parent 287163 3b696b49a755c6cb17f20fbbf5fc68c6302813c1
child 287165 acc4a2918f31e0e1433f8b5df13074e381ffb13e
push id5067
push userraliiev@mozilla.com
push dateMon, 21 Sep 2015 14:04:52 +0000
treeherdermozilla-beta@14221ffe5b2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssebastian
bugs1180795
milestone42.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1180795 - KidFox: Disable first-run screen for restricted profile.r=sebastian
mobile/android/base/BrowserApp.java
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -2630,16 +2630,20 @@ public class BrowserApp extends GeckoApp
                 break;
 
             default:
                 super.onActivityResult(requestCode, resultCode, data);
         }
     }
 
     private void showFirstrunPager() {
+        // Do not show first run if we're in an Android Restricted Profile
+        if (RestrictedProfiles.isUserRestricted(this)) {
+            return;
+        }
         if (mFirstrunPane == null) {
             final ViewStub firstrunPagerStub = (ViewStub) findViewById(R.id.firstrun_pager_stub);
             mFirstrunPane = (FirstrunPane) firstrunPagerStub.inflate();
             mFirstrunPane.load(getSupportFragmentManager());
             mFirstrunPane.registerOnFinishListener(new FirstrunPane.OnFinishListener() {
                 @Override
                 public void onFinish() {
                     BrowserApp.this.mFirstrunPane = null;