Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix permission mismatch logging of NfwNotification when GNSS HAL is disabled" into qt-dev

Browse Source
This commit is contained in:
Anil Admal
2019-05-31 01:58:55 +00:00
committed by Android (Google) Code Review
parent f185b652bd 27caa745b3
commit 2ef048060c
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/core/java/com/android/server/location/GnssVisibilityControl.java
View File

@@ -456,9 +456,8 @@ class GnssVisibilityControl {
final String proxyAppPkgName = nfwNotification.mProxyAppPackageName; final String proxyAppPkgName = nfwNotification.mProxyAppPackageName;
final ProxyAppState proxyAppState = mProxyAppsState.get(proxyAppPkgName); final ProxyAppState proxyAppState = mProxyAppsState.get(proxyAppPkgName);
final boolean isLocationRequestAccepted = nfwNotification.isRequestAccepted(); final boolean isLocationRequestAccepted = nfwNotification.isRequestAccepted();
final boolean isPermissionMismatched = final boolean isPermissionMismatched = isPermissionMismatched(proxyAppState,
(proxyAppState == null) ? isLocationRequestAccepted nfwNotification);
: (proxyAppState.mHasLocationPermission != isLocationRequestAccepted);
logEvent(nfwNotification, isPermissionMismatched); logEvent(nfwNotification, isPermissionMismatched);
if (!nfwNotification.isRequestAttributedToProxyApp()) { if (!nfwNotification.isRequestAttributedToProxyApp()) {
@@ -506,14 +505,24 @@ class GnssVisibilityControl {
// Log proxy app permission mismatch between framework and GNSS HAL. // Log proxy app permission mismatch between framework and GNSS HAL.
if (isPermissionMismatched) { 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 + " location permission is set to " + proxyAppState.mHasLocationPermission
+ " and GNSS HAL enabled is set to " + mIsGpsEnabled
+ " but GNSS non-framework location access response type is " + " but GNSS non-framework location access response type is "
+ nfwNotification.getResponseTypeAsString() + " for notification: " + nfwNotification.getResponseTypeAsString() + " for notification: "
+ nfwNotification); + 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, private void showLocationIcon(ProxyAppState proxyAppState, NfwNotification nfwNotification,
int uid, String proxyAppPkgName) { int uid, String proxyAppPkgName) {
// If we receive a new NfwNotification before the location icon is turned off for the // If we receive a new NfwNotification before the location icon is turned off for the