Merge changes I616184fa,Ibc1500f5 (e0fa2c04) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/PackageManagerInternal.java

+88 −2

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

		package android.content.pm;

		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.content.ComponentName;
		import android.content.Intent;
		import android.content.pm.PackageManager.ApplicationInfoFlags;
		@@ -25,6 +28,8 @@ import android.content.pm.PackageManager.ResolveInfoFlags;
		import android.os.Bundle;
		import android.util.SparseArray;

		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.util.List;

		/**
		@@ -33,6 +38,20 @@ import java.util.List;
		* @hide Only for use within the system server.
		*/
		public abstract class PackageManagerInternal {
		public static final int PACKAGE_SYSTEM = 0;
		public static final int PACKAGE_SETUP_WIZARD = 1;
		public static final int PACKAGE_INSTALLER = 2;
		public static final int PACKAGE_VERIFIER = 3;
		public static final int PACKAGE_BROWSER = 4;
		@IntDef(value = {
		PACKAGE_SYSTEM,
		PACKAGE_SETUP_WIZARD,
		PACKAGE_INSTALLER,
		PACKAGE_VERIFIER,
		PACKAGE_BROWSER,
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface KnownPackage {}

		/**
		* Provider for package names.
		@@ -171,6 +190,13 @@ public abstract class PackageManagerInternal {
		public abstract List<ResolveInfo> queryIntentActivities(Intent intent,
		@ResolveInfoFlags int flags, int filterCallingUid, int userId);

		/**
		* Retrieve all services that can be performed for the given intent.
		* @see PackageManager#queryIntentServices(Intent, int)
		*/
		public abstract List<ResolveInfo> queryIntentServices(
		Intent intent, int flags, int callingUid, int userId);

		/**
		* Interface to {@link com.android.server.pm.PackageManagerService#getHomeActivitiesAsUser}.
		*/
		@@ -343,7 +369,7 @@ public abstract class PackageManagerInternal {
		* Resolves an activity intent, allowing instant apps to be resolved.
		*/
		public abstract ResolveInfo resolveIntent(Intent intent, String resolvedType,
		int flags, int userId);
		int flags, int userId, boolean resolveForStart);

		/**
		* Resolves a service intent, allowing instant apps to be resolved.
		@@ -351,6 +377,11 @@ public abstract class PackageManagerInternal {
		public abstract ResolveInfo resolveService(Intent intent, String resolvedType,
		int flags, int userId, int callingUid);

		/**
		* Resolves a content provider intent.
		*/
		public abstract ProviderInfo resolveContentProvider(String name, int flags, int userId);

		/**
		* Track the creator of a new isolated uid.
		* @param isolatedUid The newly created isolated uid.
		@@ -383,4 +414,59 @@ public abstract class PackageManagerInternal {
		* Updates a package last used time.
		*/
		public abstract void notifyPackageUse(String packageName, int reason);

		/**
		* Returns a package object for the given package name.
		*/
		public abstract @Nullable PackageParser.Package getPackage(@NonNull String packageName);

		/**
		* Returns a package object for the disabled system package name.
		*/
		public abstract @Nullable PackageParser.Package getDisabledPackage(@NonNull String packageName);

		/**
		* Returns whether or not the component is the resolver activity.
		*/
		public abstract boolean isResolveActivityComponent(@NonNull ComponentInfo component);

		/**
		* Returns the package name for a known package.
		*/
		public abstract @Nullable String getKnownPackageName(
		@KnownPackage int knownPackage, int userId);

		/**
		* Returns whether the package is an instant app.
		*/
		public abstract boolean isInstantApp(String packageName, int userId);

		/**
		* Returns whether the package is an instant app.
		*/
		public abstract @Nullable String getInstantAppPackageName(int uid);

		/**
		* Returns whether or not access to the application should be filtered.
		* <p>
		* Access may be limited based upon whether the calling or target applications
		* are instant applications.
		*
		* @see #canAccessInstantApps(int)
		*/
		public abstract boolean filterAppAccess(
		@Nullable PackageParser.Package pkg, int callingUid, int userId);

		/*
		* NOTE: The following methods are temporary until permissions are extracted from
		* the package manager into a component specifically for handling permissions.
		*/
		/** Returns the flags for the given permission. */
		public abstract @Nullable int getPermissionFlagsTEMP(@NonNull String permName,
		@NonNull String packageName, int userId);
		/** Updates the flags for the given permission. */
		public abstract void updatePermissionFlagsTEMP(@NonNull String permName,
		@NonNull String packageName, int flagMask, int flagValues, int userId);
		/** temporary until mPermissionTrees is moved to PermissionManager */
		public abstract Object enforcePermissionTreeTEMP(@NonNull String permName, int callingUid);
		}

core/java/android/os/UserManagerInternal.java

+11 −1

Original line number	Diff line number	Diff line
		@@ -154,10 +154,20 @@ public abstract class UserManagerInternal {
		public abstract boolean isUserUnlocked(int userId);

		/**
		* Return whether the given user is running
		* Returns whether the given user is running
		*/
		public abstract boolean isUserRunning(int userId);

		/**
		* Returns whether the given user is initialized
		*/
		public abstract boolean isUserInitialized(int userId);

		/**
		* Returns whether the given user exists
		*/
		public abstract boolean exists(int userId);

		/**
		* Set user's running state
		*/

services/core/java/com/android/server/LocationManagerService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@ package com.android.server;

		import android.app.ActivityManager;
		import android.annotation.NonNull;
		import android.content.pm.PackageManagerInternal;
		import android.util.ArrayMap;
		import android.util.ArraySet;
		import com.android.internal.content.PackageMonitor;
		@@ -56,6 +55,7 @@ import android.content.IntentFilter;
		import android.content.pm.ApplicationInfo;
		import android.content.pm.PackageInfo;
		import android.content.pm.PackageManager;
		import android.content.pm.PackageManagerInternal;
		import android.content.pm.PackageManager.NameNotFoundException;
		import android.content.pm.ResolveInfo;
		import android.content.pm.Signature;

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -263,8 +263,8 @@ import android.content.pm.IPackageManager;
		import android.content.pm.InstrumentationInfo;
		import android.content.pm.PackageInfo;
		import android.content.pm.PackageManager;
		import android.content.pm.PackageManager.NameNotFoundException;
		import android.content.pm.PackageManagerInternal;
		import android.content.pm.PackageManager.NameNotFoundException;
		import android.content.pm.ParceledListSlice;
		import android.content.pm.PathPermission;
		import android.content.pm.PermissionInfo;

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1235,7 +1235,7 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D
		synchronized (mService) {
		return mService.getPackageManagerInternalLocked().resolveIntent(intent, resolvedType,
		PackageManager.MATCH_INSTANT \| PackageManager.MATCH_DEFAULT_ONLY \| flags
		\| ActivityManagerService.STOCK_PM_FLAGS, userId);
		\| ActivityManagerService.STOCK_PM_FLAGS, userId, true);
		}
		}