Merge "Migration of IRadio 1.3 types to 1.4." (c96a716a) · Commits · e / os / android_frameworks_base

Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -690,6 +690,7 @@ java_defaults {
		"android.hardware.wifi-V1.0-java-constants",
		"android.hardware.radio-V1.0-java",
		"android.hardware.radio-V1.3-java",
		"android.hardware.radio-V1.4-java",
		"android.hardware.usb.gadget-V1.0-java",
		"netd_aidl_interface-java",
		],

+3 −3

Original line number	Diff line number	Diff line
		@@ -17,8 +17,8 @@
		package android.telephony.emergency;

		import android.annotation.IntDef;
		import android.hardware.radio.V1_3.EmergencyNumberSource;
		import android.hardware.radio.V1_3.EmergencyServiceCategory;
		import android.hardware.radio.V1_4.EmergencyNumberSource;
		import android.hardware.radio.V1_4.EmergencyServiceCategory;
		import android.os.Parcel;
		import android.os.Parcelable;

		@@ -138,7 +138,7 @@ public final class EmergencyNumber implements Parcelable, Comparable<EmergencyNu
		}

		/**
		* The source to tell where the corresponding @1.3::EmergencyNumber comes from.
		* The source to tell where the corresponding @1.4::EmergencyNumber comes from.
		*
		* The emergency number has one or more defined emergency number sources.
		*