Revert "Verify PackageManagerShellCommand caller is shell"
This reverts commit dec5b1985f6930856c6fde0be2e9ef47623c7306.
Reason for revert: a culprit of b/210553425
Change-Id: I3c2a7a80c497698c2fbc3e663a0a48004bec7ea8
diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
index fdcf1fc..0564e85 100644
--- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
+++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
@@ -18,7 +18,6 @@
import static android.content.pm.PackageInstaller.LOCATION_DATA_APP;
-import android.Manifest;
import android.accounts.IAccountManager;
import android.annotation.NonNull;
import android.annotation.UserIdInt;
@@ -171,20 +170,6 @@
@Override
public int onCommand(String cmd) {
- switch (Binder.getCallingUid()) {
- case Process.ROOT_UID:
- case Process.SHELL_UID:
- break;
- default:
- // This is called from a test and is allowed as non-shell with the right permission
- if ("install-incremental".equals(cmd)) {
- mContext.enforceCallingPermission(Manifest.permission.USE_SYSTEM_DATA_LOADERS,
- "Caller missing USE_SYSTEM_DATA_LOADERS permission to use " + cmd);
- } else {
- throw new IllegalArgumentException("Caller must be root or shell");
- }
- }
-
if (cmd == null) {
return handleDefaultCommands(cmd);
}
diff --git a/services/core/java/com/android/server/pm/verify/domain/DomainVerificationService.java b/services/core/java/com/android/server/pm/verify/domain/DomainVerificationService.java
index 970d6d3..661e67d 100644
--- a/services/core/java/com/android/server/pm/verify/domain/DomainVerificationService.java
+++ b/services/core/java/com/android/server/pm/verify/domain/DomainVerificationService.java
@@ -1197,7 +1197,6 @@
@Nullable @UserIdInt Integer userId,
@NonNull Function<String, PackageStateInternal> pkgSettingFunction)
throws NameNotFoundException {
- mEnforcer.assertApprovedQuerent(mConnection.getCallingUid(), mProxy);
synchronized (mLock) {
mDebug.printState(writer, packageName, userId, pkgSettingFunction, mAttachedPkgStates);
}
diff --git a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationEnforcerTest.kt b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationEnforcerTest.kt
index d9dbf48..d1d7cc6 100644
--- a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationEnforcerTest.kt
+++ b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationEnforcerTest.kt
@@ -19,7 +19,6 @@
import android.content.Context
import android.content.Intent
import android.content.pm.PackageManager
-import android.content.pm.SigningDetails
import android.content.pm.parsing.component.ParsedActivityImpl
import android.content.pm.parsing.component.ParsedIntentInfoImpl
import android.content.pm.verify.domain.DomainVerificationManager
@@ -27,7 +26,6 @@
import android.os.Build
import android.os.Process
import android.util.ArraySet
-import android.util.IndentingPrintWriter
import android.util.SparseArray
import androidx.test.platform.app.InstrumentationRegistry
import com.android.server.pm.parsing.pkg.AndroidPackage
@@ -48,7 +46,6 @@
import org.mockito.Mockito.anyLong
import org.mockito.Mockito.anyString
import org.mockito.Mockito.eq
-import org.mockito.Mockito.mock
import org.mockito.Mockito.verifyNoMoreInteractions
import java.util.UUID
import java.util.concurrent.atomic.AtomicBoolean
@@ -207,14 +204,6 @@
service(Type.QUERENT, "getInfo") {
getDomainVerificationInfo(it.targetPackageName)
},
- service(Type.QUERENT, "printState") {
- printState(mock(IndentingPrintWriter::class.java), null, null)
- },
- service(Type.QUERENT, "printStateInternal") {
- printState(mock(IndentingPrintWriter::class.java), null, null) {
- mockPkgState(it, UUID.randomUUID())
- }
- },
service(Type.VERIFIER, "setStatus") {
setDomainVerificationStatus(
it.targetDomainSetId,
@@ -322,7 +311,6 @@
}
)
}
- whenever(signingDetails) { SigningDetails.UNKNOWN }
}
fun mockPkgState(packageName: String, domainSetId: UUID) =
@@ -339,7 +327,6 @@
}
}
whenever(isSystem) { false }
- whenever(signingDetails) { SigningDetails.UNKNOWN }
}
}
@@ -807,12 +794,8 @@
}
val valueAsInt = value as? Int
- if (valueAsInt != null) {
- if (valueAsInt == DomainVerificationManager.STATUS_OK) {
- throw AssertionError("Expected call to return false, was $value")
- }
- } else {
- throw AssertionError("Expected call to fail")
+ if (valueAsInt != null && valueAsInt == DomainVerificationManager.STATUS_OK) {
+ throw AssertionError("Expected call to return false, was $value")
}
} catch (e: SecurityException) {
} catch (e: PackageManager.NameNotFoundException) {
