Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clean up permissions when system app fails to scan" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-06-17 23:30:24 +00:00
committed by Android (Google) Code Review
parent 8a4ea8bb12 7e58a847ac
commit 410ddb9100
10 changed files with 162 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -3175,6 +3175,10 @@ public class PackageManagerService extends IPackageManager.Stub
psit.remove();
logCriticalInfo(Log.WARN, "System package " + ps.name
+ " no longer exists; it's data will be wiped");
// Assume package is truly gone and wipe residual permissions.
mPermissionManager.updatePermissions(ps.name, null);
// Actual deletion of code and data will be handled by later
// reconciliation step
} else {

8
services/tests/PackageManagerServiceTests/host/Android.bp
View File

@@ -28,6 +28,14 @@ java_test_host {
":PackageManagerDummyAppVersion1",
":PackageManagerDummyAppVersion2",
":PackageManagerDummyAppVersion3",
":PackageManagerDummyAppVersion4",
":PackageManagerDummyAppOriginalOverride",
":PackageManagerServiceHostTestsResources",
]
}
filegroup {
name: "PackageManagerServiceHostTestsResources",
srcs: [ "resources/*" ],
path: "resources/"
}

BIN
services/tests/PackageManagerServiceTests/host/resources/PackageManagerDummyAppVersion3Invalid.apk Normal file
View File

Binary file not shown.

10
services/tests/PackageManagerServiceTests/host/src/com/android/server/pm/test/HostUtils.kt
View File

@@ -19,6 +19,7 @@ package com.android.server.pm.test
import com.android.internal.util.test.SystemPreparer
import com.android.tradefed.device.ITestDevice
import java.io.File
import java.io.FileOutputStream
internal fun SystemPreparer.pushApk(file: String, partition: Partition) =
pushResourceFile(file, HostUtils.makePathForApk(file, partition))
@@ -43,4 +44,13 @@ internal object HostUtils {
.resolve(file.nameWithoutExtension)
.resolve(file.name)
.toString()
fun copyResourceToHostFile(javaResourceName: String, file: File): File {
javaClass.classLoader!!.getResource(javaResourceName).openStream().use { input ->
FileOutputStream(file).use { output ->
input.copyTo(output)
}
}
return file
}
}

83
services/tests/PackageManagerServiceTests/host/src/com/android/server/pm/test/InvalidNewSystemAppTest.kt Normal file
View File

@@ -0,0 +1,83 @@
/*
* Copyright (C) 2020 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.server.pm.test
import com.android.internal.util.test.SystemPreparer
import com.android.tradefed.testtype.DeviceJUnit4ClassRunner
import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test
import com.google.common.truth.Truth.assertThat
import org.junit.After
import org.junit.Before
import org.junit.ClassRule
import org.junit.Rule
import org.junit.Test
import org.junit.rules.RuleChain
import org.junit.rules.TemporaryFolder
import org.junit.runner.RunWith
@RunWith(DeviceJUnit4ClassRunner::class)
class InvalidNewSystemAppTest : BaseHostJUnit4Test() {
companion object {
private const val TEST_PKG_NAME = "com.android.server.pm.test.dummy_app"
private const val VERSION_ONE = "PackageManagerDummyAppVersion1.apk"
private const val VERSION_TWO = "PackageManagerDummyAppVersion2.apk"
private const val VERSION_THREE_INVALID = "PackageManagerDummyAppVersion3Invalid.apk"
private const val VERSION_FOUR = "PackageManagerDummyAppVersion4.apk"
@get:ClassRule
val deviceRebootRule = SystemPreparer.TestRuleDelegate(true)
}
private val tempFolder = TemporaryFolder()
private val preparer: SystemPreparer = SystemPreparer(tempFolder,
SystemPreparer.RebootStrategy.START_STOP, deviceRebootRule) { this.device }
@get:Rule
val rules = RuleChain.outerRule(tempFolder).around(preparer)!!
@Before
@After
fun uninstallDataPackage() {
device.uninstallPackage(TEST_PKG_NAME)
}
@Test
fun verify() {
// First, push a system app to the device and then update it so there's a data variant
val filePath = HostUtils.makePathForApk("PackageManagerDummyApp.apk", Partition.PRODUCT)
preparer.pushResourceFile(VERSION_ONE, filePath)
.reboot()
val versionTwoFile = HostUtils.copyResourceToHostFile(VERSION_TWO, tempFolder.newFile())
assertThat(device.installPackage(versionTwoFile, true)).isNull()
// Then push a bad update to the system, overwriting the existing file as if an OTA occurred
preparer.deleteFile(filePath)
.pushResourceFile(VERSION_THREE_INVALID, filePath)
.reboot()
// This will remove the package from the device, which is expected
assertThat(device.getAppPackageInfo(TEST_PKG_NAME)).isNull()
// Then check that a user would still be able to install the application manually
val versionFourFile = HostUtils.copyResourceToHostFile(VERSION_FOUR, tempFolder.newFile())
assertThat(device.installPackage(versionFourFile, true)).isNull()
}
}

5
services/tests/PackageManagerServiceTests/host/test-apps/Android.bp
View File

@@ -27,6 +27,11 @@ android_test_helper_app {
manifest: "AndroidManifestVersion3.xml"
}
android_test_helper_app {
name: "PackageManagerDummyAppVersion4",
manifest: "AndroidManifestVersion4.xml"
}
android_test_helper_app {
name: "PackageManagerDummyAppOriginalOverride",
manifest: "AndroidManifestOriginalOverride.xml"

9
services/tests/PackageManagerServiceTests/host/test-apps/AndroidManifestVersion1.xml
View File

@@ -18,4 +18,11 @@
xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.server.pm.test.dummy_app"
android:versionCode="1"
/>
>
<permission
android:name="com.android.server.pm.test.dummy_app.TEST_PERMISSION"
android:protectionLevel="normal"
/>
</manifest>

9
services/tests/PackageManagerServiceTests/host/test-apps/AndroidManifestVersion2.xml
View File

@@ -18,4 +18,11 @@
xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.server.pm.test.dummy_app"
android:versionCode="2"
/>
>
<permission
android:name="com.android.server.pm.test.dummy_app.TEST_PERMISSION"
android:protectionLevel="normal"
/>
</manifest>

9
services/tests/PackageManagerServiceTests/host/test-apps/AndroidManifestVersion3.xml
View File

@@ -18,4 +18,11 @@
xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.server.pm.test.dummy_app"
android:versionCode="3"
/>
>
<permission
android:name="com.android.server.pm.test.dummy_app.TEST_PERMISSION"
android:protectionLevel="normal"
/>
</manifest>

28
services/tests/PackageManagerServiceTests/host/test-apps/AndroidManifestVersion4.xml Normal file
View File

@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2020 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.
-->
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.server.pm.test.dummy_app"
android:versionCode="4"
>
<permission
android:name="com.android.server.pm.test.dummy_app.TEST_PERMISSION"
android:protectionLevel="normal"
/>
</manifest>