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

Commit 5c9db0cb authored by Fan Zhang's avatar Fan Zhang
Browse files

Fix CodeInspectionTest 

Fixes: 130897640
Test: robo
Change-Id: Ic2d952e4d76bb0a2be6eab7ddc999b56656132a6
parent 5d705839

src/com/android/settings/sim/CallsSimListDialogFragment.java

+6 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 




package com.android.settings.sim;

package com.android.settings.sim;





import android.app.settings.SettingsEnums;

import android.content.Context;

import android.content.Context;

import android.telecom.PhoneAccount;

import android.telecom.PhoneAccount;

import android.telecom.PhoneAccountHandle;

import android.telecom.PhoneAccountHandle;
@@ -56,4 +57,9 @@ public class CallsSimListDialogFragment extends SimListDialogFragment { 
        }

        }

        return result;

        return result;

    }

    }



    @Override

    public int getMetricsCategory() {

        return SettingsEnums.DIALOG_CALL_SIM_LIST;

    }

}
 
}

src/com/android/settings/sim/PreferredSimDialogFragment.java

+6 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.settings.sim; 




import android.app.Activity;

import android.app.Activity;

import android.app.Dialog;

import android.app.Dialog;

import android.app.settings.SettingsEnums;

import android.content.DialogInterface;

import android.content.DialogInterface;

import android.os.Bundle;

import android.os.Bundle;

import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionInfo;
@@ -98,4 +99,9 @@ public class PreferredSimDialogFragment extends SimDialogFragment implements 
    protected SubscriptionManager getSubscriptionManager() {

    protected SubscriptionManager getSubscriptionManager() {

        return getContext().getSystemService(SubscriptionManager.class);

        return getContext().getSystemService(SubscriptionManager.class);

    }

    }



    @Override

    public int getMetricsCategory() {

        return SettingsEnums.DIALOG_PREFERRED_SIM_PICKER;

    }

}
 
}

src/com/android/settings/sim/SimDialogFragment.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -20,10 +20,11 @@ import android.content.DialogInterface; 
import android.os.Bundle;

import android.os.Bundle;





import androidx.annotation.NonNull;

import androidx.annotation.NonNull;

import androidx.fragment.app.DialogFragment;



import com.android.settings.core.instrumentation.InstrumentedDialogFragment;





/** Common functionality for showing a dialog in SimDialogActivity. */

/** Common functionality for showing a dialog in SimDialogActivity. */

public abstract class SimDialogFragment extends DialogFragment {

public abstract class SimDialogFragment extends InstrumentedDialogFragment {

    private static final String TAG = "SimDialogFragment";

    private static final String TAG = "SimDialogFragment";





    private static final String KEY_TITLE_ID = "title_id";

    private static final String KEY_TITLE_ID = "title_id";

src/com/android/settings/sim/SimListDialogFragment.java

+7 −1
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings.sim;

package com.android.settings.sim;





import android.app.Dialog;

import android.app.Dialog;

import android.app.settings.SettingsEnums;

import android.content.Context;

import android.content.Context;

import android.content.DialogInterface;

import android.content.DialogInterface;

import android.os.Bundle;

import android.os.Bundle;
@@ -122,6 +123,11 @@ public class SimListDialogFragment extends SimDialogFragment implements 
        builder.setAdapter(mAdapter, this);

        builder.setAdapter(mAdapter, this);

    }

    }





    @Override

    public int getMetricsCategory() {

        return SettingsEnums.DIALOG_SIM_LIST;

    }



    private static class SelectSubscriptionAdapter extends BaseAdapter {

    private static class SelectSubscriptionAdapter extends BaseAdapter {

        private Context mContext;

        private Context mContext;

        private LayoutInflater mInflater;

        private LayoutInflater mInflater;

tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java

+1 −3
Original line number Original line Diff line number Diff line
@@ -24,12 +24,11 @@ import com.android.settings.search.SearchIndexProviderCodeInspector; 
import com.android.settings.slices.SliceControllerInXmlCodeInspector;

import com.android.settings.slices.SliceControllerInXmlCodeInspector;





import org.junit.Before;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runner.RunWith;

import org.robolectric.RobolectricTestRunner;





import java.util.List;

import java.util.List;

import org.robolectric.RobolectricTestRunner;





/**

/**

 * Test suite that scans all classes in app package, and performs different types of code inspection

 * Test suite that scans all classes in app package, and performs different types of code inspection
@@ -47,7 +46,6 @@ public class CodeInspectionTest { 
    }

    }





    @Test

    @Test

    @Ignore("b/130897640")

    public void runInstrumentableFragmentCodeInspection() {

    public void runInstrumentableFragmentCodeInspection() {

        new InstrumentableFragmentCodeInspector(mClasses).run();

        new InstrumentableFragmentCodeInspector(mClasses).run();

    }

    }