Bug 921112 - Prohibit proguad from erasing JNI MCC methods. r=bnicholson

This commit is contained in:
Wes Johnston 2014-01-13 15:20:15 -08:00
parent 31e48165d6
commit 0237d00c24

View File

@ -5,6 +5,8 @@
package org.mozilla.gecko;
import org.mozilla.gecko.mozglue.JNITarget;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@ -352,10 +354,13 @@ public class GeckoNetworkManager extends BroadcastReceiver {
return -1;
}
/* These are called from javascript c-types. Avoid letting pro-guard delete them */
@JNITarget
public static int getMCC() {
return getNetworkOperator(InfoType.MCC);
}
@JNITarget
public static int getMNC() {
return getNetworkOperator(InfoType.MNC);
}