Snap for 6379507 from c14806197cb453e8e26558adf8c02db9567c036a to mainline-release (82e63cd0) · Commits · e / os / android_frameworks_base

Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -911,6 +911,7 @@ cc_library {
		filegroup {
		name: "incremental_aidl",
		srcs: [
		"core/java/android/os/incremental/IIncrementalServiceConnector.aidl",
		"core/java/android/os/incremental/IncrementalFileSystemControlParcel.aidl",
		],
		path: "core/java",

apex/statsd/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -67,7 +67,6 @@ cc_library_shared {
		"liblog", // Has a stable abi - should not be copied into apex.
		"libstatssocket",
		],
		//TODO: is libc++_static correct?
		stl: "libc++_static",
		cflags: [
		"-Wall",

apex/statsd/tests/libstatspull/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ android_test {
		"protos/*/.proto",
		],
		test_suites: [
		"general-tests",
		"device-tests",
		],
		platform_apis: true,
		privileged: true,

api/test-current.txt

+4 −1

Original line number	Diff line number	Diff line
		@@ -214,6 +214,7 @@ package android.app {
		field public static final String OPSTR_GPS = "android:gps";
		field public static final String OPSTR_INSTANT_APP_START_FOREGROUND = "android:instant_app_start_foreground";
		field public static final String OPSTR_LEGACY_STORAGE = "android:legacy_storage";
		field public static final String OPSTR_MANAGE_EXTERNAL_STORAGE = "android:manage_external_storage";
		field public static final String OPSTR_MANAGE_IPSEC_TUNNELS = "android:manage_ipsec_tunnels";
		field public static final String OPSTR_MUTE_MICROPHONE = "android:mute_microphone";
		field public static final String OPSTR_NEIGHBORING_CELLS = "android:neighboring_cells";
		@@ -4860,7 +4861,9 @@ package android.view {
		}

		public final class SurfaceControl implements android.os.Parcelable {
		ctor public SurfaceControl(@NonNull android.view.SurfaceControl);
		method public static long acquireFrameRateFlexibilityToken();
		method public boolean isSameSurface(@NonNull android.view.SurfaceControl);
		method public static void releaseFrameRateFlexibilityToken(long);
		}

		@@ -5213,10 +5216,10 @@ package android.window {
		method public void onDisplayAreaAppeared(@NonNull android.window.WindowContainerToken);
		method public void onDisplayAreaVanished(@NonNull android.window.WindowContainerToken);
		method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void registerOrganizer(int);
		field public static final int FEATURE_DEFAULT_TASK_CONTAINER = 1; // 0x1
		field public static final int FEATURE_ROOT = 0; // 0x0
		field public static final int FEATURE_SYSTEM_FIRST = 0; // 0x0
		field public static final int FEATURE_SYSTEM_LAST = 10000; // 0x2710
		field public static final int FEATURE_TASK_CONTAINER = 1; // 0x1
		field public static final int FEATURE_UNDEFINED = -1; // 0xffffffff
		field public static final int FEATURE_VENDOR_FIRST = 10001; // 0x2711
		field public static final int FEATURE_WINDOW_TOKENS = 2; // 0x2

cmds/statsd/Android.bp

+4 −2

Original line number	Diff line number	Diff line
		@@ -113,17 +113,18 @@ cc_defaults {
		static_libs: [
		"libbase",
		"libcutils",
		"libgtest_prod",
		"libprotoutil",
		"libstatsmetadata",
		"libstatslog_statsd",
		"libsysutils",
		"libutils",
		"statsd-aidl-ndk_platform",
		],
		shared_libs: [
		"libbinder_ndk",
		"libincident",
		"liblog",
		"statsd-aidl-ndk_platform",
		],
		}

		@@ -268,10 +269,11 @@ cc_binary {

		proto: {
		type: "lite",
		static: true,
		},
		stl: "libc++_static",

		shared_libs: [
		"libgtest_prod",
		"libstatssocket",
		],