commit cc9620267eef7b3c76e05f4f82978bda9f7ee50e
author Chris Göllner <chrisgollner@google.com> Tue Dec 26 09:55:32 2023 +0000
committer Chris Göllner <chrisgollner@google.com> Tue Dec 26 16:13:51 2023 +0000
tree e9f829be0d9a1634b8df55daecd035e094965acb
parent c0baea54068196adcd9869a001d318086e01cfca

Revert "Rename checkSystemBarServicePermission"

This reverts commit c0baea54068196adcd9869a001d318086e01cfca.

Reason for revert: Checking if culprit of b/317506400

Change-Id: Icbe9d993c6d4bfdf305f2a4c7b8422095c8846a6
Bug: 317506400

service/src/com/android/server/ConnectivityService.java

diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java
index f557484..8b933c5 100755
--- a/service/src/com/android/server/ConnectivityService.java
+++ b/service/src/com/android/server/ConnectivityService.java
@@ -3475,7 +3475,7 @@
                 NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK);
     }
 
-    private boolean checkStatusBarServicePermission(int pid, int uid) {
+    private boolean checkSystemBarServicePermission(int pid, int uid) {
         return checkAnyPermissionOf(mContext, pid, uid,
                 android.Manifest.permission.STATUS_BAR_SERVICE);
     }
@@ -11554,7 +11554,7 @@
             return true;
         }
         if (mAllowSysUiConnectivityReports
-                && checkStatusBarServicePermission(callbackPid, callbackUid)) {
+                && checkSystemBarServicePermission(callbackPid, callbackUid)) {
             return true;
         }