Bug 1291385 - 2 .Move restrictions package from geckoview to Fennec; r=nalexander
authorJim Chen <nchen@mozilla.com>
Wed, 14 Sep 2016 12:43:36 -0400
changeset 355253 88e521197760c92f2f688d4223915844a0a66c69
parent 355252 403103b3b8650b27f945c97ec41ec2d46036aeba
child 355254 335cdcff54f425ba8b4a080baf863b5e367f90f1
push id6570
push userraliiev@mozilla.com
push dateMon, 14 Nov 2016 12:26:13 +0000
treeherdermozilla-beta@f455459b2ae5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1291385
milestone51.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 1291385 - 2 .Move restrictions package from geckoview to Fennec; r=nalexander The restrictions package really belongs in Fennec code rather than in geckoview code. The move also eliminates some dependency errors because the restrictions package references some classes in Fennec code.
mobile/android/base/java/org/mozilla/gecko/restrictions/DefaultConfiguration.java
mobile/android/base/java/org/mozilla/gecko/restrictions/GuestProfileConfiguration.java
mobile/android/base/java/org/mozilla/gecko/restrictions/Restrictable.java
mobile/android/base/java/org/mozilla/gecko/restrictions/RestrictedProfileConfiguration.java
mobile/android/base/java/org/mozilla/gecko/restrictions/RestrictionCache.java
mobile/android/base/java/org/mozilla/gecko/restrictions/RestrictionConfiguration.java
mobile/android/base/java/org/mozilla/gecko/restrictions/RestrictionProvider.java
mobile/android/base/java/org/mozilla/gecko/restrictions/Restrictions.java
mobile/android/base/moz.build
mobile/android/geckoview/src/main/java/org/mozilla/gecko/restrictions/DefaultConfiguration.java
mobile/android/geckoview/src/main/java/org/mozilla/gecko/restrictions/GuestProfileConfiguration.java
mobile/android/geckoview/src/main/java/org/mozilla/gecko/restrictions/Restrictable.java
mobile/android/geckoview/src/main/java/org/mozilla/gecko/restrictions/RestrictedProfileConfiguration.java
mobile/android/geckoview/src/main/java/org/mozilla/gecko/restrictions/RestrictionCache.java
mobile/android/geckoview/src/main/java/org/mozilla/gecko/restrictions/RestrictionConfiguration.java
mobile/android/geckoview/src/main/java/org/mozilla/gecko/restrictions/RestrictionProvider.java
mobile/android/geckoview/src/main/java/org/mozilla/gecko/restrictions/Restrictions.java
rename from mobile/android/geckoview/src/main/java/org/mozilla/gecko/restrictions/DefaultConfiguration.java
rename to mobile/android/base/java/org/mozilla/gecko/restrictions/DefaultConfiguration.java
rename from mobile/android/geckoview/src/main/java/org/mozilla/gecko/restrictions/GuestProfileConfiguration.java
rename to mobile/android/base/java/org/mozilla/gecko/restrictions/GuestProfileConfiguration.java
rename from mobile/android/geckoview/src/main/java/org/mozilla/gecko/restrictions/Restrictable.java
rename to mobile/android/base/java/org/mozilla/gecko/restrictions/Restrictable.java
rename from mobile/android/geckoview/src/main/java/org/mozilla/gecko/restrictions/RestrictedProfileConfiguration.java
rename to mobile/android/base/java/org/mozilla/gecko/restrictions/RestrictedProfileConfiguration.java
rename from mobile/android/geckoview/src/main/java/org/mozilla/gecko/restrictions/RestrictionCache.java
rename to mobile/android/base/java/org/mozilla/gecko/restrictions/RestrictionCache.java
rename from mobile/android/geckoview/src/main/java/org/mozilla/gecko/restrictions/RestrictionConfiguration.java
rename to mobile/android/base/java/org/mozilla/gecko/restrictions/RestrictionConfiguration.java
rename from mobile/android/geckoview/src/main/java/org/mozilla/gecko/restrictions/RestrictionProvider.java
rename to mobile/android/base/java/org/mozilla/gecko/restrictions/RestrictionProvider.java
rename from mobile/android/geckoview/src/main/java/org/mozilla/gecko/restrictions/Restrictions.java
rename to mobile/android/base/java/org/mozilla/gecko/restrictions/Restrictions.java
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/restrictions/Restrictions.java
+++ b/mobile/android/base/java/org/mozilla/gecko/restrictions/Restrictions.java
@@ -10,22 +10,16 @@ import android.content.Context;
 import android.os.Build;
 import android.util.Log;
 
 import org.mozilla.gecko.AppConstants.Versions;
 import org.mozilla.gecko.GeckoAppShell;
 import org.mozilla.gecko.GeckoProfile;
 import org.mozilla.gecko.annotation.RobocopTarget;
 import org.mozilla.gecko.annotation.WrapForJNI;
