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

Commit b9e8f09d authored by Ömer Yaveroğlu's avatar Ömer Yaveroğlu Committed by Automerger Merge Worker
Browse files

Merge "Stop evaluating the install requests from package manager and approve... 

Merge "Stop evaluating the install requests from package manager and approve all evaluation requests by default." into main am: 9d591c90

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



Change-Id: Iac3827c04e1fc4bc15a1890e61b675fefd97d4cc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 79e3847c 9d591c90

services/core/java/com/android/server/integrity/AppIntegrityManagerServiceImpl.java

+2 −475

File changed.

Preview size limit exceeded, changes collapsed.

services/tests/servicestests/src/com/android/server/integrity/AppIntegrityManagerServiceImplTest.java

+0 −5
Original line number Diff line number Diff line
@@ -67,10 +67,8 @@ import android.provider.Settings; 
import androidx.test.InstrumentationRegistry;



import com.android.internal.R;

import com.android.internal.pm.parsing.PackageParser2;

import com.android.server.compat.PlatformCompat;

import com.android.server.integrity.model.IntegrityCheckResult;

import com.android.server.pm.parsing.TestPackageParser2;

import com.android.server.testutils.TestUtils;



import org.junit.After;
@@ -140,8 +138,6 @@ public class AppIntegrityManagerServiceImplTest { 
    @Mock IntegrityFileManager mIntegrityFileManager;

    @Mock Handler mHandler;



    private Supplier<PackageParser2> mParserSupplier = TestPackageParser2::new;



    private final Context mRealContext = InstrumentationRegistry.getTargetContext();



    private PackageManager mSpyPackageManager;
@@ -173,7 +169,6 @@ public class AppIntegrityManagerServiceImplTest { 
                new AppIntegrityManagerServiceImpl(

                        mMockContext,

                        mPackageManagerInternal,

                        mParserSupplier,

                        mIntegrityFileManager,

                        mHandler);