commit a9cd09bf9a94f23b3392d8f145e998450e7e6a80
author Karl Shaffer <karlshaffer@google.com> Wed Dec 27 17:45:42 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 27 17:45:42 2023 +0000
tree 1a4449799ea26ac389fe4ac9a7c6ca6f215b81f2
parent a4d5b4983b5bff668e8785f47a680b5a2d1d989e
parent ac6a617415756765847588a1de133fdcee606afc

Merge "Revert "Rename checkSystemBarServicePermission"" into main am: ac6a617415

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2890313

Change-Id: Iac3b9ab054e6eea087b83696fed07d433b2b76f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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;
         }