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

Commit 35d07d99 authored by Diego Perez's avatar Diego Perez Committed by Android (Google) Code Review
Browse files

Merge "Use a mock file to make testGetResourceNameVariants work in jar files"

parents 53aac79f 1fa7f020
Loading
Loading
Loading
Loading
+16 −0
Original line number Diff line number Diff line
<!--
  ~ Copyright (C) 2016 The Android Open Source Project
  ~
  ~ Licensed under the Apache License, Version 2.0 (the "License");
  ~ you may not use this file except in compliance with the License.
  ~ You may obtain a copy of the License at
  ~
  ~      http://www.apache.org/licenses/LICENSE-2.0
  ~
  ~ Unless required by applicable law or agreed to in writing, software
  ~ distributed under the License is distributed on an "AS IS" BASIS,
  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  ~ See the License for the specific language governing permissions and
  ~ limitations under the License.
  -->
+1 −1
Original line number Diff line number Diff line
@@ -469,7 +469,7 @@ public class Main {
    @Test
    public void testGetResourceNameVariants() throws Exception {
        // Setup
        SessionParams params = createSessionParams("", ConfigGenerator.NEXUS_4);
        SessionParams params = createSessionParams("empty.xml", ConfigGenerator.NEXUS_4);
        AssetManager assetManager = AssetManager.getSystem();
        DisplayMetrics metrics = new DisplayMetrics();
        Configuration configuration = RenderAction.getConfiguration(params);