From f816bb587c78c50d1ea60c9c61ba782f0a5a8b68 Mon Sep 17 00:00:00 2001
From: "Philip P. Moltmann" <moltmann@google.com>
Date: Thu, 27 Jun 2019 13:11:19 -0700
Subject: [PATCH] Disable historical appops

Fixes: 133419419
Test: atest CtsAppOpsTestCases
Change-Id: I1790581b5ac6608c59d731d9d28110f125186a39
Merged-In: I6debd3cbb6768b256eb558a81ba13efea375769b
---
 .../java/com/android/server/appop/HistoricalRegistry.java   | 6 +++++-
 .../src/com/android/server/appop/AppOpsServiceTest.java     | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/appop/HistoricalRegistry.java b/services/core/java/com/android/server/appop/HistoricalRegistry.java
index 9cf342c0e4fb1..35fbfe1d40442 100644
--- a/services/core/java/com/android/server/appop/HistoricalRegistry.java
+++ b/services/core/java/com/android/server/appop/HistoricalRegistry.java
@@ -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) {
diff --git a/services/tests/servicestests/src/com/android/server/appop/AppOpsServiceTest.java b/services/tests/servicestests/src/com/android/server/appop/AppOpsServiceTest.java
index 552058f6e8c2e..71661452d8007 100644
--- a/services/tests/servicestests/src/com/android/server/appop/AppOpsServiceTest.java
+++ b/services/tests/servicestests/src/com/android/server/appop/AppOpsServiceTest.java
@@ -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);