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

Commit 0027a67e authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

Revert "Disable historical appops" 

This reverts commit 1353bc5b.

Reason for revert: Re-enable historical app-ops for R as requested by PM

Bug: 133419419
Change-Id: Ib80b310b28fd0752db4c37692c691a5731804945
parent 1353bc5b

services/core/java/com/android/server/appop/HistoricalRegistry.java

+1 −5
Original line number Diff line number Diff line
@@ -150,11 +150,9 @@ final class HistoricalRegistry { 


    /**

     * Whether history is enabled.

     *

     * <p>The feature is permanently disabled in Android Q

     */

    @GuardedBy("mInMemoryLock")

    private final int mMode = AppOpsManager.HISTORICAL_MODE_DISABLED;

    private int mMode = AppOpsManager.HISTORICAL_MODE_ENABLED_ACTIVE;



    /**

     * This granularity has been chosen to allow clean delineation for intervals
@@ -453,7 +451,6 @@ 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
@@ -482,7 +479,6 @@ final class HistoricalRegistry { 
                }

            }

        }

        */

    }



    void offsetHistory(long offsetMillis) {

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

+1 −3
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ 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;
@@ -234,7 +233,6 @@ 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);
@@ -276,7 +274,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);