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

Commit b7948ced authored by Anton Philippov's avatar Anton Philippov
Browse files

Remove intent-filter from PrivacySettingsActivity

BackupSettingsActivity should be the only activity listenting to the
BACKUP_AND_RESET_SETTINGS intent. It then decides which acitivity to
launch.

Bug: 35237721
Test: make SettingsUnitTests
Change-Id: I2021ec57e08c305771dd040c52725065597fd042
parent 3633c243
Loading
Loading
Loading
Loading
+0 −5
Original line number Diff line number Diff line
@@ -1342,11 +1342,6 @@
                android:configChanges="orientation|keyboardHidden|screenSize"
                android:taskAffinity="com.android.settings"
                android:parentActivityName="Settings">
            <intent-filter android:priority="1">
                <action android:name="android.settings.PRIVACY_SETTINGS" />
                <action android:name="android.settings.BACKUP_AND_RESET_SETTINGS" />
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.DEFAULT" />
+76 −0
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.backup;

import android.app.Instrumentation;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;

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

import java.util.List;

import static com.google.common.truth.Truth.assertThat;

@RunWith(AndroidJUnit4.class)
@SmallTest
public class BackupIntentTest {

    private static final String INTENT_PRIVACY_SETTINGS = "android.settings.PRIVACY_SETTINGS";
    private static final String INTENT_BACKUP_SETTINGS =
            "android.settings.BACKUP_AND_RESET_SETTINGS";
    private static final String BACKUP_SETTINGS_ACTIVITY =
            "com.android.settings.backup.BackupSettingsActivity";

    private Context mContext;

    @Before
    public void setUp() throws Exception {
        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
        mContext = instrumentation.getTargetContext();
    }

    @Test
    public void testBackupSettingsIntentResolvesToOnlyOneActivity(){
        PackageManager pm = mContext.getPackageManager();
        Intent intent = new Intent(INTENT_BACKUP_SETTINGS);
        List<ResolveInfo> activities = pm.queryIntentActivities(intent, 0);
        assertThat(activities).isNotNull();
        assertThat(activities.size()).isEqualTo(1);
        assertThat(activities.get(0).activityInfo.getComponentName().getClassName()).
                isEqualTo(BACKUP_SETTINGS_ACTIVITY);
    }

    @Test
    public void testPrivacySettingsIntentResolvesToOnlyOneActivity(){
        PackageManager pm = mContext.getPackageManager();
        Intent intent = new Intent(INTENT_PRIVACY_SETTINGS);
        List<ResolveInfo> activities = pm.queryIntentActivities(intent, 0);
        assertThat(activities).isNotNull();
        assertThat(activities.size()).isEqualTo(1);
        assertThat(activities.get(0).activityInfo.getComponentName().getClassName()).
                isEqualTo(BACKUP_SETTINGS_ACTIVITY);
    }

}