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

Disable historical appops

Browse Source 
Fixes: 133419419
Test: atest CtsAppOpsTestCases
Change-Id: I6debd3cbb6768b256eb558a81ba13efea375769b
This commit is contained in:
Philip P. Moltmann
2019-06-28 09:24:43 -07:00
parent 082f7c3f05
commit 1353bc5b76
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/appop/HistoricalRegistry.java
View File

@@ -150,9 +150,11 @@ final class HistoricalRegistry {
/**
* Whether history is enabled.
*
* <p>The feature is permanently disabled in Android Q
*/
@GuardedBy("mInMemoryLock")
private int mMode = AppOpsManager.HISTORICAL_MODE_ENABLED_ACTIVE;
private final int mMode = AppOpsManager.HISTORICAL_MODE_DISABLED;
/**
* This granularity has been chosen to allow clean delineation for intervals
@@ -451,6 +453,7 @@ final class HistoricalRegistry {
void setHistoryParameters(@HistoricalMode int mode,
long baseSnapshotInterval, long intervalCompressionMultiplier) {
/*
synchronized (mOnDiskLock) {
synchronized (mInMemoryLock) {
// NOTE: We allow this call if persistence is not initialized as
@@ -479,6 +482,7 @@ final class HistoricalRegistry {
}
}
}
*/
}
void offsetHistory(long offsetMillis) {

4
services/tests/mockingservicestests/src/com/android/server/appop/AppOpsServiceTest.java
View File

@@ -63,6 +63,7 @@ import com.android.server.LocalServices;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.quality.Strictness;
@@ -233,6 +234,7 @@ public class AppOpsServiceTest {
assertContainsOp(loggedOps, OP_READ_SMS, mTestStartMillis, -1, MODE_ALLOWED);
}
@Ignore("Historical appops are disabled in Android Q")
@Test
public void testGetOpsForPackage() {
mAppOpsService.setMode(OP_READ_SMS, mMyUid, sMyPackageName, MODE_ALLOWED);
@@ -274,7 +276,7 @@ public class AppOpsServiceTest {
assertThat(getLoggedOps()).isNull();
}
@Ignore("Historical appops are disabled in Android Q")
@Test
public void testPackageRemovedHistoricalOps() throws InterruptedException {
mAppOpsService.setMode(OP_READ_SMS, mMyUid, sMyPackageName, MODE_ALLOWED);