Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Migration of IRadio 1.3 types to 1.4."

Browse Source 
am: c96a716a54

Change-Id: Iee0ab17de7c7d38a465c6ea387bf317c265f985a
This commit is contained in:
Xiangyu/Malcolm Chen
2018-11-27 13:18:50 -08:00
committed by android-build-merger
parent 4900fcbd93 c96a716a54
commit 46fd611f85
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Android.bp
View File

@@ -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",
],

6
telephony/java/android/telephony/emergency/EmergencyNumber.java
View File

@@ -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.
*