Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4027defd authored by Renlord's avatar Renlord Committed by Michael Bestas
Browse files

Update api usage for android 11 

Change-Id: I50ff347c2c75afa43f462ce57329090ecf40a2dd
parent c2b6a18b

src/org/lineageos/setupwizard/CaptivePortalSetupActivity.java

+2 −0
Original line number Diff line number Diff line
@@ -131,6 +131,8 @@ public class CaptivePortalSetupActivity extends SubBaseActivity { 
                            public void appResponse(int response) {}

                            @Override

                            public void logEvent(int eventId, String packageName) {}

                            @Override

                            public void appRequest(int request) {}

                        }));

                intent.putExtra("status_bar_color",

                        context.getResources().getColor(R.color.primary_dark));

src/org/lineageos/setupwizard/LocaleActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ import android.widget.ArrayAdapter; 
import android.widget.NumberPicker;

import android.widget.Toast;



import com.android.internal.telephony.MccTable;

import com.android.internal.telephony.TelephonyIntents;

import com.android.internal.telephony.util.LocaleUtils;



import org.lineageos.setupwizard.R;

import org.lineageos.setupwizard.widget.LocalePicker;
@@ -217,7 +217,7 @@ public class LocaleActivity extends BaseSetupWizardActivity { 


                // Fetch locale for active sim's MCC

                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

                // by the sim

src/org/lineageos/setupwizard/util/PhoneMonitor.java

+4 −4
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ import android.content.IntentFilter; 
import android.os.Handler;

import android.os.HandlerExecutor;

import android.os.Looper;

import android.os.SystemProperties;

import android.sysprop.TelephonyProperties;

import android.telephony.PhoneStateListener;

import android.telephony.ServiceState;

import android.telephony.SignalStrength;
@@ -310,11 +310,11 @@ public class PhoneMonitor { 
    }



    public int getLteOnCdmaMode(int subId) {

        if (mTelephony == null || mTelephony.createForSubscriptionId(subId).getLteOnCdmaMode()

        if (mTelephony == null || mTelephony.createForSubscriptionId(subId).getLteOnCdmaMode(subId)

                    == 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) {