Snap for 5612356 from 8b486b7870ecc32d9c5a627b8cef61043e60347e to qt-release (0a3399c9) · Commits · e / os / android_frameworks_base

api/test-current.txt

+16 −0

Original line number	Diff line number	Diff line
		@@ -645,6 +645,7 @@ package android.content {
		method public void setAutofillOptions(@Nullable android.content.AutofillOptions);
		method public void setContentCaptureOptions(@Nullable android.content.ContentCaptureOptions);
		field public static final String BUGREPORT_SERVICE = "bugreport";
		field public static final String CONTENT_CAPTURE_MANAGER_SERVICE = "content_capture";
		field public static final String ROLLBACK_SERVICE = "rollback";
		field public static final String STATUS_BAR_SERVICE = "statusbar";
		field public static final String TEST_NETWORK_SERVICE = "test_network";
		@@ -2161,6 +2162,7 @@ package android.os.strictmode {
		package android.permission {

		public final class PermissionControllerManager {
		method @RequiresPermission("android.permission.GET_RUNTIME_PERMISSIONS") public void getAppPermissions(@NonNull String, @NonNull android.permission.PermissionControllerManager.OnGetAppPermissionResultCallback, @Nullable android.os.Handler);
		method @RequiresPermission("android.permission.REVOKE_RUNTIME_PERMISSIONS") public void revokeRuntimePermissions(@NonNull java.util.Map<java.lang.String,java.util.List<java.lang.String>>, boolean, int, @NonNull java.util.concurrent.Executor, @NonNull android.permission.PermissionControllerManager.OnRevokeRuntimePermissionsCallback);
		field public static final int COUNT_ONLY_WHEN_GRANTED = 1; // 0x1
		field public static final int COUNT_WHEN_SYSTEM = 2; // 0x2
		@@ -2168,11 +2170,25 @@ package android.permission {
		field public static final int REASON_MALWARE = 1; // 0x1
		}

		public static interface PermissionControllerManager.OnGetAppPermissionResultCallback {
		method public void onGetAppPermissions(@NonNull java.util.List<android.permission.RuntimePermissionPresentationInfo>);
		}

		public abstract static class PermissionControllerManager.OnRevokeRuntimePermissionsCallback {
		ctor public PermissionControllerManager.OnRevokeRuntimePermissionsCallback();
		method public abstract void onRevokeRuntimePermissions(@NonNull java.util.Map<java.lang.String,java.util.List<java.lang.String>>);
		}

		public final class RuntimePermissionPresentationInfo implements android.os.Parcelable {
		ctor public RuntimePermissionPresentationInfo(@NonNull CharSequence, boolean, boolean);
		method public int describeContents();
		method @NonNull public CharSequence getLabel();
		method public boolean isGranted();
		method public boolean isStandard();
		method public void writeToParcel(android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.permission.RuntimePermissionPresentationInfo> CREATOR;
		}

		}

		package android.print {

cmds/statsd/src/atoms.proto

+0 −38

Original line number	Diff line number	Diff line
		@@ -294,8 +294,6 @@ message Atom {
		MediametricsMediadrmReported mediametrics_mediadrm_reported = 198;
		MediametricsNuPlayerReported mediametrics_nuplayer_reported = 199;
		MediametricsRecorderReported mediametrics_recorder_reported = 200;
		VehicleMapServicePacketReported vms_packet_reported = 201;
		VehicleMapServicePacketFailureReported vms_packet_failure_reported = 202;
		CarPowerStateChanged car_power_state_changed = 203;
		GarageModeInfo garage_mode_info = 204;
		TestAtomReported test_atom_reported = 205 [(log_from_module) = "cts"];
		@@ -6420,42 +6418,6 @@ message IntelligenceEventReported {
		optional android.stats.intelligence.Status status = 2;
		}

		/**
		* Logs information about Vehicle Map Service packets. It specifies the layer
		* type, subtype, data version and size of the packet.
		*/
		message VehicleMapServicePacketReported {
		// Identifies the type of data being transported by a Vehicle Maps Service
		// packet.
		optional int32 layer_type = 1;
		// Identifies the subtype of the layer.
		optional int32 layer_subtype = 2;
		// Identifies the version of the data being transported by a Vehicle Maps
		// Service packet.
		optional int32 version = 3;
		// Size in bytes of the packet.
		optional int64 size_in_bytes = 4;
		}

		/**
		* Logs that a Vehicle Map Service packet failed to be delivered.
		*/
		message VehicleMapServicePacketFailureReported {
		// Identifies the type of data being transported by a Vehicle Map Service
		// packet.
		optional int32 layer_type = 1;
		// Identifies the subtype of the layer.
		optional int32 layer_subtype = 2;
		// Identifies the version of the data being transported by a Vehicle Map
		// Service packet.
		optional int32 version = 3;
		// Identifies the package name of the publisher of the data.
		optional string publisher_name = 4;
		// Identifies the package name of the subscriber of the data. An empty string
		// signifies that there are zero subscribers for the packet.
		optional string subscriber_name = 5;
		}

		/**
		* Logs when Car Power state changed.
		*

core/java/android/content/Context.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -4090,6 +4090,7 @@ public abstract class Context {
		* @hide
		* @see #getSystemService(String)
		*/
		@TestApi
		public static final String CONTENT_CAPTURE_MANAGER_SERVICE = "content_capture";

		/**

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -807,7 +807,7 @@ public abstract class PackageManager {
		*
		* @hide
		*/
		public static final int INSTALL_ALL_WHITELIST_RESTRICTED_PERMISSIONS = 0x00000200;
		public static final int INSTALL_ALL_WHITELIST_RESTRICTED_PERMISSIONS = 0x00400000;

		/** {@hide} */
		public static final int INSTALL_FORCE_VOLUME_UUID = 0x00000200;

core/java/android/content/pm/PackageParser.java

+14 −4

Original line number	Diff line number	Diff line
		@@ -48,6 +48,7 @@ import android.annotation.Nullable;
		import android.annotation.StringRes;
		import android.annotation.TestApi;
		import android.annotation.UnsupportedAppUsage;
		import android.apex.ApexInfo;
		import android.app.ActivityTaskManager;
		import android.app.ActivityThread;
		import android.app.ResourcesManager;
		@@ -8382,20 +8383,29 @@ public class PackageParser {
		* PackageInfo parser specifically for apex files.
		* NOTE: It will collect certificates
		*
		* @param apexFile
		* @param apexInfo
		* @return PackageInfo
		* @throws PackageParserException
		*/
		public static PackageInfo generatePackageInfoFromApex(File apexFile, int flags)
		public static PackageInfo generatePackageInfoFromApex(ApexInfo apexInfo, int flags)
		throws PackageParserException {
		PackageParser pp = new PackageParser();
		File apexFile = new File(apexInfo.packagePath);
		final Package p = pp.parsePackage(apexFile, flags, false);
		PackageUserState state = new PackageUserState();
		PackageInfo pi = generatePackageInfo(p, EmptyArray.INT, flags, 0, 0,
		Collections.emptySet(), state);

		pi.applicationInfo.sourceDir = apexFile.getPath();
		pi.applicationInfo.flags \|= ApplicationInfo.FLAG_SYSTEM \| ApplicationInfo.FLAG_INSTALLED;
		if (apexInfo.isFactory) {
		pi.applicationInfo.flags \|= ApplicationInfo.FLAG_SYSTEM;
		} else {
		pi.applicationInfo.flags &= ~ApplicationInfo.FLAG_SYSTEM;
		}
		if (apexInfo.isActive) {
		pi.applicationInfo.flags \|= ApplicationInfo.FLAG_INSTALLED;
		} else {
		pi.applicationInfo.flags &= ~ApplicationInfo.FLAG_INSTALLED;
		}
		pi.isApex = true;

		// Collect certificates