Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Fix new lint from android 14 upgrade, and remove it from the baseline #47817

Merged
auto-submit merged 15 commits into from
Nov 29, 2023
Merged

Fix new lint from android 14 upgrade, and remove it from the baseline #47817

Changes from 3 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
949afed
fix lint regarding unclosed file descriptor
Nov 8, 2023
01b30bf
format
Nov 8, 2023
c14d853
add missing import
Nov 8, 2023
5c838eb
still return charsequence if we fail to close fd
Nov 8, 2023
c511083
Merge branch 'main' into fix_api34_lint
gmackall Nov 8, 2023
c08f1d3
add a test that we still succeed when the file descriptor fails to close
Nov 8, 2023
2d00337
format
Nov 8, 2023
03005ca
Merge remote-tracking branch 'refs/remotes/origin/fix_api34_lint' int…
Nov 8, 2023
bb17dae
fix test?
Nov 8, 2023
74b140f
wip
Nov 9, 2023
f37ab97
Merge branch 'flutter:main' into fix_api34_lint
gmackall Nov 28, 2023
f24c791
Merge remote-tracking branch 'refs/remotes/origin/fix_api34_lint' int…
Nov 28, 2023
3ad12e9
actually make the test work for real this time
Nov 28, 2023
e80a7f2
format
Nov 28, 2023
3580c7b
remove the lint from the baseline, as it is fixed
Nov 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import android.content.ClipDescription;
import android.content.ClipboardManager;
import android.content.Context;
import android.content.res.AssetFileDescriptor;
import android.os.Build;
import android.view.HapticFeedbackConstants;
import android.view.SoundEffectConstants;
Expand All @@ -25,6 +26,7 @@
import io.flutter.Log;
import io.flutter.embedding.engine.systemchannels.PlatformChannel;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.List;

/** Android implementation of the platform plugin. */
Expand Down Expand Up @@ -517,9 +519,15 @@ private CharSequence getClipboardData(PlatformChannel.ClipboardContentFormat for
if (clip == null) return null;
if (format == null || format == PlatformChannel.ClipboardContentFormat.PLAIN_TEXT) {
ClipData.Item item = clip.getItemAt(0);
AssetFileDescriptor assetFileDescriptor = null;
if (item.getUri() != null)
activity.getContentResolver().openTypedAssetFileDescriptor(item.getUri(), "text/*", null);
return item.coerceToText(activity);
assetFileDescriptor =
activity
.getContentResolver()
.openTypedAssetFileDescriptor(item.getUri(), "text/*", null);
CharSequence charSequence = item.coerceToText(activity);
if (assetFileDescriptor != null) assetFileDescriptor.close();
return charSequence;
}
} catch (SecurityException e) {
Log.w(
Expand All @@ -531,6 +539,9 @@ private CharSequence getClipboardData(PlatformChannel.ClipboardContentFormat for
return null;
} catch (FileNotFoundException e) {
return null;
} catch (IOException e) {
Log.w(TAG, "Failed to close AssetFileDescriptor while accessing clipboard data.", e);
return null;
}

return null;
Expand Down