From 2695c7a54518035f0f6ace90ff059af1600b510a Mon Sep 17 00:00:00 2001
From: tomnatan <tomnatan@google.com>
Date: Mon, 29 Mar 2021 17:07:33 +0000
Subject: [PATCH] Add OVERRIDE_COMPAT_CHANGE_CONFIG_ON_RELEASE_BUILD to
 PlatformCompatChangeRule.

This is done so that CTS tests can override @Overridable compat changes
and pass on non-debuggable build.

Bug: 183406442
Test: Existing tests pass.
Change-Id: I89a1887f8f3dfc66d8a80acfa3b41a80e028cabb
---
 .../src/android/compat/testing/PlatformCompatChangeRule.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/PlatformCompatGating/test-rules/src/android/compat/testing/PlatformCompatChangeRule.java b/tests/PlatformCompatGating/test-rules/src/android/compat/testing/PlatformCompatChangeRule.java
index df58da5f157a0..039ba512e95b6 100644
--- a/tests/PlatformCompatGating/test-rules/src/android/compat/testing/PlatformCompatChangeRule.java
+++ b/tests/PlatformCompatGating/test-rules/src/android/compat/testing/PlatformCompatChangeRule.java
@@ -117,6 +117,7 @@ public class PlatformCompatChangeRule extends CoreCompatChangeRule {
             uiAutomation.adoptShellPermissionIdentity(
                     Manifest.permission.LOG_COMPAT_CHANGE,
                     Manifest.permission.OVERRIDE_COMPAT_CHANGE_CONFIG,
+                    Manifest.permission.OVERRIDE_COMPAT_CHANGE_CONFIG_ON_RELEASE_BUILD,
                     Manifest.permission.READ_COMPAT_CHANGE_CONFIG);
         }
     }