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

Commit eb3b2354 authored by Derek Jedral's avatar Derek Jedral Committed by Automerger Merge Worker
Browse files

Merge "[Trust] Add test target for tablets." into tm-dev am: a4a4f42b am: a09c3f9c 

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



Change-Id: I105b804302f0b5392be8cd4401c9b68ae14edeb7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4d66e544 a09c3f9c

core/java/android/app/trust/TEST_MAPPING

+13 −0
Original line number Original line Diff line number Diff line
@@ -11,5 +11,18 @@ 
        }

        }

      ]

      ]

    }

    }

  ],

  "trust-tablet": [

    {

      "name": "TrustTests",

      "options": [

        {

          "include-filter": "android.trust.test"

        },

        {

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

        }

      ]

    }

  ]

  ]

}
 
}
 
 No newline at end of file

services/core/java/com/android/server/trust/TEST_MAPPING

+13 −0
Original line number Original line Diff line number Diff line
@@ -11,5 +11,18 @@ 
          }

          }

        ]

        ]

      }

      }

    ],

    "trust-tablet": [

      {

        "name": "TrustTests",

        "options": [

          {

            "include-filter": "android.trust.test"

          },

          {

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

          }

        ]

      }

    ]

    ]

  }
 
  }
 
 No newline at end of file

tests/TrustTests/TEST_MAPPING

+13 −0
Original line number Original line Diff line number Diff line
@@ -11,5 +11,18 @@ 
        }

        }

      ]

      ]

    }

    }

  ],

  "trust-tablet": [

    {

      "name": "TrustTests",

      "options": [

        {

          "include-filter": "android.trust.test"

        },

        {

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

        }

      ]

    }

  ]

  ]

}
 
}
 
 No newline at end of file