Merge "AParcel_markSensitive in APEX" am: 51396d2f37 am: c89c8014be (abc35037) · Commits · e / os / android_frameworks_native

libs/binder/ndk/include_platform/android/binder_parcel_platform.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -33,7 +33,6 @@ bool AParcel_getAllowFds(const AParcel*);

		#endif

		#if !defined(__ANDROID_APEX__)
		/**
		* Data written to the parcel will be zero'd before being deleted or realloced.
		*
		@@ -44,6 +43,5 @@ bool AParcel_getAllowFds(const AParcel*);
		* \param parcel The parcel to clear associated data from.
		*/
		void AParcel_markSensitive(const AParcel* parcel);
		#endif

		__END_DECLS

+1 −1

Original line number	Diff line number	Diff line
		@@ -117,7 +117,7 @@ LIBBINDER_NDK31 { # introduced=31
		ABinderProcess_setupPolling; # apex
		AIBinder_getCallingSid; # apex
		AIBinder_setRequestingSid; # apex
		AParcel_markSensitive; # llndk
		AParcel_markSensitive; # systemapi llndk
		AServiceManager_forEachDeclaredInstance; # apex llndk
		AServiceManager_forceLazyServicesPersist; # llndk
		AServiceManager_isDeclared; # apex llndk

+12 −1

Original line number	Diff line number	Diff line
		@@ -73,7 +73,10 @@ cc_test {
		"IBinderNdkUnitTest-cpp",
		"IBinderNdkUnitTest-ndk_platform",
		],
		test_suites: ["general-tests", "vts"],
		test_suites: [
		"general-tests",
		"vts",
		],
		require_root: true,
		}

		@@ -115,4 +118,12 @@ aidl_interface {
		"IBinderNdkUnitTest.aidl",
		"IEmpty.aidl",
		],
		backend: {
		java: {
		enabled: false,
		},
		ndk: {
		apps_enabled: false,
		},
		},
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@

		import IEmpty;

		@SensitiveData
		interface IBinderNdkUnitTest {
		int repeatInt(int a);