commit 136338e18ecfc99558689a01b95729fb05101e0c
author Brandon Maxwell <maxwelb@google.com> Wed Mar 16 00:31:01 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 16 00:31:01 2016 +0000
tree d9cac0a17faaaca87854302c1b961641aecdef35
parent 234f705cc0e0e3799939777e7cccf5d05dd44fb6
parent e1473ca3cafa69f9c51031a9cfeb1aebb6821d2c

Updating GreatWall to use modifiable flag am: 22375e147e
am: e1473ca3ca

* commit 'e1473ca3cafa69f9c51031a9cfeb1aebb6821d2c':
  Updating GreatWall to use modifiable flag

src/com/android/dialer/compat/FilteredNumberCompat.java

diff --git a/src/com/android/dialer/compat/FilteredNumberCompat.java b/src/com/android/dialer/compat/FilteredNumberCompat.java
index 2325047..08bf6c8 100644
--- a/src/com/android/dialer/compat/FilteredNumberCompat.java
+++ b/src/com/android/dialer/compat/FilteredNumberCompat.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-    package com.android.dialer.compat;
+package com.android.dialer.compat;
 
 import com.google.common.base.Preconditions;
 
@@ -43,6 +43,7 @@
 import com.android.dialer.filterednumber.BlockedNumbersMigrator;
 import com.android.dialer.filterednumber.BlockedNumbersSettingsActivity;
 import com.android.dialer.filterednumber.MigrateBlockedNumbersDialogFragment;
+import com.android.dialerbind.ObjectFactory;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -58,10 +59,6 @@
 
     protected static final String HAS_MIGRATED_TO_NEW_BLOCKING_KEY = "migratedToNewBlocking";
 
-    // Flag to enable feature.
-    // TODO(maxwelb) remove when ready to enable new filtering.
-    private static final boolean isNewFilteringEnabled = false;
-
     private static Boolean isEnabledForTest;
 
     /**
@@ -122,7 +119,8 @@
         if (isEnabledForTest != null) {
             return CompatUtils.isNCompatible() && isEnabledForTest;
         }
-        return CompatUtils.isNCompatible() && isNewFilteringEnabled;
+        return CompatUtils.isNCompatible() && ObjectFactory
+                .isNewBlockingEnabled(DialerApplication.getContext());
     }
 
     /**

src/com/android/dialerbind/ObjectFactory.java

diff --git a/src/com/android/dialerbind/ObjectFactory.java b/src/com/android/dialerbind/ObjectFactory.java
index 9f75e39..875a893 100644
--- a/src/com/android/dialerbind/ObjectFactory.java
+++ b/src/com/android/dialerbind/ObjectFactory.java
@@ -52,6 +52,11 @@
         return false;
     }
 
+    public static boolean isNewBlockingEnabled(Context context) {
+        // TODO(maxwelb) - Set to true when ready to enable feature
+        return false;
+    }
+
     @Nullable
     public static ExtendedBlockingButtonRenderer newExtendedBlockingButtonRenderer(
             Context context, ExtendedBlockingButtonRenderer.Listener listener) {