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

Commit 1f8efc14 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Clean up: fix incorrect @VisibleForTesting imports"

parents a9ec5244 176ccd0c

src/com/android/settings/SettingsDumpService.java

+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import android.telephony.SubscriptionInfo; 
import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;



import com.android.internal.annotations.VisibleForTesting;

import com.android.settings.applications.ProcStatsData;

import com.android.settings.fuelgauge.batterytip.AnomalyConfigJobService;

import com.android.settingslib.net.DataUsageController;
@@ -43,6 +42,8 @@ import java.io.File; 
import java.io.FileDescriptor;

import java.io.PrintWriter;



import androidx.annotation.VisibleForTesting;



public class SettingsDumpService extends Service {

    @VisibleForTesting

    static final String KEY_SERVICE = "service";

src/com/android/settings/accounts/AccountPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ import android.util.ArrayMap; 
import android.util.Log;

import android.util.SparseArray;



import com.android.internal.annotations.VisibleForTesting;

import com.android.settings.AccessiblePreferenceCategory;

import com.android.settings.R;

import com.android.settings.SettingsPreferenceFragment;
@@ -63,6 +62,7 @@ import java.util.Collections; 
import java.util.Comparator;

import java.util.List;



import androidx.annotation.VisibleForTesting;

import androidx.preference.Preference;

import androidx.preference.Preference.OnPreferenceClickListener;

import androidx.preference.PreferenceGroup;

src/com/android/settings/applications/UsageAccessDetails.java

+1 −1
Original line number Diff line number Diff line
@@ -26,12 +26,12 @@ import android.content.pm.ResolveInfo; 
import android.os.Bundle;

import android.provider.Settings;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.settings.R;

import com.android.settings.applications.AppStateUsageBridge.UsageState;

import com.android.settings.overlay.FeatureFactory;



import androidx.annotation.VisibleForTesting;

import androidx.preference.Preference;

import androidx.preference.Preference.OnPreferenceChangeListener;

import androidx.preference.Preference.OnPreferenceClickListener;

src/com/android/settings/applications/appinfo/DrawOverlayDetails.java

+5 −4
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import android.provider.Settings; 
import android.view.Window;

import android.view.WindowManager;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.settings.R;

import com.android.settings.applications.AppInfoWithHeader;
@@ -38,6 +37,7 @@ import com.android.settings.applications.AppStateOverlayBridge.OverlayState; 
import com.android.settings.overlay.FeatureFactory;

import com.android.settingslib.applications.ApplicationsState.AppEntry;



import androidx.annotation.VisibleForTesting;

import androidx.preference.Preference;

import androidx.preference.Preference.OnPreferenceChangeListener;

import androidx.preference.Preference.OnPreferenceClickListener;
@@ -175,6 +175,7 @@ public class DrawOverlayDetails extends AppInfoWithHeader implements OnPreferenc 


    public static CharSequence getSummary(Context context, OverlayState overlayState) {

        return context.getString(overlayState.isPermissible() ?

            R.string.app_permission_summary_allowed : R.string.app_permission_summary_not_allowed);

                R.string.app_permission_summary_allowed

                : R.string.app_permission_summary_not_allowed);

    }

}

src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.net.Uri; 
import android.os.UserHandle;

import android.provider.Settings;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.app.AssistUtils;

import com.android.settings.core.PreferenceControllerMixin;

import com.android.settingslib.core.AbstractPreferenceController;
@@ -34,6 +33,7 @@ import com.android.settingslib.core.lifecycle.events.OnResume; 
import java.util.Arrays;

import java.util.List;



import androidx.annotation.VisibleForTesting;

import androidx.preference.Preference;

import androidx.preference.PreferenceScreen;

import androidx.preference.TwoStatePreference;