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

Commit 122c7d95 authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-17.1' into v1-q

parents 665399bb d38b16c5

res/values/lineage_config.xml

+4 −0
Original line number Diff line number Diff line
@@ -24,4 +24,8 @@ 
         3 = right side

    -->

    <integer name="config_fingerprintSensorLocation">0</integer>



    <string-array name="config_ignored_backup_transports" translatable="false">

        <item>com.android.localtransport/.LocalTransport</item>

    </string-array>

</resources>

src/com/android/settings/backup/transport/TransportHelper.java

+15 −1
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ import android.os.UserHandle; 
import android.util.Log;

import androidx.annotation.Nullable;



import com.android.settings.R;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collections;
@@ -38,12 +40,24 @@ class TransportHelper { 
    private final IBackupManager mBackupManager = IBackupManager.Stub.asInterface(

        ServiceManager.getService(Context.BACKUP_SERVICE));



    private Context mContext;



    TransportHelper(Context context) {

        mContext = context;

    }



    List<Transport> getTransports() {

        String[] backupTransports = getBackupTransports();

        if (backupTransports == null) return Collections.emptyList();

        ArrayList<Transport> transports = new ArrayList<>(backupTransports.length);

        String[] ignoredTransports = mContext.getResources().getStringArray(

                R.array.config_ignored_backup_transports);

        for (String name : getBackupTransports()) {

            if (name.endsWith("LocalTransport")) continue; // don't list debug-only LocalTransport

            boolean ignored = false;

            for (String ignoredTransport : ignoredTransports) {

                if (name.equals(ignoredTransport)) ignored = true;

            }

            if (ignored) continue;

            CharSequence label = getLabelFromBackupTransport(name);

            if (label == null || label.length() == 0) label = name;

            Transport transport = new Transport(name, label, getSummaryFromBackupTransport(name));

src/com/android/settings/backup/transport/TransportPreferenceController.java

+2 −1
Original line number Diff line number Diff line
@@ -28,11 +28,12 @@ public class TransportPreferenceController extends AbstractPreferenceController 
    }



    private final OnTransportChangedListener listener;

    private final TransportHelper transportHelper = new TransportHelper();

    private final TransportHelper transportHelper;



    public TransportPreferenceController(Context context, OnTransportChangedListener listener) {

        super(context);

        this.listener = listener;

        transportHelper = new TransportHelper(context);

    }



    @Override