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

Merge "Add bounds check when setting package usage" into rvc-dev

Browse Source
This commit is contained in:
Todd Kennedy
2020-04-29 22:28:00 +00:00
committed by Android (Google) Code Review
parent aeb383ec87 b4efd1b065
commit 6d2cb5f29b
2 changed files with 60 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/pm/pkg/PackageStateUnserialized.java
View File

@@ -21,7 +21,6 @@ import static java.util.Collections.emptyList;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.content.pm.PackageManager;
import android.content.pm.PackageParser;
import android.content.pm.SharedLibraryInfo;
import com.android.internal.util.DataClass;
@@ -64,6 +63,12 @@ public class PackageStateUnserialized {
}
public PackageStateUnserialized setLastPackageUsageTimeInMills(int reason, long time) {
if (reason < 0) {
return this;
}
if (reason >= PackageManager.NOTIFY_PACKAGE_USE_REASONS_COUNT) {
return this;
}
getLastPackageUsageTimeInMills()[reason] = time;
return this;
}

54
services/tests/servicestests/src/com/android/server/pm/PackageUserStateTest.java
View File

@@ -20,6 +20,7 @@ import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ASK;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import android.content.pm.PackageManager;
@@ -32,6 +33,8 @@ import android.util.ArraySet;
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
import com.android.server.pm.pkg.PackageStateUnserialized;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -300,4 +303,55 @@ public class PackageUserStateTest {
// Everything is different
assertThat(params1.equals(params2), is(false));
}
/**
* Test fix for b/149772100.
*/
private static void assertLastPackageUsageUnset(
PackageStateUnserialized state) throws Exception {
for (int i = state.getLastPackageUsageTimeInMills().length - 1; i >= 0; --i) {
assertEquals(0L, state.getLastPackageUsageTimeInMills()[i]);
}
}
private static void assertLastPackageUsageSet(
PackageStateUnserialized state, int reason, long value) throws Exception {
for (int i = state.getLastPackageUsageTimeInMills().length - 1; i >= 0; --i) {
if (i == reason) {
assertEquals(value, state.getLastPackageUsageTimeInMills()[i]);
} else {
assertEquals(0L, state.getLastPackageUsageTimeInMills()[i]);
}
}
}
@Test
public void testPackageUseReasons() throws Exception {
final PackageStateUnserialized testState1 = new PackageStateUnserialized();
testState1.setLastPackageUsageTimeInMills(-1, 10L);
assertLastPackageUsageUnset(testState1);
final PackageStateUnserialized testState2 = new PackageStateUnserialized();
testState2.setLastPackageUsageTimeInMills(
PackageManager.NOTIFY_PACKAGE_USE_REASONS_COUNT, 20L);
assertLastPackageUsageUnset(testState2);
final PackageStateUnserialized testState3 = new PackageStateUnserialized();
testState3.setLastPackageUsageTimeInMills(Integer.MAX_VALUE, 30L);
assertLastPackageUsageUnset(testState3);
final PackageStateUnserialized testState4 = new PackageStateUnserialized();
testState4.setLastPackageUsageTimeInMills(0, 40L);
assertLastPackageUsageSet(testState4, 0, 40L);
final PackageStateUnserialized testState5 = new PackageStateUnserialized();
testState5.setLastPackageUsageTimeInMills(
PackageManager.NOTIFY_PACKAGE_USE_CONTENT_PROVIDER, 50L);
assertLastPackageUsageSet(
testState5, PackageManager.NOTIFY_PACKAGE_USE_CONTENT_PROVIDER, 50L);
final PackageStateUnserialized testState6 = new PackageStateUnserialized();
testState6.setLastPackageUsageTimeInMills(
PackageManager.NOTIFY_PACKAGE_USE_REASONS_COUNT - 1, 60L);
assertLastPackageUsageSet(
testState6, PackageManager.NOTIFY_PACKAGE_USE_REASONS_COUNT - 1, 60L);
}
}