Merge "Clean up AndroidPackageApi" (14da7def) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/PackageManager.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -329,7 +329,8 @@ public abstract class PackageManager {
		* @hide
		*/
		public Bundle toBundle(Bundle outBundle) {
		final Bundle b = outBundle == null ? new Bundle() : outBundle;
		final Bundle b = outBundle == null \|\| outBundle == Bundle.EMPTY
		? new Bundle() : outBundle;
		if (mType == TYPE_BOOLEAN) {
		b.putBoolean(mName, mBooleanValue);
		} else if (mType == TYPE_FLOAT) {

services/core/java/com/android/server/am/BroadcastQueue.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -67,6 +67,7 @@ import android.util.SparseIntArray;
		import android.util.TimeUtils;
		import android.util.proto.ProtoOutputStream;

		import com.android.internal.util.ArrayUtils;
		import com.android.internal.util.FrameworkStatsLog;

		import java.io.FileDescriptor;
		@@ -1832,7 +1833,7 @@ public final class BroadcastQueue {

		private boolean noteOpForManifestReceiver(int appOp, BroadcastRecord r, ResolveInfo info,
		ComponentName component) {
		if (info.activityInfo.attributionTags == null) {
		if (ArrayUtils.isEmpty(info.activityInfo.attributionTags)) {
		return noteOpForManifestReceiverInner(appOp, r, info, component, null);
		} else {
		// Attribution tags provided, noteOp each tag

services/core/java/com/android/server/integrity/AppIntegrityManagerServiceImpl.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -69,7 +69,7 @@ import com.android.server.integrity.model.RuleMetadata;
		import com.android.server.pm.parsing.PackageInfoUtils;
		import com.android.server.pm.parsing.PackageParser2;
		import com.android.server.pm.parsing.pkg.ParsedPackage;
		import com.android.server.pm.pkg.PackageUserState;
		import com.android.server.pm.pkg.PackageUserStateInternal;

		import java.io.ByteArrayInputStream;
		import java.io.File;
		@@ -598,7 +598,7 @@ public class AppIntegrityManagerServiceImpl extends IAppIntegrityManager.Stub {
		0,
		0,
		null,
		PackageUserState.DEFAULT,
		PackageUserStateInternal.DEFAULT,
		UserHandle.getCallingUserId(),
		null);
		} catch (Exception e) {

services/core/java/com/android/server/pm/ComponentResolver.java

+16 −17

Original line number	Diff line number	Diff line
		@@ -36,14 +36,6 @@ import android.content.pm.PackageManagerInternal;
		import android.content.pm.ProviderInfo;
		import android.content.pm.ResolveInfo;
		import android.content.pm.ServiceInfo;
		import com.android.server.pm.pkg.component.ComponentMutateUtils;
		import com.android.server.pm.pkg.component.ParsedActivity;
		import com.android.server.pm.pkg.component.ParsedComponent;
		import com.android.server.pm.pkg.component.ParsedIntentInfo;
		import com.android.server.pm.pkg.component.ParsedMainComponent;
		import com.android.server.pm.pkg.component.ParsedProvider;
		import com.android.server.pm.pkg.component.ParsedProviderImpl;
		import com.android.server.pm.pkg.component.ParsedService;
		import android.os.UserHandle;
		import android.util.ArrayMap;
		import android.util.ArraySet;
		@@ -62,7 +54,15 @@ import com.android.server.pm.parsing.PackageInfoUtils.CachedApplicationInfoGener
		import com.android.server.pm.parsing.pkg.AndroidPackage;
		import com.android.server.pm.parsing.pkg.AndroidPackageUtils;
		import com.android.server.pm.pkg.PackageStateInternal;
		import com.android.server.pm.pkg.PackageUserState;
		import com.android.server.pm.pkg.PackageUserStateInternal;
		import com.android.server.pm.pkg.component.ComponentMutateUtils;
		import com.android.server.pm.pkg.component.ParsedActivity;
		import com.android.server.pm.pkg.component.ParsedComponent;
		import com.android.server.pm.pkg.component.ParsedIntentInfo;
		import com.android.server.pm.pkg.component.ParsedMainComponent;
		import com.android.server.pm.pkg.component.ParsedProvider;
		import com.android.server.pm.pkg.component.ParsedProviderImpl;
		import com.android.server.pm.pkg.component.ParsedService;
		import com.android.server.utils.Snappable;
		import com.android.server.utils.SnapshotCache;
		import com.android.server.utils.WatchableImpl;
		@@ -380,14 +380,13 @@ public class ComponentResolver
		continue;
		}
		// See PM.queryContentProviders()'s javadoc for why we have the metaData parameter.
		if (metaDataKey != null
		&& (p.getMetaData() == null \|\| !p.getMetaData().containsKey(metaDataKey))) {
		if (metaDataKey != null && !p.getMetaData().containsKey(metaDataKey)) {
		continue;
		}
		if (appInfoGenerator == null) {
		appInfoGenerator = new CachedApplicationInfoGenerator();
		}
		final PackageUserState state = ps.getUserStateOrDefault(userId);
		final PackageUserStateInternal state = ps.getUserStateOrDefault(userId);
		final ApplicationInfo appInfo =
		appInfoGenerator.generate(pkg, flags, state, userId, ps);
		if (appInfo == null) {
		@@ -424,7 +423,7 @@ public class ComponentResolver
		if (pkg == null) {
		return null;
		}
		final PackageUserState state = ps.getUserStateOrDefault(userId);
		final PackageUserStateInternal state = ps.getUserStateOrDefault(userId);
		ApplicationInfo appInfo = PackageInfoUtils.generateApplicationInfo(
		pkg, flags, state, userId, ps);
		if (appInfo == null) {
		@@ -461,7 +460,7 @@ public class ComponentResolver
		if (appInfoGenerator == null) {
		appInfoGenerator = new CachedApplicationInfoGenerator();
		}
		final PackageUserState state = ps.getUserStateOrDefault(userId);
		final PackageUserStateInternal state = ps.getUserStateOrDefault(userId);
		final ApplicationInfo appInfo =
		appInfoGenerator.generate(pkg, 0, state, userId, ps);
		if (appInfo == null) {
		@@ -1537,7 +1536,7 @@ public class ComponentResolver
		}
		return null;
		}
		final PackageUserState userState = ps.getUserStateOrDefault(userId);
		final PackageUserStateInternal userState = ps.getUserStateOrDefault(userId);
		ActivityInfo ai = PackageInfoUtils.generateActivityInfo(pkg, activity, mFlags,
		userState, userId, ps);
		if (ai == null) {
		@@ -1854,7 +1853,7 @@ public class ComponentResolver
		if (ps == null) {
		return null;
		}
		final PackageUserState userState = ps.getUserStateOrDefault(userId);
		final PackageUserStateInternal userState = ps.getUserStateOrDefault(userId);
		final boolean matchVisibleToInstantApp = (mFlags
		& PackageManager.MATCH_VISIBLE_TO_INSTANT_APP_ONLY) != 0;
		final boolean isInstantApp = (mFlags & PackageManager.MATCH_INSTANT) != 0;
		@@ -2099,7 +2098,7 @@ public class ComponentResolver
		if (ps == null) {
		return null;
		}
		final PackageUserState userState = ps.getUserStateOrDefault(userId);
		final PackageUserStateInternal userState = ps.getUserStateOrDefault(userId);
		ServiceInfo si = PackageInfoUtils.generateServiceInfo(pkg, service, mFlags,
		userState, userId, ps);
		if (si == null) {

services/core/java/com/android/server/pm/ComputerEngine.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -823,7 +823,7 @@ public class ComputerEngine implements Computer {
		}
		if (resolveComponentName().equals(component)) {
		return PackageInfoWithoutStateUtils.generateDelegateActivityInfo(mResolveActivity,
		flags, PackageUserState.DEFAULT, userId);
		flags, PackageUserStateInternal.DEFAULT, userId);
		}
		return null;
		}
		@@ -1547,7 +1547,7 @@ public class ComputerEngine implements Computer {
		flags \|= MATCH_ANY_USER;
		}

		final PackageUserState state = ps.getUserStateOrDefault(userId);
		final PackageUserStateInternal state = ps.getUserStateOrDefault(userId);
		AndroidPackage p = ps.getPkg();
		if (p != null) {
		// Compute GIDs only if requested
		@@ -3548,7 +3548,7 @@ public class ComputerEngine implements Computer {
		if (shouldFilterApplication(ps, callingUid, userId)) {
		return false;
		}
		final PackageUserState state = ps.getUserStateOrDefault(userId);
		final PackageUserStateInternal state = ps.getUserStateOrDefault(userId);
		if (state != null) {
		return PackageUserStateUtils.isAvailable(state, 0);
		}
		@@ -4011,7 +4011,7 @@ public class ComputerEngine implements Computer {
		ps, callingUid, component, TYPE_PROVIDER, userId)) {
		return null;
		}
		PackageUserState state = ps.getUserStateOrDefault(userId);
		PackageUserStateInternal state = ps.getUserStateOrDefault(userId);
		final ApplicationInfo appInfo =
		PackageInfoUtils.generateApplicationInfo(ps.getPkg(), flags, state, userId, ps);
		if (appInfo == null) {