Snap for 6546508 from 87278d1f2df6c3ba8442d163d7ab7c26c6d95d72 to mainline-release (04c0f257) · Commits · e / os / android_frameworks_base

apex/media/framework/Android.bp

+8 −1

Original line number	Diff line number	Diff line
		@@ -105,7 +105,14 @@ java_sdk_library {
		"framework_media_annotation",
		],

		visibility: ["//frameworks/av/apex:__subpackages__"],
		// Allow access to the stubs from anywhere.
		visibility: ["//visibility:public"],

		// Restrict access to implementation library.
		impl_library_visibility: [
		"//visibility:override", // Ignore the visibility property.
		"//frameworks/av/apex:__subpackages__",
		],
		}

+10 −4

Original line number	Diff line number	Diff line
		@@ -24,6 +24,16 @@ filegroup {
		java_sdk_library {
		name: "framework-permission",
		defaults: ["framework-module-defaults"],

		// Allow access to the stubs from anywhere.
		visibility: ["//visibility:public"],

		// Restrict access to implementation library.
		impl_library_visibility: [
		"//visibility:override", // Ignore the visibility property.
		"//frameworks/base/apex/permission:__subpackages__",
		],

		srcs: [
		":framework-permission-sources",
		],
		@@ -43,8 +53,4 @@ java_sdk_library {
		],
		hostdex: true,
		installable: true,
		visibility: [
		"//frameworks/base/apex/permission:__subpackages__",
		],
		stubs_library_visibility: ["//visibility:public"],
		}

+9 −4

Original line number	Diff line number	Diff line
		@@ -75,15 +75,20 @@ java_sdk_library {
		],

		hostdex: true, // for hiddenapi check

		visibility: [
		"//frameworks/base/apex/statsd:__subpackages__",
		],
		stubs_library_visibility: [
		"//frameworks/base", // Framework
		"//frameworks/base/apex/statsd", // statsd apex
		"//frameworks/base/apex/statsd:__subpackages__", // statsd apex
		"//frameworks/opt/net/wifi/service", // wifi service
		"//packages/providers/MediaProvider", // MediaProvider apk
		],

		// Restrict access to implementation library.
		impl_library_visibility: [
		"//visibility:override", // Ignore the visibility property.
		"//frameworks/base/apex/statsd:__subpackages__", // statsd apex
		],

		apex_available: [
		"com.android.os.statsd",
		"test_com.android.os.statsd",

+17 −0

Original line number	Diff line number	Diff line
		@@ -4860,6 +4860,14 @@ message SnapshotMergeReported {
		// Number of reboots that occurred after issuing and before completing the
		// merge of all the snapshot devices.
		optional int32 intermediate_reboots = 3;

		// The device has been upgraded to Virtual A/B.
		optional bool is_vab_retrofit = 4;

		// Space that has been temporarily allocated in the /data partition
		// containing the dm-snapshot's copy-on-write data generated during a
		// Virtual A/B update.
		optional int64 cow_file_size_bytes = 5;
		}

		//////////////////////////////////////////////////////////////////////
		@@ -8637,6 +8645,15 @@ message UpdateEngineUpdateAttemptReported {
		// system property when the device takes the update. e.g.
		// Android/aosp_sailfish/sailfish:10/QP1A.190425.004/5507117:userdebug/test-keys
		optional string source_fingerprint = 8;

		// Size of super partition.
		optional int64 super_partition_size_bytes = 9;

		// Size of current slot within the super partition.
		optional int64 slot_size_bytes = 10;

		// Free space available in the super partition.
		optional int64 super_free_space_bytes = 11;
		}

		/**

+1 −0

Original line number	Diff line number	Diff line
		@@ -58,6 +58,7 @@ interface INotificationManager

		void setShowBadge(String pkg, int uid, boolean showBadge);
		boolean canShowBadge(String pkg, int uid);
		boolean hasSentValidMsg(String pkg, int uid);
		boolean isInInvalidMsgState(String pkg, int uid);
		boolean hasUserDemotedInvalidMsgApp(String pkg, int uid);
		void setInvalidMsgAppDemoted(String pkg, int uid, boolean isDemoted);