Partial revert of r9936.

talk/app/webrtc/java/android/org/webrtc/EglBase.java

 /*
  * libjingle
  * Copyright 2015 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 14 matching lines @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 package org.webrtc;
 
 import android.opengl.EGL14;
 import android.opengl.EGLConfig;
 import android.opengl.EGLContext;
 import android.opengl.EGLDisplay;
 import android.opengl.EGLSurface;
+import android.util.Log;
 import android.view.Surface;
 
-import org.webrtc.Logging;
-
 /**
  * Holds EGL state and utility methods for handling an EGLContext, an EGLDisplay, and an EGLSurface.
  */
 public final class EglBase {
   private static final String TAG = "EglBase";
   private static final int EGL14_SDK_VERSION = android.os.Build.VERSION_CODES.JELLY_BEAN_MR1;
   private static final int CURRENT_SDK_VERSION = android.os.Build.VERSION.SDK_INT;
   // Android-specific extension.
   private static final int EGL_RECORDABLE_ANDROID = 0x3142;
 
   private EGLContext eglContext;
   private ConfigType configType;
   private EGLConfig eglConfig;
   private EGLDisplay eglDisplay;
   private EGLSurface eglSurface = EGL14.EGL_NO_SURFACE;
 
   public static boolean isEGL14Supported() {
-    Logging.d(TAG, "SDK version: " + CURRENT_SDK_VERSION);
+    Log.d(TAG, "SDK version: " + CURRENT_SDK_VERSION);
     return (CURRENT_SDK_VERSION >= EGL14_SDK_VERSION);
   }
 
   // EGLConfig constructor type. Influences eglChooseConfig arguments.
   public static enum ConfigType {
     // No special parameters.
     PLAIN,
     // Configures with EGL_SURFACE_TYPE = EGL_PBUFFER_BIT.
     PIXEL_BUFFER,
     // Configures with EGL_RECORDABLE_ANDROID = 1.
@@ skipping 13 matching lines @@
     this.configType = configType;
     eglDisplay = getEglDisplay();
     eglConfig = getEglConfig(eglDisplay, configType);
     eglContext = createEglContext(sharedContext, eglDisplay, eglConfig);
   }
 
   // Create EGLSurface from the Android Surface.
   public void createSurface(Surface surface) {
     checkIsNotReleased();
     if (configType == ConfigType.PIXEL_BUFFER) {
-      Logging.w(TAG, "This EGL context is configured for PIXEL_BUFFER, but uses regular Surface");
+      Log.w(TAG, "This EGL context is configured for PIXEL_BUFFER, but uses regular Surface");
     }
     if (eglSurface != EGL14.EGL_NO_SURFACE) {
       throw new RuntimeException("Already has an EGLSurface");
     }
     int[] surfaceAttribs = {EGL14.EGL_NONE};
     eglSurface = EGL14.eglCreateWindowSurface(eglDisplay, eglConfig, surface, surfaceAttribs, 0);
     if (eglSurface == EGL14.EGL_NO_SURFACE) {
       throw new RuntimeException("Failed to create window surface");
     }
   }
@@ skipping 146 matching lines @@
       EGLContext sharedContext, EGLDisplay eglDisplay, EGLConfig eglConfig) {
     int[] contextAttributes = {EGL14.EGL_CONTEXT_CLIENT_VERSION, 2, EGL14.EGL_NONE};
     EGLContext eglContext =
         EGL14.eglCreateContext(eglDisplay, eglConfig, sharedContext, contextAttributes, 0);
     if (eglContext == EGL14.EGL_NO_CONTEXT) {
       throw new RuntimeException("Failed to create EGL context");
     }
     return eglContext;
   }
 }