Merge "Add hyunyoungs and yro to the OWNERS file"
diff --git a/api/current.txt b/api/current.txt
index d94df4c..04d1730 100755
--- a/api/current.txt
+++ b/api/current.txt
@@ -42553,6 +42553,7 @@
method public int getLevel();
method public boolean isGsm();
method public void writeToParcel(android.os.Parcel, int);
+ field public static final int INVALID = 2147483647; // 0x7fffffff
}
public final class SmsManager {
diff --git a/core/jni/android_media_AudioSystem.cpp b/core/jni/android_media_AudioSystem.cpp
index 04918ba..5b90349 100644
--- a/core/jni/android_media_AudioSystem.cpp
+++ b/core/jni/android_media_AudioSystem.cpp
@@ -951,6 +951,7 @@
jintArray jFormats = NULL;
jobjectArray jGains = NULL;
jobject jHandle = NULL;
+ jobject jAudioPortConfig = NULL;
jstring jDeviceName = NULL;
bool useInMask;
size_t numPositionMasks = 0;
@@ -1129,7 +1130,6 @@
goto exit;
}
- jobject jAudioPortConfig;
jStatus = convertAudioPortConfigFromNative(env,
*jAudioPort,
&jAudioPortConfig,
@@ -1165,6 +1165,9 @@
if (jHandle != NULL) {
env->DeleteLocalRef(jHandle);
}
+ if (jAudioPortConfig != NULL) {
+ env->DeleteLocalRef(jAudioPortConfig);
+ }
return jStatus;
}
@@ -1235,12 +1238,15 @@
}
for (size_t i = 0; i < numPorts; i++) {
- jobject jAudioPort;
+ jobject jAudioPort = NULL;
jStatus = convertAudioPortFromNative(env, &jAudioPort, &nPorts[i]);
if (jStatus != AUDIO_JAVA_SUCCESS) {
goto exit;
}
env->CallBooleanMethod(jPorts, gArrayListMethods.add, jAudioPort);
+ if (jAudioPort != NULL) {
+ env->DeleteLocalRef(jAudioPort);
+ }
}
exit:
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 3d67fdb..5e12483 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -2570,7 +2570,7 @@
sDefaults.putBoolean(KEY_SPN_DISPLAY_RULE_USE_ROAMING_FROM_SERVICE_STATE_BOOL, false);
sDefaults.putBoolean(KEY_ALWAYS_SHOW_DATA_RAT_ICON_BOOL, false);
sDefaults.putBoolean(KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL, false);
- sDefaults.putBoolean(KEY_HIDE_LTE_PLUS_DATA_ICON_BOOL, false);
+ sDefaults.putBoolean(KEY_HIDE_LTE_PLUS_DATA_ICON_BOOL, true);
sDefaults.putBoolean(KEY_CARRIER_CONFIG_APPLIED_BOOL, false);
sDefaults.putBoolean(KEY_CHECK_PRICING_WITH_CARRIER_FOR_DATA_ROAMING_BOOL, false);
sDefaults.putIntArray(KEY_LTE_RSRP_THRESHOLDS_INT_ARRAY,
diff --git a/telephony/java/android/telephony/SignalStrength.java b/telephony/java/android/telephony/SignalStrength.java
index fb801b2..bc832c3 100644
--- a/telephony/java/android/telephony/SignalStrength.java
+++ b/telephony/java/android/telephony/SignalStrength.java
@@ -21,8 +21,8 @@
import android.os.Parcel;
import android.os.Parcelable;
import android.telephony.CarrierConfigManager;
-import android.text.TextUtils;
import android.util.Log;
+import android.content.res.Resources;
import java.util.ArrayList;
import java.util.Arrays;
@@ -65,8 +65,9 @@
};
/**
- * Use Integer.MAX_VALUE because -1 is a valid value in signal strength.
- * @hide
+ * Indicates the invalid measures of signal strength.
+ *
+ * For example, this can be returned by {@link #getEvdoDbm()} or {@link #getCdmaDbm()}
*/
public static final int INVALID = Integer.MAX_VALUE;
@@ -173,9 +174,9 @@
public SignalStrength(boolean gsmFlag) {
mGsmSignalStrength = 99;
mGsmBitErrorRate = -1;
- mCdmaDbm = -1;
+ mCdmaDbm = INVALID;
mCdmaEcio = -1;
- mEvdoDbm = -1;
+ mEvdoDbm = INVALID;
mEvdoEcio = -1;
mEvdoSnr = -1;
mLteSignalStrength = 99;
@@ -542,6 +543,8 @@
/**
* Get the CDMA RSSI value in dBm
+ *
+ * @return the CDMA RSSI value or {@link #INVALID} if invalid
*/
public int getCdmaDbm() {
return this.mCdmaDbm;
@@ -556,6 +559,8 @@
/**
* Get the EVDO RSSI value in dBm
+ *
+ * @return the EVDO RSSI value or {@link #INVALID} if invalid
*/
public int getEvdoDbm() {
return this.mEvdoDbm;
@@ -1116,7 +1121,7 @@
public int getWcdmaLevel() {
int level = SIGNAL_STRENGTH_NONE_OR_UNKNOWN;
- if (TextUtils.isEmpty(mWcdmaDefaultSignalMeasurement)) {
+ if (mWcdmaDefaultSignalMeasurement == null) {
Log.wtf(LOG_TAG, "getWcdmaLevel - WCDMA default signal measurement is invalid.");
return level;
}