Merge "Revert "Make Call.Details.getAssociatedUser @SystemApi"" into main (ba504319) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+0 −12

Original line number	Diff line number	Diff line
		@@ -236,18 +236,6 @@ java_aconfig_library {
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		java_aconfig_library {
		name: "telecom_flags_core_java_aconfig_java_exported_lib",
		aconfig_declarations: "telecom_flags",
		mode: "exported",
		min_sdk_version: "30",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		apex_available: [
		"//apex_available:platform",
		"com.android.permission",
		],
		}

		// Telephony
		java_aconfig_library {
		name: "telephony_flags_core_java_lib",

+0 −4

Original line number	Diff line number	Diff line
		@@ -14472,10 +14472,6 @@ package android.telecom {
		field @Deprecated public static final int STATE_PRE_DIAL_WAIT = 8; // 0x8
		}

		public static class Call.Details {
		method @FlaggedApi("com.android.server.telecom.flags.call_details_get_associated_user_api") @NonNull public android.os.UserHandle getAssociatedUser();
		}

		@Deprecated public abstract static class Call.Listener extends android.telecom.Call.Callback {
		ctor @Deprecated public Call.Listener();
		}

+1 −3

Original line number	Diff line number	Diff line
		@@ -1089,9 +1089,7 @@ public final class Call {
		*
		* @hide
		*/
		@SystemApi
		@FlaggedApi(Flags.FLAG_CALL_DETAILS_GET_ASSOCIATED_USER_API)
		public @NonNull UserHandle getAssociatedUser() {
		public UserHandle getAssociatedUser() {
		return mAssociatedUser;
		}