commit ac6a617415756765847588a1de133fdcee606afc
author Karl Shaffer <karlshaffer@google.com> Wed Dec 27 17:22:36 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 27 17:22:36 2023 +0000
tree 1a4449799ea26ac389fe4ac9a7c6ca6f215b81f2
parent 80c9f6f35f26db3caed5ba224d2ec3935c8ce0eb
parent cc9620267eef7b3c76e05f4f82978bda9f7ee50e

Merge "Revert "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 b4efa34..6b47654 100755
--- a/service/src/com/android/server/ConnectivityService.java
+++ b/service/src/com/android/server/ConnectivityService.java
@@ -3534,7 +3534,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);
     }
@@ -11723,7 +11723,7 @@
             return true;
         }
         if (mAllowSysUiConnectivityReports
-                && checkStatusBarServicePermission(callbackPid, callbackUid)) {
+                && checkSystemBarServicePermission(callbackPid, callbackUid)) {
             return true;
         }