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

Commit 83f8afa3 authored by Brandon McAnsh's avatar Brandon McAnsh
Browse files

SetupWizard: Updates for N 



Change-Id: I501d6aaf37f993f77ecc605db9f67d9da66c71ee
Signed-off-by: default avatarBrandon McAnsh <brandon.mcansh@gmail.com>
parent 615f709c

src/com/cyanogenmod/setupwizard/setup/ChooseDataSimPage.java

+4 −4
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ public class ChooseDataSimPage extends SetupPage { 
            super.onCreate(savedInstanceState);

            mContext = getActivity().getApplicationContext();

            mSubscriptionManager = SubscriptionManager.from(mContext);

            mCurrentDataSubId = mSubscriptionManager.getDefaultDataSubId();

            mCurrentDataSubId = mSubscriptionManager.getDefaultSubscriptionId();

            if (sChangingToDataSubId == -1) {

                sChangingToDataSubId = mCurrentDataSubId;

            }
@@ -256,7 +256,7 @@ public class ChooseDataSimPage extends SetupPage { 


                @Override

                public void onDataConnectionStateChanged(int state) {

                    final int dataSubId = mSubscriptionManager.getDefaultDataSubId();

                    final int dataSubId = mSubscriptionManager.getDefaultSubscriptionId();

                    // In case the default sub changes from elsewhere. This shouldn't happen,

                    // but testcases can induce this.

                    if (dataSubId != mCurrentDataSubId &&
@@ -370,7 +370,7 @@ public class ChooseDataSimPage extends SetupPage { 
            if (mIsAttached) {

                for (int i = 0; i < mSubInfoRecords.size(); i++) {

                    SubscriptionInfo subInfoRecord = mSubInfoRecords.valueAt(i);

                    mCheckBoxes.get(i).setChecked(mSubscriptionManager.getDefaultDataSubId()

                    mCheckBoxes.get(i).setChecked(mSubscriptionManager.getDefaultSubscriptionId()

                            == subInfoRecord.getSubscriptionId());

                }

            }
@@ -395,7 +395,7 @@ public class ChooseDataSimPage extends SetupPage { 


        private void updateCarrierText(SubscriptionInfo subInfoRecord) {

            if (mIsAttached) {

                String name = mPhone.getSimOperatorNameForSubscription(subInfoRecord.getSubscriptionId());

                String name = mPhone.getSimOperatorName(subInfoRecord.getSubscriptionId());

                if (TextUtils.isEmpty(name)) {

                    name = mPhone.getNetworkOperatorName(subInfoRecord.getSubscriptionId());

                }

src/com/cyanogenmod/setupwizard/setup/MobileDataPage.java

+3 −4
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ public class MobileDataPage extends SetupPage { 
        };



        private PhoneStateListener mPhoneStateListener =

                new PhoneStateListener(SubscriptionManager.getDefaultDataSubId()) {

                new PhoneStateListener(SubscriptionManager.getDefaultSubscriptionId()) {



                    @Override

                    public void onSignalStrengthsChanged(SignalStrength signalStrength) {
@@ -241,10 +241,9 @@ public class MobileDataPage extends SetupPage { 


        private void updateCarrierText() {

            if (mIsAttached) {

                String name =

                        mPhone.getSimOperatorNameForSubscription(SubscriptionManager.getDefaultDataSubId());

                String name = mPhone.getSimOperatorName(SubscriptionManager.getDefaultSubscriptionId());

                if (TextUtils.isEmpty(name)) {

                    name = mPhone.getNetworkOperatorName(SubscriptionManager.getDefaultDataSubId());

                    name = mPhone.getNetworkOperatorName(SubscriptionManager.getDefaultSubscriptionId());

                }

                if (TextUtils.isEmpty(name)) {

                    if (mServiceState != null && mServiceState.isEmergencyOnly()) {

src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -26,9 +26,9 @@ import android.content.res.Resources; 
import android.graphics.Bitmap;

import android.graphics.Point;

import android.os.AsyncTask;

import android.os.Binder;

import android.os.Bundle;

import android.os.Handler;

import android.os.UserHandle;

import android.preference.PreferenceManager;

import android.provider.Settings;

import android.text.TextUtils;
@@ -377,7 +377,7 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks, 
            final SetupWizardApp setupWizardApp = (SetupWizardApp)getApplication();

            setupWizardApp.sendStickyBroadcastAsUser(

                    new Intent(SetupWizardApp.ACTION_FINISHED),

                    UserHandle.getCallingUserHandle());

                    Binder.getCallingUserHandle());

            mIsFinishing = true;

            setupRevealImage();

        }

src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java

+3 −3
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import android.hardware.fingerprint.FingerprintManager; 
import android.net.ConnectivityManager;

import android.net.NetworkInfo;

import android.net.wifi.WifiManager;

import android.os.UserHandle;

import android.os.Binder;

import android.os.UserManager;

import android.service.persistentdata.PersistentDataBlockManager;

import android.telephony.ServiceState;
@@ -92,7 +92,7 @@ public class SetupWizardUtils { 
            int phoneId = SubscriptionManager.from(context).getDefaultDataPhoneId();

            android.provider.Settings.Global.putInt(context.getContentResolver(),

                    android.provider.Settings.Global.MOBILE_DATA + phoneId, enabled ? 1 : 0);

            int subId = SubscriptionManager.getDefaultDataSubId();

            int subId = SubscriptionManager.getDefaultDataSubscriptionId();

            tm.setDataEnabled(subId, enabled);

        } else {

            android.provider.Settings.Global.putInt(context.getContentResolver(),
@@ -190,7 +190,7 @@ public class SetupWizardUtils { 
    }



    public static boolean isOwner() {

        return UserHandle.getCallingUserHandle().isOwner();

        return Binder.getCallingUserHandle().isOwner();

    }



    public static boolean hasGMS(Context context) {