Fix TODOs related to SDK 24

android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package com.android.webview.chromium;
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.Intent;
@@ skipping 1677 matching lines @@
                 @Override
                 public void run() {
                     mAwContents.setLayoutParams(layoutParams);
                 }
             });
             return;
         }
         mAwContents.setLayoutParams(layoutParams);
     }
 
-    // Overrides WebViewProvider.ViewDelegate.onActivityResult (not in system api jar yet).
-    // crbug.com/543272.
+    @Override
     public void onActivityResult(final int requestCode, final int resultCode, final Intent data) {
         if (checkNeedsPost()) {
             mFactory.addTask(new Runnable() {
                 @Override
                 public void run() {
                     onActivityResult(requestCode, resultCode, data);
                 }
             });
             return;
         }
@@ skipping 13 matching lines @@
                 @Override
                 public void run() {
                     onConfigurationChanged(newConfig);
                 }
             });
             return;
         }
         mAwContents.onConfigurationChanged(newConfig);
     }
 
-    //TODO(hush): add override after release.
-    //@Override
+    @Override
     public boolean onDragEvent(final DragEvent event) {
         mFactory.startYourEngines(false);
         if (checkNeedsPost()) {
             boolean ret = mFactory.runOnUiThreadBlocking(new Callable<Boolean>() {
                 @Override
                 public Boolean call() {
                     return onDragEvent(event);
                 }
             });
             return ret;
@@ skipping 461 matching lines @@
             // Intentional no-op
         }
 
         @Override
         public int super_getScrollBarStyle() {
             return mWebViewPrivate.super_getScrollBarStyle();
         }
 
         @Override
         public void super_startActivityForResult(Intent intent, int requestCode) {
-            // TODO(hush): Use mWebViewPrivate.super_startActivityForResult
-            // after N release. crbug.com/543272.
-            try {
-                Method startActivityForResultMethod =
-                        View.class.getMethod("startActivityForResult", Intent.class, int.class);
-                startActivityForResultMethod.invoke(mWebView, intent, requestCode);
-            } catch (Exception e) {
-                throw new RuntimeException("Invalid reflection", e);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                mWebViewPrivate.super_startActivityForResult(intent, requestCode);
+            } else {
+                try {
+                    Method startActivityForResultMethod =
+                            View.class.getMethod("startActivityForResult", Intent.class, int.class);
+                    startActivityForResultMethod.invoke(mWebView, intent, requestCode);
+                } catch (Exception e) {
+                    throw new RuntimeException("Invalid reflection", e);
+                }
             }
         }
 
         @Override
         public boolean awakenScrollBars() {
             mWebViewPrivate.awakenScrollBars(0);
             // TODO: modify the WebView.PrivateAccess to provide a return value.
             return true;
         }
 
@@ skipping 39 matching lines @@
         mAwContents.extractSmartClipData(x, y, width, height);
     }
 
     // Implements SmartClipProvider
     @Override
     public void setSmartClipResultHandler(final Handler resultHandler) {
         checkThread();
         mAwContents.setSmartClipResultHandler(resultHandler);
     }
 }