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

Commit 3733fc2b authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12399304 from 49cce06b to 25Q2-release 

Change-Id: I1de516bb4d254257580426f686e48195206c838e
parents 096f15ed 49cce06b

ACTIVITY_MANAGER_OWNERS

0 → 100644
+4 −0
Original line number Diff line number Diff line 
mwachens@google.com

sudheersai@google.com

varunshah@google.com

yamasani@google.com

AconfigFlags.bp

+8 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ aconfig_declarations_group { 
        "com.android.media.flags.performance-aconfig-java",

        "com.android.media.flags.projection-aconfig-java",

        "com.android.net.thread.platform.flags-aconfig-java",

        "com.android.ranging.flags.ranging-aconfig-java",

        "com.android.server.contextualsearch.flags-java",

        "com.android.server.flags.services-aconfig-java",

        "com.android.text.flags-aconfig-java",
@@ -1549,6 +1550,13 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Ranging

java_aconfig_library {

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

    aconfig_declarations: "ranging_aconfig_flags",

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

}



// System Server

aconfig_declarations {

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

BATTERY_STATS_OWNERS

+0 −1
Original line number Diff line number Diff line 
# OWNERS of BatteryStats related files

bookatz@google.com

dplotnikov@google.com

mwachens@google.com

OOM_ADJUSTER_OWNERS

0 → 100644
+3 −0
Original line number Diff line number Diff line 
mwachens@google.com

dplotnikov@google.com

tyk@google.com

TEST_MAPPING

+18 −156
Original line number Diff line number Diff line 
{

  "presubmit-large": [

    {

      "name": "FrameworksServicesTests",

      "options": [

        {

          "include-annotation": "android.platform.test.annotations.Presubmit"

        },

        {

          "exclude-annotation": "androidx.test.filters.FlakyTest"

        },

        {

          "exclude-annotation": "org.junit.Ignore"

        }

      ]

      "name": "FrameworksServicesTests_Presubmit"

    }

  ],

  "presubmit-pm": [

    {

      "name": "PackageManagerServiceServerTests",

      "options": [

        {

          "include-annotation": "android.platform.test.annotations.Presubmit"

        },

        {

          "exclude-annotation": "androidx.test.filters.FlakyTest"

        },

        {

          "exclude-annotation": "org.junit.Ignore"

        }

      ]

      "name": "PackageManagerServiceServerTests_Presubmit"

    }

  ],

  "presubmit": [

    {

      "name": "ManagedProvisioningTests",

      "options": [

        {

          "exclude-annotation": "androidx.test.filters.FlakyTest"

        }

      ]

      "name": "ManagedProvisioningTests"

    },

    {

      "file_patterns": [
@@ -46,86 +19,28 @@ 
        "SystemServer\\.java",

        "services/tests/apexsystemservices/.*"

      ],

      "name": "ApexSystemServicesTestCases",

      "options": [

        {

          "exclude-annotation": "androidx.test.filters.FlakyTest"

        },

        {

          "exclude-annotation": "org.junit.Ignore"

        }

      ]

    },

    {

      "name": "FrameworksUiServicesTests",

      "options": [

        {

          "exclude-annotation": "androidx.test.filters.FlakyTest"

        }

      ]

    },

    {

      "name": "FrameworksInputMethodSystemServerTests",

      "options": [

        {"include-filter": "com.android.server.inputmethod"},

        {"exclude-annotation": "androidx.test.filters.FlakyTest"},

        {"exclude-annotation": "org.junit.Ignore"}

      ]

    },

    {

      "name": "ExtServicesUnitTests-tplus",

      "options": [

        {

          "exclude-annotation": "androidx.test.filters.FlakyTest"

        }

      ]

    },

    {

      "name": "ExtServicesUnitTests-sminus",

      "options": [

        {

          "exclude-annotation": "androidx.test.filters.FlakyTest"

        }

      ]

    },

    {

      "name": "FrameworksCoreTests",

      "options": [

        {

          "include-annotation": "android.platform.test.annotations.Presubmit"

      "name": "ApexSystemServicesTestCases"

    },

    {

          "exclude-annotation": "androidx.test.filters.FlakyTest"

      "name": "FrameworksUiServicesTests"

    },

    {

          "exclude-annotation": "org.junit.Ignore"

        }

      ]

      "name": "FrameworksInputMethodSystemServerTests_server_inputmethod"

    },

    {

      "name": "FrameworkPermissionTests",

      "options": [

        {

          "include-annotation": "android.platform.test.annotations.Presubmit"

      "name": "ExtServicesUnitTests-tplus"

    },

    {

          "exclude-annotation": "androidx.test.filters.FlakyTest"

      "name": "ExtServicesUnitTests-sminus"

    },

    {

          "exclude-annotation": "org.junit.Ignore"

        }

      ]

      "name": "FrameworksCoreTests_Presubmit"

    },

    {

      "name": "FrameworksInProcessTests",

      "options": [

        {

          "exclude-annotation": "androidx.test.filters.FlakyTest"

      "name": "FrameworkPermissionTests_Presubmit"

    },

    {

          "exclude-annotation": "org.junit.Ignore"

        }

      ]

      "name": "FrameworksInProcessTests"

    },

    {

      "name": "vts_treble_vintf_framework_test"
@@ -166,78 +81,25 @@ 
   // infra during the hardening phase.

   // TODO: this tag to be removed once the above is no longer an issue.

   {

     "name": "FrameworksUiServicesTests",

     "options": [

       {

         "exclude-annotation": "androidx.test.filters.FlakyTest"

       }

     ]

   },

   {

     "name": "ExtServicesUnitTests-tplus",

     "options": [

       {

         "exclude-annotation": "androidx.test.filters.FlakyTest"

       }

     ]

   },

   {

     "name": "ExtServicesUnitTests-sminus",

     "options": [

       {

         "exclude-annotation": "androidx.test.filters.FlakyTest"

       }

     ]

   },

   {

     "name": "TestablesTests",

     "options": [

       {

         "exclude-annotation": "androidx.test.filters.FlakyTest"

       }

     ]

     "name": "FrameworksUiServicesTests"

   },

   {

     "name": "FrameworksCoreTests",

     "options": [

       {

         "include-annotation": "android.platform.test.annotations.Presubmit"

     "name": "ExtServicesUnitTests-tplus"

   },

   {

         "exclude-annotation": "androidx.test.filters.FlakyTest"

     "name": "ExtServicesUnitTests-sminus"

   },

   {

         "exclude-annotation": "org.junit.Ignore"

       }

     ]

     "name": "TestablesTests"

   },

   {

     "name": "FrameworksServicesTests",

     "options": [

       {

         "include-annotation": "android.platform.test.annotations.Presubmit"

     "name": "FrameworksCoreTests_Presubmit"

   },

   {

         "exclude-annotation": "androidx.test.filters.FlakyTest"

     "name": "FrameworksServicesTests_presubmit"

   },

   {

         "exclude-annotation": "org.junit.Ignore"

       }

     ]

   },

   {

     "name": "PackageManagerServiceServerTests",

     "options": [

       {

         "include-annotation": "android.platform.test.annotations.Presubmit"

       },

       {

         "exclude-annotation": "androidx.test.filters.FlakyTest"

       },

       {

         "exclude-annotation": "org.junit.Ignore"

       }

     ]

     "name": "PackageManagerServiceServerTests_Presubmit"

   }

 ]

}