[android] Fix deprecation warning in DeviceDisplayInfo.

Starting with Android JB MR1 Display#getPixelFormat() has been deprecated
because they only support RGBA_8888.

NOTRY=true

Review URL: https://chromiumcodereview.appspot.com/14271003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194823 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 14 insertions, 2 deletions

diff --git a/ui/android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java b/ui/android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java
index 61fc018..b133931 100644
--- a/ui/android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java
+++ b/ui/android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java
@@ -6,6 +6,7 @@ package org.chromium.ui.gfx;
 
 import android.content.Context;
 import android.graphics.PixelFormat;
+import android.os.Build;
 import android.telephony.TelephonyManager;
 import android.util.DisplayMetrics;
 import android.view.Display;
@@ -47,22 +48,33 @@ public class DeviceDisplayInfo {
       return getMetrics().widthPixels;
   }
 
+  @SuppressWarnings("deprecation")
+  private int getPixelFormat() {
+      if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1) {
+          return getDisplay().getPixelFormat();
+      }
+      // JellyBean MR1 and later always uses RGBA_8888.
+      return PixelFormat.RGBA_8888;
+  }
+
   /**
    * @return Bits per pixel.
    */
   @CalledByNative
   public int getBitsPerPixel() {
+      int format = getPixelFormat();
       PixelFormat info = new PixelFormat();
-      PixelFormat.getPixelFormatInfo(getDisplay().getPixelFormat(), info);
+      PixelFormat.getPixelFormatInfo(format, info);
       return info.bitsPerPixel;
   }
 
   /**
    * @return Bits per component.
    */
+  @SuppressWarnings("deprecation")
   @CalledByNative
   public int getBitsPerComponent() {
-      int format = getDisplay().getPixelFormat();
+      int format = getPixelFormat();
       switch (format) {
       case PixelFormat.RGBA_4444:
           return 4;