From a6e534fc17203d535ec786b25aad9ff65afdbbea Mon Sep 17 00:00:00 2001 From: Rebecca Silberstein Date: Thu, 8 Jun 2017 00:12:44 -0700 Subject: WifiServiceImpl: check app status for startLOHS When apps register a request for LOHS, they should be the foreground app at the time of the request. If the requesting app is not the foreground app, the ERROR_INCOMPATIBLE_MODE error will be returned. Bug: 62356000 Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh Test: softap integration tests locally Test: in progress LOHS integration tests locally Test: cts-tradefed run cts-dev --module CtsNetTestCases -t android.net.wifi.cts.WifiManagerTest Change-Id: Ic51bbc28478f90983555943a45f4fd70f4b2b385 --- service/java/com/android/server/wifi/FrameworkFacade.java | 11 +++++++++++ service/java/com/android/server/wifi/WifiServiceImpl.java | 10 ++++++++++ 2 files changed, 21 insertions(+) (limited to 'service') diff --git a/service/java/com/android/server/wifi/FrameworkFacade.java b/service/java/com/android/server/wifi/FrameworkFacade.java index 2c3e5f7e0..ba114df8a 100644 --- a/service/java/com/android/server/wifi/FrameworkFacade.java +++ b/service/java/com/android/server/wifi/FrameworkFacade.java @@ -16,6 +16,7 @@ package com.android.server.wifi; +import android.app.ActivityManager; import android.app.AppGlobals; import android.app.PendingIntent; import android.content.Context; @@ -161,4 +162,14 @@ public class FrameworkFacade { public boolean inStorageManagerCryptKeeperBounce() { return StorageManager.inCryptKeeperBounce(); } + + /** + * Check if the provided uid is the app in the foreground. + * @param uid the uid to check + * @return true if the app is in the foreground, false otherwise + * @throws RemoteException + */ + public boolean isAppForeground(int uid) throws RemoteException { + return ActivityManager.getService().isAppForeground(uid); + } } diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java index d32a579ac..1e63433f4 100644 --- a/service/java/com/android/server/wifi/WifiServiceImpl.java +++ b/service/java/com/android/server/wifi/WifiServiceImpl.java @@ -1159,6 +1159,16 @@ public class WifiServiceImpl extends IWifiManager.Stub { return LocalOnlyHotspotCallback.ERROR_TETHERING_DISALLOWED; } + // the app should be in the foreground + try { + if (!mFrameworkFacade.isAppForeground(uid)) { + return LocalOnlyHotspotCallback.ERROR_INCOMPATIBLE_MODE; + } + } catch (RemoteException e) { + mLog.trace("RemoteException during isAppForeground when calling startLOHS"); + return LocalOnlyHotspotCallback.ERROR_INCOMPATIBLE_MODE; + } + mLog.trace("startLocalOnlyHotspot uid=% pid=%").c(uid).c(pid).flush(); synchronized (mLocalOnlyHotspotRequests) { -- cgit v1.2.3