commit 92265222f1e1df56ee6d106493b1bd2be65d5ce9
author David Brazdil <dbrazdil@google.com> Fri Feb 02 11:21:40 2018 +0000
committer David Brazdil <dbrazdil@google.com> Sat Feb 03 02:11:11 2018 +0000
tree d73a4f9708acbedb1d464c83c22756ac0eb68799
parent e5bf41acab7cc5a798a4d19425493a4af8f20436

Only set UI warning on hidden API dark greylist

The framework might show a toast notification on access to greylisted
hidden APIs. Only show this warning on dark greylist so as to not spam
early testers.

Bug: 64382372
Test: make
Change-Id: I8b5f7b4938e0f238c513e37d7db06856b966802f

runtime/hidden_api.h

diff --git a/runtime/hidden_api.h b/runtime/hidden_api.h
index f476028..05e68e6 100644
--- a/runtime/hidden_api.h
+++ b/runtime/hidden_api.h
@@ -27,6 +27,7 @@
 enum Action {
   kAllow,
   kAllowButWarn,
+  kAllowButWarnAndToast,
   kDeny
 };
 
@@ -35,8 +36,9 @@
     case HiddenApiAccessFlags::kWhitelist:
       return kAllow;
     case HiddenApiAccessFlags::kLightGreylist:
-    case HiddenApiAccessFlags::kDarkGreylist:
       return kAllowButWarn;
+    case HiddenApiAccessFlags::kDarkGreylist:
+      return kAllowButWarnAndToast;
     case HiddenApiAccessFlags::kBlacklist:
       return kDeny;
   }
@@ -70,8 +72,9 @@
                                       std::function<bool(Thread*)> fn_caller_in_boot)
     REQUIRES_SHARED(Locks::mutator_lock_) {
   DCHECK(member != nullptr);
+  Runtime* runtime = Runtime::Current();
 
-  if (!Runtime::Current()->AreHiddenApiChecksEnabled()) {
+  if (!runtime->AreHiddenApiChecksEnabled()) {
     // Exit early. Nothing to enforce.
     return false;
   }
@@ -90,20 +93,23 @@
   }
 
   // Member is hidden and we are not in the boot class path. Act accordingly.
-  if (action == kAllowButWarn) {
+  if (action == kDeny) {
+    return true;
+  } else {
+    DCHECK(action == kAllowButWarn || action == kAllowButWarnAndToast);
+
     // Allow access to this member but print a warning. Depending on a runtime
     // flag, we might move the member into whitelist and skip the warning the
     // next time the member is used.
-    Runtime::Current()->SetPendingHiddenApiWarning(true);
-    if (Runtime::Current()->ShouldDedupeHiddenApiWarnings()) {
+    if (runtime->ShouldDedupeHiddenApiWarnings()) {
       member->SetAccessFlags(HiddenApiAccessFlags::EncodeForRuntime(
           member->GetAccessFlags(), HiddenApiAccessFlags::kWhitelist));
     }
     WarnAboutMemberAccess(member);
+    if (action == kAllowButWarnAndToast || runtime->ShouldAlwaysSetHiddenApiWarningFlag()) {
+      Runtime::Current()->SetPendingHiddenApiWarning(true);
+    }
     return false;
-  } else {
-    DCHECK_EQ(action, hiddenapi::kDeny);
-    return true;
   }
 }