commit ea9b16facf42c13575d024d57b671d80605e2b0a
author Lorenzo Colitti <lorenzo@google.com> Mon Feb 21 15:52:23 2022 +0900
committer Lorenzo Colitti <lorenzo@google.com> Mon Feb 21 15:56:07 2022 +0900
tree 1bd2d0c04281b49fc454ae3d064fcdec6ea45d24
parent dad3c928d8d393a6f01508c9f452f0537095328b

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

services/core/java/com/android/server/net/LockdownVpnTracker.java

diff --git a/services/core/java/com/android/server/net/LockdownVpnTracker.java b/services/core/java/com/android/server/net/LockdownVpnTracker.java
index 851ea3d..1b7d1ba 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 @@
                         .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());