Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25b25e39 authored by Anil Admal's avatar Anil Admal Committed by android-build-merger
Browse files

Merge "Fix permission mismatch logging of NfwNotification when GNSS HAL is... 

Merge "Fix permission mismatch logging of NfwNotification when GNSS HAL is disabled" into qt-dev am: 2ef04806
am: fb39f7b0

Change-Id: I242b2b77892f50b2a5c8eb4eaa43d743001de4ec
parents bc2f16ab fb39f7b0

services/core/java/com/android/server/location/GnssVisibilityControl.java

+13 −4
Original line number Diff line number Diff line
@@ -456,9 +456,8 @@ class GnssVisibilityControl { 
        final String proxyAppPkgName = nfwNotification.mProxyAppPackageName;

        final ProxyAppState proxyAppState = mProxyAppsState.get(proxyAppPkgName);

        final boolean isLocationRequestAccepted = nfwNotification.isRequestAccepted();

        final boolean isPermissionMismatched =

                (proxyAppState == null) ? isLocationRequestAccepted

                        : (proxyAppState.mHasLocationPermission != isLocationRequestAccepted);

        final boolean isPermissionMismatched = isPermissionMismatched(proxyAppState,

                nfwNotification);

        logEvent(nfwNotification, isPermissionMismatched);



        if (!nfwNotification.isRequestAttributedToProxyApp()) {
@@ -506,14 +505,24 @@ class GnssVisibilityControl { 


        // Log proxy app permission mismatch between framework and GNSS HAL.

        if (isPermissionMismatched) {

            Log.w(TAG, "Permission mismatch. Framework proxy app " + proxyAppPkgName

            Log.w(TAG, "Permission mismatch. Proxy app " + proxyAppPkgName

                    + " location permission is set to " + proxyAppState.mHasLocationPermission

                    + " and GNSS HAL enabled is set to " + mIsGpsEnabled

                    + " but GNSS non-framework location access response type is "

                    + nfwNotification.getResponseTypeAsString() + " for notification: "

                    + nfwNotification);

        }

    }



    private boolean isPermissionMismatched(ProxyAppState proxyAppState,

            NfwNotification nfwNotification) {

        // Non-framework non-emergency location requests must be accepted only when IGnss.hal

        // is enabled and the proxy app has location permission.

        final boolean isLocationRequestAccepted = nfwNotification.isRequestAccepted();

        return (proxyAppState == null || !mIsGpsEnabled) ? isLocationRequestAccepted

                        : (proxyAppState.mHasLocationPermission != isLocationRequestAccepted);

    }



    private void showLocationIcon(ProxyAppState proxyAppState, NfwNotification nfwNotification,

            int uid, String proxyAppPkgName) {

        // If we receive a new NfwNotification before the location icon is turned off for the