-import org.mozilla.gecko.restrictions.DefaultConfiguration;
-import org.mozilla.gecko.restrictions.GuestProfileConfiguration;
-import org.mozilla.gecko.restrictions.Restrictable;
-import org.mozilla.gecko.restrictions.RestrictedProfileConfiguration;
-import org.mozilla.gecko.restrictions.RestrictionCache;
-import org.mozilla.gecko.restrictions.RestrictionConfiguration;
 
 @RobocopTarget
 public class Restrictions {
     private static final String LOGTAG = "GeckoRestrictedProfiles";
 
     private static RestrictionConfiguration configuration;
 
     private static RestrictionConfiguration getConfiguration(Context context) {
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -271,24 +271,16 @@ geckoview_java_files = [
     'notifications/NotificationReceiver.java',
     'notifications/NotificationService.java',
     'notifications/ServiceNotificationClient.java',
     'NSSBridge.java',
     'permissions/PermissionBlock.java',
     'permissions/Permissions.java',
     'permissions/PermissionsHelper.java',
     'PrefsHelper.java',
-    'restrictions/DefaultConfiguration.java',
-    'restrictions/GuestProfileConfiguration.java',
-    'restrictions/Restrictable.java',
-    'restrictions/RestrictedProfileConfiguration.java',
-    'restrictions/RestrictionCache.java',
-    'restrictions/RestrictionConfiguration.java',
-    'restrictions/RestrictionProvider.java',
-    'restrictions/Restrictions.java',
     'SmsManager.java',
     'sqlite/ByteBufferInputStream.java',
     'sqlite/MatrixBlobCursor.java',
     'sqlite/SQLiteBridge.java',
     'sqlite/SQLiteBridgeException.java',
     'TouchEventInterceptor.java',
     'widget/SwipeDismissListViewTouchListener.java',
 ]
@@ -612,16 +604,24 @@ gbjar.sources += ['java/org/mozilla/geck
     'prompts/PromptListItem.java',
     'prompts/PromptService.java',
     'prompts/TabInput.java',
     'reader/ReaderModeUtils.java',
     'reader/ReadingListHelper.java',
     'reader/SavedReaderViewHelper.java',
     'RemoteClientsDialogFragment.java',
     'Restarter.java',
+    'restrictions/DefaultConfiguration.java',
+    'restrictions/GuestProfileConfiguration.java',
+    'restrictions/Restrictable.java',
+    'restrictions/RestrictedProfileConfiguration.java',
+    'restrictions/RestrictionCache.java',
+    'restrictions/RestrictionConfiguration.java',
+    'restrictions/RestrictionProvider.java',
+    'restrictions/Restrictions.java',
     'ScreenshotObserver.java',
     'search/SearchEngine.java',
     'search/SearchEngineManager.java',
     'SessionParser.java',
     'SharedPreferencesHelper.java',
     'SiteIdentity.java',
     'SnackbarBuilder.java',
     'SuggestClient.java',