PawletOS/lineageos_setupwizard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update api usage for android 11

Browse Source 
Change-Id: I50ff347c2c75afa43f462ce57329090ecf40a2dd
This commit is contained in:
Renlord
2020-09-21 22:48:41 +10:00
committed by Michael Bestas
parent c2b6a18b9b
commit 4027defd55
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/lineageos/setupwizard/CaptivePortalSetupActivity.java
View File

@@ -131,6 +131,8 @@ public class CaptivePortalSetupActivity extends SubBaseActivity {
public void appResponse(int response) {} public void appResponse(int response) {}
@Override @Override
public void logEvent(int eventId, String packageName) {} public void logEvent(int eventId, String packageName) {}
@Override
public void appRequest(int request) {}
})); }));
intent.putExtra("status_bar_color", intent.putExtra("status_bar_color",
context.getResources().getColor(R.color.primary_dark)); context.getResources().getColor(R.color.primary_dark));

4
src/org/lineageos/setupwizard/LocaleActivity.java
View File

@@ -34,8 +34,8 @@ import android.widget.ArrayAdapter;
import android.widget.NumberPicker; import android.widget.NumberPicker;
import android.widget.Toast; import android.widget.Toast;
import com.android.internal.telephony.MccTable;
import com.android.internal.telephony.TelephonyIntents; import com.android.internal.telephony.TelephonyIntents;
import com.android.internal.telephony.util.LocaleUtils;
import org.lineageos.setupwizard.R; import org.lineageos.setupwizard.R;
import org.lineageos.setupwizard.widget.LocalePicker; import org.lineageos.setupwizard.widget.LocalePicker;
@@ -217,7 +217,7 @@ public class LocaleActivity extends BaseSetupWizardActivity {
// Fetch locale for active sim's MCC // Fetch locale for active sim's MCC
int mcc = activeSubs.get(0).getMcc(); int mcc = activeSubs.get(0).getMcc();
locale = MccTable.getLocaleFromMcc(activity, mcc, null); locale = LocaleUtils.getLocaleFromMcc(activity, mcc, null);
// If that fails, fall back to preferred languages reported // If that fails, fall back to preferred languages reported
// by the sim // by the sim

8
src/org/lineageos/setupwizard/util/PhoneMonitor.java
View File

@@ -53,7 +53,7 @@ import android.content.IntentFilter;
import android.os.Handler; import android.os.Handler;
import android.os.HandlerExecutor; import android.os.HandlerExecutor;
import android.os.Looper; import android.os.Looper;
import android.os.SystemProperties; import android.sysprop.TelephonyProperties;
import android.telephony.PhoneStateListener; import android.telephony.PhoneStateListener;
import android.telephony.ServiceState; import android.telephony.ServiceState;
import android.telephony.SignalStrength; import android.telephony.SignalStrength;
@@ -310,11 +310,11 @@ public class PhoneMonitor {
} }
public int getLteOnCdmaMode(int subId) { public int getLteOnCdmaMode(int subId) {
if (mTelephony == null || mTelephony.createForSubscriptionId(subId).getLteOnCdmaMode() if (mTelephony == null || mTelephony.createForSubscriptionId(subId).getLteOnCdmaMode(subId)
== LTE_ON_CDMA_UNKNOWN) { == LTE_ON_CDMA_UNKNOWN) {
return SystemProperties.getInt("telephony.lteOnCdmaDevice", LTE_ON_CDMA_UNKNOWN); return TelephonyProperties.lte_on_cdma_device().orElse(LTE_ON_CDMA_UNKNOWN);
} }
return mTelephony.createForSubscriptionId(subId).getLteOnCdmaMode(); return mTelephony.createForSubscriptionId(subId).getLteOnCdmaMode(subId);
} }
private void logPhoneState(String prefix) { private void logPhoneState(String prefix) {