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

Commit 593dea0c authored by Eugene Susla's avatar Eugene Susla
Browse files

Fallback to default on null dialer 

Bug: 123637623
Test: set dialer to null, than flash fix end ensure it's no longer null
Change-Id: I2b6610cad89d880dacabdadc2b92291ef5083110
parent 94f927f5

src/com/android/packageinstaller/role/model/DialerRoleBehavior.java

+3 −5
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ import android.telephony.TelephonyManager; 
import androidx.annotation.NonNull;

import androidx.annotation.Nullable;



import java.util.List;



/**

 * Class for behavior of the dialer role.

 *
@@ -49,9 +47,9 @@ public class DialerRoleBehavior implements RoleBehavior { 
                context);

    }



    @NonNull

    @Nullable

    @Override

    public List<String> getDefaultHolders(@NonNull Role role, @NonNull Context context) {

        return ExclusiveDefaultHolderMixin.getDefaultHolders(role, "config_defaultDialer", context);

    public String getFallbackHolder(@NonNull Role role, @NonNull Context context) {

        return ExclusiveDefaultHolderMixin.getDefaultHolder(role, "config_defaultDialer", context);

    }

}

src/com/android/packageinstaller/role/model/Role.java

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ public class Role { 
    /**

     * Get the fallback holder of this role, which will be added whenever there are no role holders.

     * <p>

     * Should return empty if this role {@link #mShowNone shows a "None" item}.

     * Should return {@code null} if this role {@link #mShowNone shows a "None" item}.

     *

     * @param context the {@code Context} to retrieve system services

     *