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

Commit 7566b291 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Explicitly set READ_CONTACTS permission" into rvc-dev am: 1e9bda44 

Change-Id: I36b481958846c80454553253524d14fcba8521f6
parents 7a1f4df1 1e9bda44

services/tests/uiservicestests/AndroidManifest.xml

+0 −1
Original line number Original line Diff line number Diff line
@@ -23,7 +23,6 @@ 
    <uses-permission android:name="android.permission.MANAGE_USERS" />

    <uses-permission android:name="android.permission.MANAGE_USERS" />

    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />

    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />

    <uses-permission android:name="android.permission.ACCESS_NOTIFICATIONS" />

    <uses-permission android:name="android.permission.ACCESS_NOTIFICATIONS" />

    <uses-permission android:name="android.permission.READ_CONTACTS" />

    <uses-permission android:name="android.permission.STATUS_BAR_SERVICE" />

    <uses-permission android:name="android.permission.STATUS_BAR_SERVICE" />

    <uses-permission android:name="android.permission.ACCESS_VOICE_INTERACTION_SERVICE" />

    <uses-permission android:name="android.permission.ACCESS_VOICE_INTERACTION_SERVICE" />

    <uses-permission android:name="android.permission.DEVICE_POWER" />

    <uses-permission android:name="android.permission.DEVICE_POWER" />

services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -153,7 +153,6 @@ import android.widget.RemoteViews; 
import androidx.annotation.Nullable;

import androidx.annotation.Nullable;

import androidx.test.InstrumentationRegistry;

import androidx.test.InstrumentationRegistry;





import com.android.internal.R;

import com.android.internal.config.sysui.SystemUiDeviceConfigFlags;

import com.android.internal.config.sysui.SystemUiDeviceConfigFlags;

import com.android.internal.logging.InstanceIdSequence;

import com.android.internal.logging.InstanceIdSequence;

import com.android.internal.logging.InstanceIdSequenceFake;

import com.android.internal.logging.InstanceIdSequenceFake;
@@ -360,7 +359,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 
    @Before

    @Before

    public void setUp() throws Exception {

    public void setUp() throws Exception {

        // Shell permisssions will override permissions of our app, so add all necessary permissions

        // Shell permisssions will override permissions of our app, so add all necessary permissions

        // fo this test here:

        // for this test here:

        InstrumentationRegistry.getInstrumentation().getUiAutomation().adoptShellPermissionIdentity(

        InstrumentationRegistry.getInstrumentation().getUiAutomation().adoptShellPermissionIdentity(

                "android.permission.WRITE_DEVICE_CONFIG",

                "android.permission.WRITE_DEVICE_CONFIG",

                "android.permission.READ_DEVICE_CONFIG",

                "android.permission.READ_DEVICE_CONFIG",

services/tests/uiservicestests/src/com/android/server/notification/RoleObserverTest.java

+13 −0
Original line number Original line Diff line number Diff line
@@ -55,6 +55,8 @@ import android.util.ArraySet; 
import android.util.AtomicFile;

import android.util.AtomicFile;

import android.util.Pair;

import android.util.Pair;





import androidx.test.InstrumentationRegistry;



import com.android.internal.logging.InstanceIdSequence;

import com.android.internal.logging.InstanceIdSequence;

import com.android.internal.logging.InstanceIdSequenceFake;

import com.android.internal.logging.InstanceIdSequenceFake;

import com.android.server.LocalServices;

import com.android.server.LocalServices;
@@ -65,6 +67,7 @@ import com.android.server.notification.NotificationManagerService.NotificationLi 
import com.android.server.uri.UriGrantsManagerInternal;

import com.android.server.uri.UriGrantsManagerInternal;

import com.android.server.wm.WindowManagerInternal;

import com.android.server.wm.WindowManagerInternal;





import org.junit.After;

import org.junit.Before;

import org.junit.Before;

import org.junit.Test;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runner.RunWith;
@@ -116,6 +119,10 @@ public class RoleObserverTest extends UiServiceTestCase { 
    @Before

    @Before

    public void setUp() throws Exception {

    public void setUp() throws Exception {

        MockitoAnnotations.initMocks(this);

        MockitoAnnotations.initMocks(this);

        // Shell permisssions will override permissions of our app, so add all necessary permissions

        // for this test here:

        InstrumentationRegistry.getInstrumentation().getUiAutomation().adoptShellPermissionIdentity(

                "android.permission.READ_CONTACTS");





        LocalServices.removeServiceForTest(WindowManagerInternal.class);

        LocalServices.removeServiceForTest(WindowManagerInternal.class);

        LocalServices.addService(WindowManagerInternal.class, mock(WindowManagerInternal.class));

        LocalServices.addService(WindowManagerInternal.class, mock(WindowManagerInternal.class));
@@ -153,6 +160,12 @@ public class RoleObserverTest extends UiServiceTestCase { 
        mService.setPreferencesHelper(mPreferencesHelper);

        mService.setPreferencesHelper(mPreferencesHelper);

    }

    }





    @After

    public void tearDown() {

        InstrumentationRegistry.getInstrumentation()

                .getUiAutomation().dropShellPermissionIdentity();

    }



    @Test

    @Test

    public void testInit() throws Exception {

    public void testInit() throws Exception {

        List<String> dialer0 = new ArrayList<>();

        List<String> dialer0 = new ArrayList<>();