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

Commit f0bbd49e authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of android_ui.lnx.2.1-00034. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1083427   I0a7769a3fc29e88babead23fe0746b32508e2436   Settings: fix com.android.settings occurs Dalvik leak an
1084797   I85cd13bd09f7a1cb7ddd5f577e5e249ca7447a29   Settings: Fix Crash when turn on/off WLAN
1078793   I19f20b96afb42758187707f1b86a5817e8d737a8   Null check intent before starting "learn more".
1078793   Id638de8ab1c6b815d62916a584892be84cabe1ae   Remove help links when device is not provisioned. DO NOT

Change-Id: I8847064be24d7025a8bb8307ae1ece8a7f1ddf9a
CRs-Fixed: 1083427, 1078793, 1084797
parents 5ba4d745 ae078375

src/com/android/settings/IccLockSettings.java

+2 −0
Original line number Diff line number Diff line
@@ -248,6 +248,8 @@ public class IccLockSettings extends SettingsPreferenceFragment 
    }



    private void updatePreferences() {

        if (mPinDialog == null || mPinToggle == null)

            return;

        if (mPhone != null) {

            if (mPhone.getIccCard().getState() != State.READY) {

                // if SIM State is NOT READY, it is not possible to interact with UICC app

src/com/android/settings/datausage/DataSaverPreference.java

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ public class DataSaverPreference extends Preference implements DataSaverBackend. 
    @Override

    public void onDetached() {

        super.onDetached();

        mDataSaverBackend.addListener(this);

        mDataSaverBackend.remListener(this);

    }



    @Override

src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java

+12 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.hardware.fingerprint.FingerprintManager; 
import android.os.Bundle;

import android.os.UserHandle;

import android.os.UserManager;

import android.provider.Settings.Global;

import android.text.Annotation;

import android.text.SpannableString;

import android.text.SpannableStringBuilder;
@@ -69,9 +70,15 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase 
        final RecyclerItemAdapter adapter = (RecyclerItemAdapter) layout.getAdapter();

        adapter.setOnItemSelectedListener(this);

        Item item = (Item) adapter.findItemById(R.id.fingerprint_introduction_message);

        String linkUrl = getString(R.string.help_url_fingerprint);

        if (Global.getInt(getContentResolver(), Global.DEVICE_PROVISIONED, 0) == 0) {

            // If the device is not provisioned, help intents from HelpUtils will be null, so don't

            // show the link at all.

            linkUrl = "";

        }

        item.setTitle(LearnMoreSpan.linkify(

                getText(R.string.security_settings_fingerprint_enroll_introduction_message),

                getString(R.string.help_url_fingerprint)));

                linkUrl));

        // setupwizard library automatically sets the divider inset to

        // R.dimen.suw_items_icon_divider_inset. We adjust this back to 0 as we do not want

        // an inset within settings.
@@ -187,6 +194,10 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase 
        public void onClick(View widget) {

            Context ctx = widget.getContext();

            Intent intent = HelpUtils.getHelpIntent(ctx, getURL(), ctx.getClass().getName());

            if (intent == null) {

                Log.w(LearnMoreSpan.TAG, "Null help intent.");

                return;

            }

            try {

                // This needs to be startActivityForResult even though we do not care about the

                // actual result because the help app needs to know about who invoked it.

src/com/android/settings/wifi/WifiSettings.java

100755 → 100644
+3 −1
Original line number Diff line number Diff line
@@ -904,7 +904,9 @@ public class WifiSettings extends RestrictedSettingsFragment 


    @Override

    public void onAccessPointChanged(AccessPoint accessPoint) {

        try {

            ((LongPressAccessPointPreference) accessPoint.getTag()).refresh();

        } catch (NullPointerException ig) {}

    }



    @Override