Android: Moves isPrintingSupported method to ApiCompatibilityUtils

PrintingControllerImpl uses new KitKat APIs, so it causes problems with ICS bots. BUG=321751 Review URL: https://codereview.chromium.org/83263003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236773 0039d316-1c4b-4281-b951-d872f2087c98
280723148 · Nov 22, 2013 · b8257e6 · b8257e6
1 parent 3b88087
commit b8257e6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java b/base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java
@@ -34,6 +34,13 @@ public static boolean isLayoutRtl(View view) {
         }
     }
 
+    /**
+     * @return True if the running version of the Android supports printing.
+     */
+    public static boolean isPrintingSupported() {
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
+    }
+
     /**
      * @see android.view.View#setLayoutDirection(int)
      */

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/printing/PrintingControllerFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/printing/PrintingControllerFactory.java
@@ -8,6 +8,7 @@
 import android.content.Context;
 import android.print.PrintManager;
 
+import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.chrome.R;
 import org.chromium.printing.PrintManagerDelegateImpl;
 import org.chromium.printing.PrintingController;
@@ -20,7 +21,7 @@
  */
 public class PrintingControllerFactory {
     public static PrintingController create(Activity activity) {
-        if (PrintingControllerImpl.isPrintingSupported()) {
+        if (ApiCompatibilityUtils.isPrintingSupported()) {
             String defaultJobTitle = activity.getResources().getString(R.string.menu_print);
             TabPrinter.setDefaultTitle(defaultJobTitle);
 

diff --git a/printing/android/java/src/org/chromium/printing/PrintingControllerImpl.java b/printing/android/java/src/org/chromium/printing/PrintingControllerImpl.java
@@ -6,8 +6,6 @@
 
 import org.chromium.base.ThreadUtils;
 
-import android.annotation.SuppressLint;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.CancellationSignal;
 import android.os.ParcelFileDescriptor;
@@ -126,14 +124,6 @@ public static PrintingController getInstance() {
         return sInstance;
     }
 
-    /**
-     * @return True if the running version of the Android supports printing.
-     */
-    @SuppressLint("InlinedApi")
-    public static boolean isPrintingSupported() {
-        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
-    }
-
     @Override
     public boolean hasPrintingFinished() {
       return mPrintingState == PRINTING_STATE_FINISHED;