From ea9b16facf42c13575d024d57b671d80605e2b0a Mon Sep 17 00:00:00 2001
From: Lorenzo Colitti <lorenzo@google.com>
Date: Mon, 21 Feb 2022 15:52:23 +0900
Subject: [PATCH] Get system_notification_accent_color from public resources.

LockdownVpnTracker gets system_notification_accent_color from
com.android.internal.R. This is not stable across releases, so it
can crash ConnectivityCoverageTests when run on older releases.

Use the system API constant instead, since that is guaranteeed to
be stable. The constant was added in ag/5795405.

Test: atest ConnectivityCoverageTests
Change-Id: I956f9fac4b89cf8429bf46682b52c0203cc4210e
---
 .../core/java/com/android/server/net/LockdownVpnTracker.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/net/LockdownVpnTracker.java b/services/core/java/com/android/server/net/LockdownVpnTracker.java
index 851ea3d010852..1b7d1ba59b068 100644
--- a/services/core/java/com/android/server/net/LockdownVpnTracker.java
+++ b/services/core/java/com/android/server/net/LockdownVpnTracker.java
@@ -293,7 +293,7 @@ public class LockdownVpnTracker {
                         .addAction(R.drawable.ic_menu_refresh, mContext.getString(R.string.reset),
                                 mResetIntent)
                         .setColor(mContext.getColor(
-                                com.android.internal.R.color.system_notification_accent_color));
+                                android.R.color.system_notification_accent_color));
 
         mNotificationManager.notify(null /* tag */, SystemMessage.NOTE_VPN_STATUS,
                 builder.build());