commit b8eedd186d5af71b5fcb335c31f41f7f05e350f9
author Quang Luong <qal@google.com> Thu Dec 21 04:43:03 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 21 04:43:03 2023 +0000
tree 605046d647424b14c0113197da3255825eeaf1e8
parent 9d8ab0cafddce206e230b30f790989505a7f571f
parent c0baea54068196adcd9869a001d318086e01cfca

Merge "Rename checkSystemBarServicePermission" into main

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 0ec0f13..7920fbe 100755
--- a/service/src/com/android/server/ConnectivityService.java
+++ b/service/src/com/android/server/ConnectivityService.java
@@ -3517,7 +3517,7 @@
                 NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK);
     }
 
-    private boolean checkSystemBarServicePermission(int pid, int uid) {
+    private boolean checkStatusBarServicePermission(int pid, int uid) {
         return checkAnyPermissionOf(mContext, pid, uid,
                 android.Manifest.permission.STATUS_BAR_SERVICE);
     }
@@ -11702,7 +11702,7 @@
             return true;
         }
         if (mAllowSysUiConnectivityReports
-                && checkSystemBarServicePermission(callbackPid, callbackUid)) {
+                && checkStatusBarServicePermission(callbackPid, callbackUid)) {
             return true;
         }