Remove NewApi lint suppression.

webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java

 /*
  *  Copyright 2015 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 268 matching lines @@
 
     boolean loopback = intent.getBooleanExtra(EXTRA_LOOPBACK, false);
     boolean tracing = intent.getBooleanExtra(EXTRA_TRACING, false);
 
     int videoWidth = intent.getIntExtra(EXTRA_VIDEO_WIDTH, 0);
     int videoHeight = intent.getIntExtra(EXTRA_VIDEO_HEIGHT, 0);
 
     screencaptureEnabled = intent.getBooleanExtra(EXTRA_SCREENCAPTURE, false);
     // If capturing format is not specified for screencapture, use screen resolution.
     if (screencaptureEnabled && videoWidth == 0 && videoHeight == 0) {
-      DisplayMetrics displayMetrics = new DisplayMetrics();
-      WindowManager windowManager =
-          (WindowManager) getApplication().getSystemService(Context.WINDOW_SERVICE);
-      windowManager.getDefaultDisplay().getRealMetrics(displayMetrics);
+      DisplayMetrics displayMetrics = getDisplayMetrics();
       videoWidth = displayMetrics.widthPixels;
       videoHeight = displayMetrics.heightPixels;
     }
     DataChannelParameters dataChannelParameters = null;
     if (intent.getBooleanExtra(EXTRA_DATA_CHANNEL_ENABLED, false)) {
       dataChannelParameters = new DataChannelParameters(intent.getBooleanExtra(EXTRA_ORDERED, true),
           intent.getIntExtra(EXTRA_MAX_RETRANSMITS_MS, -1),
           intent.getIntExtra(EXTRA_MAX_RETRANSMITS, -1), intent.getStringExtra(EXTRA_PROTOCOL),
           intent.getBooleanExtra(EXTRA_NEGOTIATED, false), intent.getIntExtra(EXTRA_ID, -1));
     }
@@ skipping 59 matching lines @@
     peerConnectionClient.createPeerConnectionFactory(
         getApplicationContext(), peerConnectionParameters, CallActivity.this);
 
     if (screencaptureEnabled) {
       startScreenCapture();
     } else {
       startCall();
     }
   }
 
+  @TargetApi(17)
+  private DisplayMetrics getDisplayMetrics() {
+    DisplayMetrics displayMetrics = new DisplayMetrics();
+    WindowManager windowManager =
+        (WindowManager) getApplication().getSystemService(Context.WINDOW_SERVICE);
+    windowManager.getDefaultDisplay().getRealMetrics(displayMetrics);
+    return displayMetrics;
+  }
+
   @TargetApi(19)
   private static int getSystemUiVisibility() {
     int flags = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_FULLSCREEN;
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
       flags |= View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
     }
     return flags;
   }
 
   @TargetApi(21)
@@ skipping 47 matching lines @@
 
         if (videoCapturer != null) {
           return videoCapturer;
         }
       }
     }
 
     return null;
   }
 
+  @TargetApi(21)
+  private VideoCapturer createScreenCapturer() {
+    if (mediaProjectionPermissionResultCode != Activity.RESULT_OK) {
+      reportError("User didn't give permission to capture the screen.");
+      return null;
+    }
+    return new ScreenCapturerAndroid(
+        mediaProjectionPermissionResultData, new MediaProjection.Callback() {
+      @Override
+      public void onStop() {
+        reportError("User revoked permission to capture the screen.");
+      }
+    });
+  }
+
   // Activity interfaces
   @Override
   public void onStop() {
     super.onStop();
     activityRunning = false;
     // Don't stop the video when using screencapture to allow user to show other apps to the remote
     // end.
     if (peerConnectionClient != null && !screencaptureEnabled) {
       peerConnectionClient.stopVideoSource();
     }
@@ skipping 231 matching lines @@
     VideoCapturer videoCapturer = null;
     String videoFileAsCamera = getIntent().getStringExtra(EXTRA_VIDEO_FILE_AS_CAMERA);
     if (videoFileAsCamera != null) {
       try {
         videoCapturer = new FileVideoCapturer(videoFileAsCamera);
       } catch (IOException e) {
         reportError("Failed to open video file for emulated camera");
         return null;
       }
     } else if (screencaptureEnabled) {
-      if (mediaProjectionPermissionResultCode != Activity.RESULT_OK) {
-        reportError("User didn't give permission to capture the screen.");
-        return null;
-      }
-      return new ScreenCapturerAndroid(
-          mediaProjectionPermissionResultData, new MediaProjection.Callback() {
-            @Override
-            public void onStop() {
-              reportError("User revoked permission to capture the screen.");
-            }
-          });
+      return createScreenCapturer();
     } else if (useCamera2()) {
       if (!captureToTexture()) {
         reportError(getString(R.string.camera2_texture_only_error));
         return null;
       }
 
       Logging.d(TAG, "Creating capturer using camera2 API.");
       videoCapturer = createCameraCapturer(new Camera2Enumerator(this));
     } else {
       Logging.d(TAG, "Creating capturer using camera1 API.");
@@ skipping 207 matching lines @@
         }
       }
     });
   }
 
   @Override
   public void onPeerConnectionError(final String description) {
     reportError(description);
   }
 }