Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28cd0e84 authored by Motomu Utsumi's avatar Motomu Utsumi Committed by Automerger Merge Worker
Browse files

Merge "Use flags.aconfig in platform for android networking" into main am:... 

Merge "Use flags.aconfig in platform for android networking" into main am: a62f09d2 am: 0000f3eb

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2861288



Change-Id: Ic099fa45aa8192f503f1f68c546589e904efbec3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ec49ce94 0000f3eb

AconfigFlags.bp

+7 −1
Original line number Diff line number Diff line
@@ -203,7 +203,13 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// CoreNetworking

// Networking

aconfig_declarations {

    name: "com.android.net.flags-aconfig",

    package: "com.android.net.flags",

    srcs: ["core/java/android/net/flags.aconfig"],

}



java_aconfig_library {

    name: "com.android.net.flags-aconfig-java",

    aconfig_declarations: "com.android.net.flags-aconfig",

core/java/android/net/flags.aconfig

0 → 100644
+50 −0
Original line number Diff line number Diff line 
package: "com.android.net.flags"



flag {

  name: "track_multiple_network_activities"

  namespace: "android_core_networking"

  description: "NetworkActivityTracker tracks multiple networks including non default networks"

  bug: "267870186"

}



flag {

  name: "forbidden_capability"

  namespace: "android_core_networking"

  description: "This flag controls the forbidden capability API"

  bug: "302997505"

}



flag {

  name: "set_data_saver_via_cm"

  namespace: "android_core_networking"

  description: "Set data saver through ConnectivityManager API"

  bug: "297836825"

}



flag {

  name: "support_is_uid_networking_blocked"

  namespace: "android_core_networking"

  description: "This flag controls whether isUidNetworkingBlocked is supported"

  bug: "297836825"

}



flag {

  name: "basic_background_restrictions_enabled"

  namespace: "android_core_networking"

  description: "Block network access for apps in a low importance background state"

  bug: "304347838"

}



flag {

  name: "register_nsd_offload_engine"

  namespace: "android_core_networking"

  description: "The flag controls the access for registerOffloadEngine API in NsdManager"

  bug: "294777050"

}



flag {

  name: "ipsec_transform_state"

  namespace: "android_core_networking_ipsec"

  description: "The flag controls the access for getIpSecTransformState and IpSecTransformState"

  bug: "308011229"

}