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

Commit 51de5978 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[SettingsLib] Use sql to sort subscription info data." into udc-dev am: cd68a55e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23446218



Change-Id: I55fadc1f035f2623871cfdd501bbe3008f123eb3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d1e5f4af cd68a55e

packages/SettingsLib/src/com/android/settingslib/mobile/dataservice/SubscriptionInfoDao.java

+7 −5
Original line number Diff line number Diff line
@@ -16,14 +16,13 @@ 


package com.android.settingslib.mobile.dataservice;



import java.util.List;



import androidx.lifecycle.LiveData;

import androidx.room.Dao;

import androidx.room.Insert;

import androidx.room.OnConflictStrategy;

import androidx.room.Query;

import androidx.room.Update;



import java.util.List;



@Dao

public interface SubscriptionInfoDao {
@@ -32,7 +31,9 @@ public interface SubscriptionInfoDao { 
    void insertSubsInfo(SubscriptionInfoEntity... subscriptionInfo);



    @Query("SELECT * FROM " + DataServiceUtils.SubscriptionInfoData.TABLE_NAME + " ORDER BY "

            + DataServiceUtils.SubscriptionInfoData.COLUMN_ID)

            + " CASE WHEN " +  DataServiceUtils.SubscriptionInfoData.COLUMN_SIM_SLOT_INDEX

            + " >= 0 THEN 1 ELSE 2 END , "

            + DataServiceUtils.SubscriptionInfoData.COLUMN_SIM_SLOT_INDEX)

    LiveData<List<SubscriptionInfoEntity>> queryAvailableSubInfos();



    @Query("SELECT * FROM " + DataServiceUtils.SubscriptionInfoData.TABLE_NAME + " WHERE "
@@ -43,7 +44,8 @@ public interface SubscriptionInfoDao { 
            + DataServiceUtils.SubscriptionInfoData.COLUMN_IS_ACTIVE_SUBSCRIPTION_ID

            + " = :isActiveSubscription" + " AND "

            + DataServiceUtils.SubscriptionInfoData.COLUMN_IS_SUBSCRIPTION_VISIBLE

            + " = :isSubscriptionVisible")

            + " = :isSubscriptionVisible" + " ORDER BY "

            + DataServiceUtils.SubscriptionInfoData.COLUMN_SIM_SLOT_INDEX)

    LiveData<List<SubscriptionInfoEntity>> queryActiveSubInfos(

            boolean isActiveSubscription, boolean isSubscriptionVisible);