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

Commit dc677781 authored by Ryan Mitchell's avatar Ryan Mitchell Committed by Android (Google) Code Review
Browse files

Merge "Remove config_show_regulatory_info tests"

parents 7a3ebe7c 4de772fd
Loading
Loading
Loading
Loading
+2 −7
Original line number Diff line number Diff line
@@ -60,12 +60,6 @@ public class RegulatoryInfoDisplayActivity extends Activity implements
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        Resources resources = getResources();

        if (!resources.getBoolean(R.bool.config_show_regulatory_info)) {
            finish();   // no regulatory info to display for this device
        }

        AlertDialog.Builder builder = new AlertDialog.Builder(this)
                .setTitle(R.string.regulatory_labels)
                .setOnDismissListener(this);
@@ -95,7 +89,8 @@ public class RegulatoryInfoDisplayActivity extends Activity implements
            }
        }

        CharSequence regulatoryText = resources.getText(R.string.regulatory_info_text);
        CharSequence regulatoryText = getResources()
                .getText(R.string.regulatory_info_text);

        if (regulatoryInfoDrawableExists) {
            View view = getLayoutInflater().inflate(R.layout.regulatory_info, null);
+0 −73
Original line number Diff line number Diff line
/*
 * Copyright (C) 2017 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.
 */

package com.android.settings;

import static junit.framework.Assert.fail;

import android.app.Instrumentation;
import android.app.UiAutomation;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ResolveInfo;

import androidx.test.InstrumentationRegistry;
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;

import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(AndroidJUnit4.class)
@SmallTest
public class RegulatoryInfoDisplayActivityTest {
    private static final String TAG = "RegulatoryInfoTest";

    private Instrumentation mInstrumentation;
    private Intent mRegulatoryInfoIntent;
    private UiAutomation mUiAutomation;

    @Before
    public void setUp() {
        mInstrumentation = InstrumentationRegistry.getInstrumentation();
        mUiAutomation = InstrumentationRegistry.getInstrumentation().getUiAutomation();
        mRegulatoryInfoIntent = new Intent("android.settings.SHOW_REGULATORY_INFO")
                .addCategory(Intent.CATEGORY_DEFAULT)
                .setPackage(mInstrumentation.getTargetContext().getPackageName());
    }

    @Test
    public void resolveRegulatoryInfoIntent_intentShouldMatchConfig() {
        // Load intent from PackageManager and load config from Settings app
        final Context context = mInstrumentation.getTargetContext();

        final boolean hasRegulatoryInfo = context.getResources()
                .getBoolean(R.bool.config_show_regulatory_info);
        final ResolveInfo resolveInfo = mInstrumentation.getTargetContext().getPackageManager()
                .resolveActivity(mRegulatoryInfoIntent, 0 /* flags */);

        // Check config and intent both enable or both disabled.
        if (hasRegulatoryInfo && resolveInfo == null) {
            fail("Config enables regulatory info but there is no handling intent");
            return;
        }
        if (!hasRegulatoryInfo && resolveInfo != null) {
            fail("Config disables regulatory info but there is at least one handling intent");
            return;
        }
    }
}