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

Merge "ShortcutManager: Update foreground check." into nyc-mr1-dev

Browse Source
This commit is contained in:
Makoto Onuki
2016-08-04 19:29:25 +00:00
committed by Android (Google) Code Review
parent 85e3fee7d3 33525d2f1a
commit 0fd8670fd5
4 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/app/ActivityManagerInternal.java
View File

@@ -171,4 +171,12 @@ public abstract class ActivityManagerInternal {
*/
public abstract int startActivitiesAsPackage(String packageName,
int userId, Intent[] intents, Bundle bOptions);
/**
* Get the procstate for the UID. The return value will be between
* {@link ActivityManager#MIN_PROCESS_STATE} and {@link ActivityManager#MAX_PROCESS_STATE}.
* Note if the UID doesn't exist, it'll return {@link ActivityManager#PROCESS_STATE_NONEXISTENT}
* (-1).
*/
public abstract int getUidProcessState(int uid);
}

5
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -21942,6 +21942,11 @@ public final class ActivityManagerService extends ActivityManagerNative
/*resultTo*/ null, bOptions, userId);
}
}
@Override
public int getUidProcessState(int uid) {
return getUidState(uid);
}
}
private final class SleepTokenImpl extends SleepToken {

15
services/core/java/com/android/server/pm/ShortcutService.java
View File

@@ -20,6 +20,7 @@ import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UserIdInt;
import android.app.ActivityManager;
import android.app.ActivityManagerInternal;
import android.app.ActivityManagerNative;
import android.app.AppGlobals;
import android.app.IUidObserver;
@@ -284,6 +285,7 @@ public class ShortcutService extends IShortcutService.Stub {
private final PackageManagerInternal mPackageManagerInternal;
private final UserManager mUserManager;
private final UsageStatsManagerInternal mUsageStatsManagerInternal;
private final ActivityManagerInternal mActivityManagerInternal;
@GuardedBy("mLock")
final SparseIntArray mUidState = new SparseIntArray();
@@ -372,6 +374,8 @@ public class ShortcutService extends IShortcutService.Stub {
mUserManager = Preconditions.checkNotNull(context.getSystemService(UserManager.class));
mUsageStatsManagerInternal = Preconditions.checkNotNull(
LocalServices.getService(UsageStatsManagerInternal.class));
mActivityManagerInternal = Preconditions.checkNotNull(
LocalServices.getService(ActivityManagerInternal.class));
if (onlyForPackageManagerApis) {
return; // Don't do anything further. For unit tests only.
@@ -456,7 +460,8 @@ public class ShortcutService extends IShortcutService.Stub {
}
private boolean isProcessStateForeground(int processState) {
return processState <= PROCESS_STATE_FOREGROUND_THRESHOLD;
return (processState != ActivityManager.PROCESS_STATE_NONEXISTENT)
&& (processState <= PROCESS_STATE_FOREGROUND_THRESHOLD);
}
boolean isUidForegroundLocked(int uid) {
@@ -465,7 +470,13 @@ public class ShortcutService extends IShortcutService.Stub {
// so it's foreground anyway.
return true;
}
return isProcessStateForeground(mUidState.get(uid, ActivityManager.MAX_PROCESS_STATE));
// First, check with the local cache.
if (isProcessStateForeground(mUidState.get(uid, ActivityManager.MAX_PROCESS_STATE))) {
return true;
}
// If the cache says background, reach out to AM. Since it'll internally need to hold
// the AM lock, we use it as a last resort.
return isProcessStateForeground(mActivityManagerInternal.getUidProcessState(uid));
}
long getUidLastForegroundElapsedTimeLocked(int uid) {

4
services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java
View File

@@ -36,6 +36,7 @@ import static org.mockito.Mockito.when;
import android.annotation.NonNull;
import android.annotation.UserIdInt;
import android.app.Activity;
import android.app.ActivityManager;
import android.app.ActivityManagerInternal;
import android.app.IUidObserver;
import android.app.usage.UsageStatsManagerInternal;
@@ -715,6 +716,9 @@ public abstract class BaseShortcutManagerTest extends InstrumentationTestCase {
return b(mRunningUsers.get(userId)) && b(mUnlockedUsers.get(userId));
}));
when(mMockActivityManagerInternal.getUidProcessState(anyInt())).thenReturn(
ActivityManager.PROCESS_STATE_CACHED_EMPTY);
// User 0 and P0 are always running
mRunningUsers.put(USER_0, true);
mRunningUsers.put(USER_10, false);