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

Commit 18f3747d authored by Yi-an Chen's avatar Yi-an Chen
Browse files

Migrate permission flags for base to be exported flags 

Bug: 336313566
Test: All existing automation tests
Change-Id: Ia057172bba96397a8cdeedb80562b0ce6d948934
parent 0e05178d

AconfigFlags.bp

+11 −3
Original line number Diff line number Diff line
@@ -685,15 +685,17 @@ java_aconfig_library { 
// Permissions

aconfig_declarations {

    name: "android.permission.flags-aconfig",

    package: "android.permission.flags",

    container: "system",

    package: "android.permission.flags",

    exportable: true,

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

}



java_aconfig_library {

    name: "android.permission.flags-aconfig-java",

    name: "android.permission.flags-aconfig-java-export",

    aconfig_declarations: "android.permission.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

    mode: "exported",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",
@@ -708,9 +710,15 @@ java_aconfig_library { 
    host_supported: true,

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

    min_sdk_version: "30",

}



java_aconfig_library {

    name: "android.permission.flags-aconfig-java",

    aconfig_declarations: "android.permission.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",

        "com.android.permission",

        "com.android.nfcservices",

    ],

}

core/java/android/permission/flags.aconfig

+65 −61
Original line number Diff line number Diff line
@@ -101,29 +101,32 @@ flag { 


flag {

    name: "sensitive_notification_app_protection"

    is_exported: true

    # Referenced in WM where WM starts before DeviceConfig

    is_fixed_read_only: true

    namespace: "permissions"

    description: "This flag controls the sensitive notification app protections while screen sharing"

    bug: "312784351"

  # Referenced in WM where WM starts before DeviceConfig

  is_fixed_read_only: true

}



flag {

    name: "sensitive_content_improvements"

    # Referenced in WM where WM starts before DeviceConfig

    is_fixed_read_only: true

    namespace: "permissions"

    description: "Improvements to sensitive content/notification features, such as the Toast UX."

    bug: "301960090"

  # Referenced in WM where WM starts before DeviceConfig

  is_fixed_read_only: true



}



flag {

    name: "sensitive_content_metrics_bugfix"

    # Referenced in WM where WM starts before DeviceConfig

    is_fixed_read_only: true

    namespace: "permissions"

    description: "Enables metrics bugfixes for sensitive content/notification features"

    bug: "312784351"

  # Referenced in WM where WM starts before DeviceConfig

  is_fixed_read_only: true



    metadata {

        purpose: PURPOSE_BUGFIX

    }
@@ -131,11 +134,11 @@ flag { 


flag {

    name: "sensitive_content_recents_screenshot_bugfix"

    # Referenced in WM where WM starts before DeviceConfig

    is_fixed_read_only: true

    namespace: "permissions"

    description: "Enables recents screenshot bugfixes for sensitive content/notification features"

    bug: "312784351"

  # Referenced in WM where WM starts before DeviceConfig

  is_fixed_read_only: true

    metadata {

        purpose: PURPOSE_BUGFIX

    }
@@ -143,6 +146,7 @@ flag { 


flag {

    name: "device_aware_permissions_enabled"

    is_exported: true

    is_fixed_read_only: true

    namespace: "permissions"

    description: "When the flag is off no permissions can be device aware"