Merge "Add SystemApis to expose runtime profile information" (d3392daa) · Commits · e / os / android_frameworks_base

Android.bp

+2 −0

Original line number	Diff line number	Diff line
		@@ -134,6 +134,8 @@ java_library {
		"core/java/android/content/pm/IPackageStatsObserver.aidl",
		"core/java/android/content/pm/IPinItemRequest.aidl",
		"core/java/android/content/pm/IShortcutService.aidl",
		"core/java/android/content/pm/dex/IArtManager.aidl",
		"core/java/android/content/pm/dex/ISnapshotRuntimeProfileCallback.aidl",
		"core/java/android/content/pm/permission/IRuntimePermissionPresenter.aidl",
		"core/java/android/database/IContentObserver.aidl",
		":libcamera_client_aidl",

api/system-current.txt

+20 −0

Original line number	Diff line number	Diff line
		@@ -126,6 +126,7 @@ package android {
		field public static final java.lang.String READ_PRINT_SERVICES = "android.permission.READ_PRINT_SERVICES";
		field public static final java.lang.String READ_PRINT_SERVICE_RECOMMENDATIONS = "android.permission.READ_PRINT_SERVICE_RECOMMENDATIONS";
		field public static final java.lang.String READ_PRIVILEGED_PHONE_STATE = "android.permission.READ_PRIVILEGED_PHONE_STATE";
		field public static final java.lang.String READ_RUNTIME_PROFILES = "android.permission.READ_RUNTIME_PROFILES";
		field public static final java.lang.String READ_SEARCH_INDEXABLES = "android.permission.READ_SEARCH_INDEXABLES";
		field public static final java.lang.String READ_WALLPAPER_INTERNAL = "android.permission.READ_WALLPAPER_INTERNAL";
		field public static final java.lang.String READ_WIFI_CREDENTIAL = "android.permission.READ_WIFI_CREDENTIAL";
		@@ -843,6 +844,7 @@ package android.content.pm {
		public abstract class PackageManager {
		method public abstract void addOnPermissionsChangeListener(android.content.pm.PackageManager.OnPermissionsChangedListener);
		method public abstract java.util.List<android.content.IntentFilter> getAllIntentFilters(java.lang.String);
		method public android.content.pm.dex.ArtManager getArtManager();
		method public abstract java.lang.String getDefaultBrowserPackageNameAsUser(int);
		method public abstract java.util.List<android.content.pm.PackageInfo> getInstalledPackagesAsUser(int, int);
		method public abstract android.graphics.drawable.Drawable getInstantAppIcon(java.lang.String);
		@@ -950,6 +952,24 @@ package android.content.pm {

		}

		package android.content.pm.dex {

		public class ArtManager {
		method public boolean isRuntimeProfilingEnabled();
		method public void snapshotRuntimeProfile(java.lang.String, java.lang.String, android.content.pm.dex.ArtManager.SnapshotRuntimeProfileCallback, android.os.Handler);
		field public static final int SNAPSHOT_FAILED_CODE_PATH_NOT_FOUND = 1; // 0x1
		field public static final int SNAPSHOT_FAILED_INTERNAL_ERROR = 2; // 0x2
		field public static final int SNAPSHOT_FAILED_PACKAGE_NOT_FOUND = 0; // 0x0
		}

		public static abstract class ArtManager.SnapshotRuntimeProfileCallback {
		ctor public ArtManager.SnapshotRuntimeProfileCallback();
		method public abstract void onError(int);
		method public abstract void onSuccess(android.os.ParcelFileDescriptor);
		}

		}

		package android.content.pm.permission {

		public final class RuntimePermissionPresentationInfo implements android.os.Parcelable {

core/java/android/app/ApplicationPackageManager.java

+17 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,7 @@ import android.content.pm.ServiceInfo;
		import android.content.pm.SharedLibraryInfo;
		import android.content.pm.VerifierDeviceIdentity;
		import android.content.pm.VersionedPackage;
		import android.content.pm.dex.ArtManager;
		import android.content.res.Resources;
		import android.content.res.XmlResourceParser;
		import android.graphics.Bitmap;
		@@ -121,6 +122,8 @@ public class ApplicationPackageManager extends PackageManager {
		private UserManager mUserManager;
		@GuardedBy("mLock")
		private PackageInstaller mInstaller;
		@GuardedBy("mLock")
		private ArtManager mArtManager;

		@GuardedBy("mDelegates")
		private final ArrayList<MoveCallbackDelegate> mDelegates = new ArrayList<>();
		@@ -2750,4 +2753,18 @@ public class ApplicationPackageManager extends PackageManager {
		throw e.rethrowAsRuntimeException();
		}
		}

		@Override
		public ArtManager getArtManager() {
		synchronized (mLock) {
		if (mArtManager == null) {
		try {
		mArtManager = new ArtManager(mPM.getArtManager());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}
		return mArtManager;
		}
		}
		}

core/java/android/content/pm/IPackageManager.aidl

+3 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,7 @@ import android.content.pm.ServiceInfo;
		import android.content.pm.UserInfo;
		import android.content.pm.VerifierDeviceIdentity;
		import android.content.pm.VersionedPackage;
		import android.content.pm.dex.IArtManager;
		import android.graphics.Bitmap;
		import android.net.Uri;
		import android.os.Bundle;
		@@ -657,4 +658,6 @@ interface IPackageManager {
		ComponentName getInstantAppInstallerComponent();

		String getInstantAppAndroidId(String packageName, int userId);

		IArtManager getArtManager();
		}

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

+11 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@ import android.content.Intent;
		import android.content.IntentFilter;
		import android.content.IntentSender;
		import android.content.pm.PackageParser.PackageParserException;
		import android.content.pm.dex.ArtManager;
		import android.content.res.Resources;
		import android.content.res.XmlResourceParser;
		import android.graphics.Rect;
		@@ -5842,4 +5843,14 @@ public abstract class PackageManager {
		@SystemApi
		public abstract void registerDexModule(String dexModulePath,
		@Nullable DexModuleRegisterCallback callback);

		/**
		* Returns the {@link ArtManager} associated with this package manager.
		*
		* @hide
		*/
		@SystemApi
		public @NonNull ArtManager getArtManager() {
		throw new UnsupportedOperationException("getArtManager not implemented in subclass");
		}
		}