From 9b5ddff6f74073a2b45669eff8379ed796dbf488 Mon Sep 17 00:00:00 2001 From: Mathew Inwood Date: Wed, 16 May 2018 11:18:10 +0100 Subject: Hidden API: only log what we deny. Only print a "Accessing hidden ..." warning in logcat when we deny access to any API, or if the app is debuggable. This reduces log spam. Update test expectations accordingly. Bug: 79914966 Test: $ art/test.py -b --host -t 674-hiddenapi (cherry picked from commit 46b26278907301dcc27010b397d1a4bd1cd53b33) Merged-In: Ic6dfa0dd519a8854e3a40ba19c9a001c0c2a378b Change-Id: Ieda769d51e53ec4b7712d0bb1bf76e1a95d2120f --- test/674-hiddenapi/src-ex/ChildClass.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'test/674-hiddenapi/src-ex/ChildClass.java') diff --git a/test/674-hiddenapi/src-ex/ChildClass.java b/test/674-hiddenapi/src-ex/ChildClass.java index 0349e8fe46..d5966cde36 100644 --- a/test/674-hiddenapi/src-ex/ChildClass.java +++ b/test/674-hiddenapi/src-ex/ChildClass.java @@ -91,12 +91,12 @@ public class ChildClass { // Run meaningful combinations of access flags. for (Hiddenness hiddenness : Hiddenness.values()) { final Behaviour expected; - if (isSameBoot || hiddenness == Hiddenness.Whitelist || everythingWhitelisted) { + // Warnings are now disabled whenever access is granted, even for + // greylisted APIs. This is the behaviour for release builds. + if (isSameBoot || hiddenness != Hiddenness.Blacklist || everythingWhitelisted) { expected = Behaviour.Granted; - } else if (hiddenness == Hiddenness.Blacklist) { - expected = Behaviour.Denied; } else { - expected = Behaviour.Warning; + expected = Behaviour.Denied; } for (boolean isStatic : booleanValues) { -- cgit v1.2.3-59-g8ed1b