From cc9620267eef7b3c76e05f4f82978bda9f7ee50e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chris=20G=C3=B6llner?= Date: Tue, 26 Dec 2023 09:55:32 +0000 Subject: [PATCH] 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java index f557484100..8b933c5373 100755 --- a/service/src/com/android/server/ConnectivityService.java +++ b/service/src/com/android/server/ConnectivityService.java @@ -3475,7 +3475,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 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 @@ public class ConnectivityService extends IConnectivityManager.Stub return true; } if (mAllowSysUiConnectivityReports - && checkStatusBarServicePermission(callbackPid, callbackUid)) { + && checkSystemBarServicePermission(callbackPid, callbackUid)) { return true; }