Commit 3ac458d5 authored by Nate Fischer's avatar Nate Fischer Committed by Chromium LUCI CQ

Android: inline deprecated BuildInfo methods (/components/browser_ui/share)

No change to logic. This inlines BuildInfo.isAtLeast{Q,R} and
BuildInfo.targetsAtLeast{Q,R} (and their C++ equivalents) in
/components/browser_ui/share.

The methods themselves will be removed in a follow-up CL once all call
sites have been removed.

This CL was uploaded by git cl split.

R=sebsg@chromium.org

Bug: 1106920
Test: autoninja -C out/Default monochrome_public_apk
Change-Id: Ib051ef18efe0d07dfdf5361537d038d95d3dea3a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2575331
Auto-Submit: Nate Fischer <ntfschr@chromium.org>
Reviewed-by: default avatarsebsg <sebsg@chromium.org>
Commit-Queue: sebsg <sebsg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#833896}
parent c9fa1084
...@@ -11,6 +11,7 @@ import android.content.ContentValues; ...@@ -11,6 +11,7 @@ import android.content.ContentValues;
import android.content.Context; import android.content.Context;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.net.Uri; import android.net.Uri;
import android.os.Build;
import android.os.Environment; import android.os.Environment;
import android.provider.MediaStore; import android.provider.MediaStore;
import android.text.TextUtils; import android.text.TextUtils;
...@@ -19,7 +20,6 @@ import androidx.annotation.VisibleForTesting; ...@@ -19,7 +20,6 @@ import androidx.annotation.VisibleForTesting;
import org.chromium.base.ApplicationState; import org.chromium.base.ApplicationState;
import org.chromium.base.ApplicationStatus; import org.chromium.base.ApplicationStatus;
import org.chromium.base.BuildInfo;
import org.chromium.base.Callback; import org.chromium.base.Callback;
import org.chromium.base.ContentUriUtils; import org.chromium.base.ContentUriUtils;
import org.chromium.base.ContextUtils; import org.chromium.base.ContextUtils;
...@@ -258,7 +258,7 @@ public class ShareImageFileUtils { ...@@ -258,7 +258,7 @@ public class ShareImageFileUtils {
Uri uri = null; Uri uri = null;
if (!isTemporary) { if (!isTemporary) {
if (BuildInfo.isAtLeastQ()) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
uri = addToMediaStore(destFile); uri = addToMediaStore(destFile);
} else { } else {
long downloadId = addCompletedDownload(destFile); long downloadId = addCompletedDownload(destFile);
...@@ -386,7 +386,7 @@ public class ShareImageFileUtils { ...@@ -386,7 +386,7 @@ public class ShareImageFileUtils {
@TargetApi(29) @TargetApi(29)
public static Uri addToMediaStore(File file) { public static Uri addToMediaStore(File file) {
assert BuildInfo.isAtLeastQ(); assert Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q;
final ContentValues contentValues = new ContentValues(); final ContentValues contentValues = new ContentValues();
contentValues.put(MediaStore.MediaColumns.DISPLAY_NAME, file.getName()); contentValues.put(MediaStore.MediaColumns.DISPLAY_NAME, file.getName());
......
...@@ -14,6 +14,7 @@ import android.graphics.Bitmap; ...@@ -14,6 +14,7 @@ import android.graphics.Bitmap;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.Paint; import android.graphics.Paint;
import android.net.Uri; import android.net.Uri;
import android.os.Build;
import android.os.Environment; import android.os.Environment;
import android.os.Looper; import android.os.Looper;
import android.provider.MediaStore; import android.provider.MediaStore;
...@@ -25,7 +26,6 @@ import org.junit.Assert; ...@@ -25,7 +26,6 @@ import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.chromium.base.BuildInfo;
import org.chromium.base.Callback; import org.chromium.base.Callback;
import org.chromium.base.ContentUriUtils; import org.chromium.base.ContentUriUtils;
import org.chromium.base.ContextUtils; import org.chromium.base.ContextUtils;
...@@ -155,7 +155,7 @@ public class ShareImageFileUtilsTest extends DummyUiActivityTestCase { ...@@ -155,7 +155,7 @@ public class ShareImageFileUtilsTest extends DummyUiActivityTestCase {
private void deleteAllTestImages() throws TimeoutException { private void deleteAllTestImages() throws TimeoutException {
AsyncTask.SERIAL_EXECUTOR.execute(() -> { AsyncTask.SERIAL_EXECUTOR.execute(() -> {
if (BuildInfo.isAtLeastQ()) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
deleteMediaStoreFiles(); deleteMediaStoreFiles();
} }
deleteExternalStorageFiles(); deleteExternalStorageFiles();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment