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

Commit ed46bffc authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Merge branch '3571-a14-sept' into 'v3.1-a14'

[a14] Add September security patches

See merge request !110
parents fed8e1d0 aa8f2a04
Loading
Loading
Loading
Loading
+20 −0
Original line number Original line Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
     Copyright (C) 2018 The LineageOS Project

     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at

          http://www.apache.org/licenses/LICENSE-2.0

     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <string name="menu_emergency_information_txt">جىددىي ئالاقە ئۇچۇرى</string>
    <string name="call_via_template"><xliff:g id="account">%1$s</xliff:g> ئارقىلىق چاقىر</string>
</resources>
+0 −9
Original line number Original line Diff line number Diff line
@@ -65,15 +65,6 @@ public class SelectAccountActivity extends Activity {
            Log.w(LOG_TAG, "Account does not exist");
            Log.w(LOG_TAG, "Account does not exist");
            finish();
            finish();
            return;
            return;
        } else if (accountList.size() == 1) {
            final AccountWithDataSet account = accountList.get(0);
            final Intent intent = new Intent();
            intent.putExtra(ACCOUNT_NAME, account.name);
            intent.putExtra(ACCOUNT_TYPE, account.type);
            intent.putExtra(DATA_SET, account.dataSet);
            setResult(RESULT_OK, intent);
            finish();
            return;
        }
        }


        Log.i(LOG_TAG, "The number of available accounts: " + accountList.size());
        Log.i(LOG_TAG, "The number of available accounts: " + accountList.size());