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

Commit 92eb0205 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by android-build-merger
Browse files

Merge "Disable historical appops" into qt-dev am: 16128cc7

am: 4f7f78cc

Change-Id: I0ebc8196a2b8cfbd45cb77b2e3affc2b5e649888
parents 45983c90 4f7f78cc
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -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) {
+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import androidx.test.runner.AndroidJUnit4;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;

@@ -242,6 +243,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, mMyPackageName, MODE_ALLOWED);