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

Commit 7f943ba

Browse files
committed
Remove unused parameter.
1 parent 3b26a42 commit 7f943ba

File tree

3 files changed

+0
-31
lines changed

3 files changed

+0
-31
lines changed

shell/platform/android/io/flutter/embedding/engine/loader/ApplicationInfoLoader.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import android.content.pm.PackageManager;
1010
import android.content.res.XmlResourceParser;
1111
import android.os.Bundle;
12-
import android.security.NetworkSecurityPolicy;
1312
import androidx.annotation.NonNull;
1413
import java.io.IOException;
1514
import org.json.JSONArray;
@@ -146,20 +145,13 @@ private static void parseDomain(
146145
@NonNull
147146
public static FlutterApplicationInfo load(@NonNull Context applicationContext) {
148147
ApplicationInfo appInfo = getApplicationInfo(applicationContext);
149-
// Prior to API 23, cleartext traffic is allowed.
150-
boolean clearTextPermitted = true;
151-
if (android.os.Build.VERSION.SDK_INT >= 23) {
152-
clearTextPermitted = NetworkSecurityPolicy.getInstance().isCleartextTrafficPermitted();
153-
}
154-
155148
return new FlutterApplicationInfo(
156149
getString(appInfo.metaData, PUBLIC_AOT_SHARED_LIBRARY_NAME),
157150
getString(appInfo.metaData, PUBLIC_VM_SNAPSHOT_DATA_KEY),
158151
getString(appInfo.metaData, PUBLIC_ISOLATE_SNAPSHOT_DATA_KEY),
159152
getString(appInfo.metaData, PUBLIC_FLUTTER_ASSETS_DIR_KEY),
160153
getNetworkPolicy(appInfo, applicationContext),
161154
appInfo.nativeLibraryDir,
162-
clearTextPermitted,
163155
getBoolean(appInfo.metaData, PUBLIC_AUTOMATICALLY_REGISTER_PLUGINS_METADATA_KEY, true));
164156
}
165157
}

shell/platform/android/io/flutter/embedding/engine/loader/FlutterApplicationInfo.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ public final class FlutterApplicationInfo {
1717
public final String flutterAssetsDir;
1818
public final String domainNetworkPolicy;
1919
public final String nativeLibraryDir;
20-
public final boolean clearTextPermitted;
2120
final boolean automaticallyRegisterPlugins;
2221

2322
public FlutterApplicationInfo(
@@ -27,7 +26,6 @@ public FlutterApplicationInfo(
2726
String flutterAssetsDir,
2827
String domainNetworkPolicy,
2928
String nativeLibraryDir,
30-
boolean clearTextPermitted,
3129
boolean automaticallyRegisterPlugins) {
3230
this.aotSharedLibraryName =
3331
aotSharedLibraryName == null ? DEFAULT_AOT_SHARED_LIBRARY_NAME : aotSharedLibraryName;
@@ -38,7 +36,6 @@ public FlutterApplicationInfo(
3836
flutterAssetsDir == null ? DEFAULT_FLUTTER_ASSETS_DIR : flutterAssetsDir;
3937
this.nativeLibraryDir = nativeLibraryDir;
4038
this.domainNetworkPolicy = domainNetworkPolicy == null ? "" : domainNetworkPolicy;
41-
this.clearTextPermitted = clearTextPermitted;
4239
this.automaticallyRegisterPlugins = automaticallyRegisterPlugins;
4340
}
4441
}

shell/platform/android/test/io/flutter/embedding/engine/loader/ApplicationInfoLoaderTest.java

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,13 @@
1919
import android.content.res.Resources;
2020
import android.content.res.XmlResourceParser;
2121
import android.os.Bundle;
22-
import android.security.NetworkSecurityPolicy;
2322
import java.io.StringReader;
2423
import org.junit.Test;
2524
import org.junit.runner.RunWith;
2625
import org.mockito.stubbing.Answer;
2726
import org.robolectric.RobolectricTestRunner;
2827
import org.robolectric.RuntimeEnvironment;
2928
import org.robolectric.annotation.Config;
30-
import org.robolectric.annotation.Implementation;
31-
import org.robolectric.annotation.Implements;
3229
import org.xmlpull.v1.XmlPullParser;
3330
import org.xmlpull.v1.XmlPullParserFactory;
3431

@@ -46,23 +43,6 @@ public void itGeneratesCorrectApplicationInfoWithDefaultManifest() {
4643
assertEquals("flutter_assets", info.flutterAssetsDir);
4744
assertEquals("", info.domainNetworkPolicy);
4845
assertNull(info.nativeLibraryDir);
49-
assertEquals(true, info.clearTextPermitted);
50-
}
51-
52-
@Config(shadows = {ApplicationInfoLoaderTest.ShadowNetworkSecurityPolicy.class})
53-
@Test
54-
public void itVotesAgainstClearTextIfSecurityPolicySaysSo() {
55-
FlutterApplicationInfo info = ApplicationInfoLoader.load(RuntimeEnvironment.application);
56-
assertNotNull(info);
57-
assertEquals(false, info.clearTextPermitted);
58-
}
59-
60-
@Implements(NetworkSecurityPolicy.class)
61-
public static class ShadowNetworkSecurityPolicy {
62-
@Implementation
63-
public boolean isCleartextTrafficPermitted() {
64-
return false;
65-
}
6646
}
6747

6848
private Context generateMockContext(Bundle metadata, String networkPolicyXml) throws Exception {

0 commit comments

Comments
 (0)