Merge "Support CATEGORY_LEANBACK_LAUNCHER on tv devices." into pi-dev (f3f86dd0) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java

+241 −143

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.settingslib.applications;

		import android.annotation.IntDef;
		import android.app.ActivityManager;
		import android.app.AppGlobals;
		import android.app.Application;
		@@ -59,6 +60,8 @@ import com.android.internal.util.ArrayUtils;

		import java.io.File;
		import java.io.IOException;
		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.text.Collator;
		import java.text.Normalizer;
		import java.text.Normalizer.Form;
		@@ -135,6 +138,38 @@ public class ApplicationsState {
		final BackgroundHandler mBackgroundHandler;
		final MainHandler mMainHandler = new MainHandler(Looper.getMainLooper());

		/** Requests that the home app is loaded. */
		public static final int FLAG_SESSION_REQUEST_HOME_APP = 1 << 0;

		/** Requests that icons are loaded. */
		public static final int FLAG_SESSION_REQUEST_ICONS = 1 << 1;

		/** Requests that sizes are loaded. */
		public static final int FLAG_SESSION_REQUEST_SIZES = 1 << 2;

		/** Requests that launcher intents are resolved. */
		public static final int FLAG_SESSION_REQUEST_LAUNCHER = 1 << 3;

		/** Requests that leanback launcher intents are resolved. */
		public static final int FLAG_SESSION_REQUEST_LEANBACK_LAUNCHER = 1 << 4;

		/**
		* Flags to configure the session to request various types of info.
		*/
		@IntDef(prefix = { "FLAG_SESSION_" }, value = {
		FLAG_SESSION_REQUEST_HOME_APP,
		FLAG_SESSION_REQUEST_ICONS,
		FLAG_SESSION_REQUEST_SIZES,
		FLAG_SESSION_REQUEST_LAUNCHER,
		FLAG_SESSION_REQUEST_LEANBACK_LAUNCHER
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface SessionFlags {}

		public static final @SessionFlags int DEFAULT_SESSION_FLAGS =
		FLAG_SESSION_REQUEST_HOME_APP \| FLAG_SESSION_REQUEST_ICONS \|
		FLAG_SESSION_REQUEST_SIZES \| FLAG_SESSION_REQUEST_LAUNCHER;

		private ApplicationsState(Application app) {
		mContext = app;
		mPm = mContext.getPackageManager();
		@@ -265,7 +300,8 @@ public class ApplicationsState {
		}
		}

		private void clearEntries() {
		@VisibleForTesting
		void clearEntries() {
		for (int i = 0; i < mEntriesMap.size(); i++) {
		mEntriesMap.valueAt(i).clear();
		}
		@@ -346,7 +382,7 @@ public class ApplicationsState {
		if (DEBUG_LOCKING) Log.v(TAG, "requestSize about to acquire lock...");
		synchronized (mEntriesMap) {
		AppEntry entry = mEntriesMap.get(userId).get(packageName);
		if (entry != null && (entry.info.flags & ApplicationInfo.FLAG_INSTALLED) != 0) {
		if (entry != null && hasFlag(entry.info.flags, ApplicationInfo.FLAG_INSTALLED)) {
		mBackgroundHandler.post(
		() -> {
		try {
		@@ -595,6 +631,7 @@ public class ApplicationsState {
		}

		public class Session implements LifecycleObserver {

		final Callbacks mCallbacks;
		boolean mResumed;

		@@ -609,6 +646,7 @@ public class ApplicationsState {
		boolean mRebuildForeground;

		private final boolean mHasLifecycle;
		@SessionFlags private int mFlags = DEFAULT_SESSION_FLAGS;

		Session(Callbacks callbacks, Lifecycle lifecycle) {
		mCallbacks = callbacks;
		@@ -620,6 +658,14 @@ public class ApplicationsState {
		}
		}

		public @SessionFlags int getSessionFlags() {
		return mFlags;
		}

		public void setSessionFlags(@SessionFlags int flags) {
		mFlags = flags;
		}

		@OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
		public void onResume() {
		if (DEBUG_LOCKING) Log.v(TAG, "resume about to acquire lock...");
		@@ -833,10 +879,11 @@ public class ApplicationsState {
		private class BackgroundHandler extends Handler {
		static final int MSG_REBUILD_LIST = 1;
		static final int MSG_LOAD_ENTRIES = 2;
		static final int MSG_LOAD_ICONS = 3;
		static final int MSG_LOAD_SIZES = 4;
		static final int MSG_LOAD_LAUNCHER = 5;
		static final int MSG_LOAD_HOME_APP = 6;
		static final int MSG_LOAD_HOME_APP = 3;
		static final int MSG_LOAD_LAUNCHER = 4;
		static final int MSG_LOAD_LEANBACK_LAUNCHER = 5;
		static final int MSG_LOAD_ICONS = 6;
		static final int MSG_LOAD_SIZES = 7;

		boolean mRunning;

		@@ -860,6 +907,8 @@ public class ApplicationsState {
		}
		}

		int flags = getCombinedSessionFlags(mSessions);

		switch (msg.what) {
		case MSG_REBUILD_LIST: {
		} break;
		@@ -889,8 +938,8 @@ public class ApplicationsState {
		// happens because of the way we generate the list in
		// doResumeIfNeededLocked.
		AppEntry entry = mEntriesMap.get(0).get(info.packageName);
		if (entry != null &&
		(entry.info.flags & ApplicationInfo.FLAG_INSTALLED) == 0) {
		if (entry != null && !hasFlag(entry.info.flags,
		ApplicationInfo.FLAG_INSTALLED)) {
		mEntriesMap.get(0).remove(info.packageName);
		mAppEntries.remove(entry);
		}
		@@ -909,13 +958,15 @@ public class ApplicationsState {
		}
		} break;
		case MSG_LOAD_HOME_APP: {
		if (hasFlag(flags, FLAG_SESSION_REQUEST_HOME_APP)) {
		final List<ResolveInfo> homeActivities = new ArrayList<>();
		mPm.getHomeActivities(homeActivities);
		synchronized (mEntriesMap) {
		final int entryCount = mEntriesMap.size();
		for (int i = 0; i < entryCount; i++) {
		if (DEBUG_LOCKING) Log.v(TAG, "MSG_LOAD_HOME_APP acquired lock");
		final HashMap<String, AppEntry> userEntries = mEntriesMap.valueAt(i);
		final HashMap<String, AppEntry> userEntries = mEntriesMap.valueAt(
		i);
		for (ResolveInfo activity : homeActivities) {
		String packageName = activity.activityInfo.packageName;
		AppEntry entry = userEntries.get(packageName);
		@@ -926,17 +977,25 @@ public class ApplicationsState {
		if (DEBUG_LOCKING) Log.v(TAG, "MSG_LOAD_HOME_APP releasing lock");
		}
		}
		sendEmptyMessage(MSG_LOAD_LAUNCHER);
		}
		break;
		case MSG_LOAD_LAUNCHER: {
		Intent launchIntent = new Intent(Intent.ACTION_MAIN, null)
		.addCategory(Intent.CATEGORY_LAUNCHER);
		sendEmptyMessage(MSG_LOAD_LAUNCHER);
		} break;
		case MSG_LOAD_LAUNCHER:
		case MSG_LOAD_LEANBACK_LAUNCHER: {
		if ((msg.what == MSG_LOAD_LAUNCHER &&
		hasFlag(flags, FLAG_SESSION_REQUEST_LAUNCHER))
		\|\| (msg.what == MSG_LOAD_LEANBACK_LAUNCHER &&
		hasFlag(flags, FLAG_SESSION_REQUEST_LEANBACK_LAUNCHER))) {

		Intent launchIntent = new Intent(Intent.ACTION_MAIN, null);
		launchIntent.addCategory(msg.what == MSG_LOAD_LAUNCHER
		? Intent.CATEGORY_LAUNCHER : Intent.CATEGORY_LEANBACK_LAUNCHER);
		for (int i = 0; i < mEntriesMap.size(); i++) {
		int userId = mEntriesMap.keyAt(i);
		// If we do not specify MATCH_DIRECT_BOOT_AWARE or
		// MATCH_DIRECT_BOOT_UNAWARE, system will derive and update the flags
		// according to the user's lock state. When the user is locked, components
		// according to the user's lock state. When the user is locked,
		// components
		// with ComponentInfo#directBootAware == false will be filtered. We should
		// explicitly include both direct boot aware and unaware components here.
		List<ResolveInfo> intents = mPm.queryIntentActivitiesAsUser(
		@@ -951,10 +1010,13 @@ public class ApplicationsState {
		HashMap<String, AppEntry> userEntries = mEntriesMap.valueAt(i);
		final int N = intents.size();
		for (int j = 0; j < N; j++) {
		String packageName = intents.get(j).activityInfo.packageName;
		ResolveInfo resolveInfo = intents.get(j);
		String packageName = resolveInfo.activityInfo.packageName;
		AppEntry entry = userEntries.get(packageName);
		if (entry != null) {
		entry.hasLauncherEntry = true;
		entry.launcherEntryEnabled \|=
		resolveInfo.activityInfo.enabled;
		} else {
		Log.w(TAG, "Cannot find pkg: " + packageName
		+ " on user " + userId);
		@@ -967,9 +1029,15 @@ public class ApplicationsState {
		if (!mMainHandler.hasMessages(MainHandler.MSG_LAUNCHER_INFO_CHANGED)) {
		mMainHandler.sendEmptyMessage(MainHandler.MSG_LAUNCHER_INFO_CHANGED);
		}
		}
		if (msg.what == MSG_LOAD_LAUNCHER) {
		sendEmptyMessage(MSG_LOAD_LEANBACK_LAUNCHER);
		} else {
		sendEmptyMessage(MSG_LOAD_ICONS);
		}
		} break;
		case MSG_LOAD_ICONS: {
		if (hasFlag(flags, FLAG_SESSION_REQUEST_ICONS)) {
		int numDone = 0;
		synchronized (mEntriesMap) {
		if (DEBUG_LOCKING) Log.v(TAG, "MSG_LOAD_ICONS acquired lock");
		@@ -998,22 +1066,25 @@ public class ApplicationsState {
		}
		if (numDone >= 2) {
		sendEmptyMessage(MSG_LOAD_ICONS);
		} else {
		sendEmptyMessage(MSG_LOAD_SIZES);
		break;
		}
		}
		sendEmptyMessage(MSG_LOAD_SIZES);
		} break;
		case MSG_LOAD_SIZES: {
		if (hasFlag(flags, FLAG_SESSION_REQUEST_SIZES)) {
		synchronized (mEntriesMap) {
		if (DEBUG_LOCKING) Log.v(TAG, "MSG_LOAD_SIZES acquired lock");
		if (mCurComputingSizePkg != null) {
		if (DEBUG_LOCKING) Log.v(TAG, "MSG_LOAD_SIZES releasing: currently computing");
		if (DEBUG_LOCKING) Log.v(TAG,
		"MSG_LOAD_SIZES releasing: currently computing");
		return;
		}

		long now = SystemClock.uptimeMillis();
		for (int i = 0; i < mAppEntries.size(); i++) {
		AppEntry entry = mAppEntries.get(i);
		if ((entry.info.flags & ApplicationInfo.FLAG_INSTALLED) != 0
		if (hasFlag(entry.info.flags, ApplicationInfo.FLAG_INSTALLED)
		&& (entry.size == SIZE_UNKNOWN \|\| entry.sizeStale)) {
		if (entry.sizeLoadStart == 0 \|\|
		(entry.sizeLoadStart < (now - 20 * 1000))) {
		@@ -1026,20 +1097,26 @@ public class ApplicationsState {
		entry.sizeLoadStart = now;
		mCurComputingSizeUuid = entry.info.storageUuid;
		mCurComputingSizePkg = entry.info.packageName;
		mCurComputingSizeUserId = UserHandle.getUserId(entry.info.uid);
		mCurComputingSizeUserId = UserHandle.getUserId(
		entry.info.uid);

		mBackgroundHandler.post(() -> {
		try {
		final StorageStats stats = mStats.queryStatsForPackage(
		mCurComputingSizeUuid, mCurComputingSizePkg,
		UserHandle.of(mCurComputingSizeUserId));
		final StorageStats stats =
		mStats.queryStatsForPackage(
		mCurComputingSizeUuid,
		mCurComputingSizePkg,
		UserHandle.of(
		mCurComputingSizeUserId));
		final PackageStats legacy = new PackageStats(
		mCurComputingSizePkg, mCurComputingSizeUserId);
		mCurComputingSizePkg,
		mCurComputingSizeUserId);
		legacy.codeSize = stats.getCodeBytes();
		legacy.dataSize = stats.getDataBytes();
		legacy.cacheSize = stats.getCacheBytes();
		try {
		mStatsObserver.onGetStatsCompleted(legacy, true);
		mStatsObserver.onGetStatsCompleted(legacy,
		true);
		} catch (RemoteException ignored) {
		}
		} catch (NameNotFoundException \| IOException e) {
		@@ -1052,7 +1129,8 @@ public class ApplicationsState {

		});
		}
		if (DEBUG_LOCKING) Log.v(TAG, "MSG_LOAD_SIZES releasing: now computing");
		if (DEBUG_LOCKING) Log.v(TAG,
		"MSG_LOAD_SIZES releasing: now computing");
		return;
		}
		}
		@@ -1065,10 +1143,21 @@ public class ApplicationsState {
		}
		if (DEBUG_LOCKING) Log.v(TAG, "MSG_LOAD_SIZES releasing lock");
		}
		}
		} break;
		}
		}

		private @SessionFlags int getCombinedSessionFlags(List<Session> sessions) {
		synchronized (mEntriesMap) {
		int flags = 0;
		for (Session session : sessions) {
		flags \|= session.mFlags;
		}
		return flags;
		}
		}

		final IPackageStatsObserver.Stub mStatsObserver = new IPackageStatsObserver.Stub() {
		public void onGetStatsCompleted(PackageStats stats, boolean succeeded) {
		if (!succeeded) {
		@@ -1256,6 +1345,11 @@ public class ApplicationsState {
		*/
		public boolean hasLauncherEntry;

		/**
		* Whether the component that has a launcher intent filter is enabled.
		*/
		public boolean launcherEntryEnabled;

		/**
		* Whether or not it's a Home app.
		*/
		@@ -1283,7 +1377,7 @@ public class ApplicationsState {
		// A location where extra info can be placed to be used by custom filters.
		public Object extraInfo;

		@VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
		@VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
		public AppEntry(Context context, ApplicationInfo info, long id) {
		apkFile = new File(info.sourceDir);
		this.id = id;
		@@ -1336,6 +1430,10 @@ public class ApplicationsState {
		}
		}

		private static boolean hasFlag(int flags, int flag) {
		return (flags & flag) != 0;
		}

		/**
		* Compare by label, then package name, then uid.
		*/
		@@ -1449,13 +1547,13 @@ public class ApplicationsState {
		public boolean filterApp(AppEntry entry) {
		if (AppUtils.isInstant(entry.info)) {
		return false;
		} else if ((entry.info.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0) {
		} else if (hasFlag(entry.info.flags, ApplicationInfo.FLAG_UPDATED_SYSTEM_APP)) {
		return true;
		} else if ((entry.info.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
		} else if (!hasFlag(entry.info.flags, ApplicationInfo.FLAG_SYSTEM)) {
		return true;
		} else if (entry.hasLauncherEntry) {
		return true;
		} else if ((entry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0 && entry.isHomeApp) {
		} else if (hasFlag(entry.info.flags, ApplicationInfo.FLAG_SYSTEM) && entry.isHomeApp) {
		return true;
		}
		return false;
		@@ -1486,9 +1584,9 @@ public class ApplicationsState {

		@Override
		public boolean filterApp(AppEntry entry) {
		if ((entry.info.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0) {
		if (hasFlag(entry.info.flags, ApplicationInfo.FLAG_UPDATED_SYSTEM_APP)) {
		return true;
		} else if ((entry.info.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
		} else if (!hasFlag(entry.info.flags, ApplicationInfo.FLAG_SYSTEM)) {
		return true;
		}
		return false;
		@@ -1547,7 +1645,7 @@ public class ApplicationsState {
		@Override
		public boolean filterApp(AppEntry entry) {
		return !AppUtils.isInstant(entry.info)
		&& (entry.info.privateFlags & ApplicationInfo.PRIVATE_FLAG_HAS_DOMAIN_URLS) != 0;
		&& hasFlag(entry.info.privateFlags, ApplicationInfo.PRIVATE_FLAG_HAS_DOMAIN_URLS);
		}
		};

		@@ -1589,7 +1687,7 @@ public class ApplicationsState {
		// TODO: Update for the new game category.
		boolean isGame;
		synchronized (info.info) {
		isGame = ((info.info.flags & ApplicationInfo.FLAG_IS_GAME) != 0)
		isGame = hasFlag(info.info.flags, ApplicationInfo.FLAG_IS_GAME)
		\|\| info.info.category == ApplicationInfo.CATEGORY_GAME;
		}
		return isGame;

packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/ApplicationsStateRoboTest.java

0 → 100644

+303 −0

File added.

Preview size limit exceeded, changes collapsed.

packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils/shadow/ShadowUserManager.java

+18 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package com.android.settingslib.testutils.shadow;

		import android.content.Context;
		import android.content.pm.UserInfo;
		import android.os.UserManager;

		import org.robolectric.RuntimeEnvironment;
		@@ -25,6 +26,9 @@ import org.robolectric.annotation.Implements;
		import org.robolectric.annotation.Resetter;
		import org.robolectric.shadow.api.Shadow;

		import java.util.ArrayList;
		import java.util.List;

		@Implements(value = UserManager.class, inheritImplementationMethods = true)
		public class ShadowUserManager extends org.robolectric.shadows.ShadowUserManager {

		@@ -49,6 +53,20 @@ public class ShadowUserManager extends org.robolectric.shadows.ShadowUserManager
		return (UserManager) context.getSystemService(Context.USER_SERVICE);
		}

		@Implementation
		public int[] getProfileIdsWithDisabled(int userId) {
		return new int[] { 0 };
		}

		@Implementation
		public List<UserInfo> getProfiles() {
		UserInfo userInfo = new UserInfo();
		userInfo.id = 0;
		List<UserInfo> userInfos = new ArrayList<>();
		userInfos.add(userInfo);
		return userInfos;
		}

		public static ShadowUserManager getShadow() {
		return (ShadowUserManager) Shadow.extract(
		RuntimeEnvironment.application.getSystemService(UserManager.class));