PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove plug/unplug condition for the incompatible charging" into udc-dev am: 70ef00405c

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573807

Change-Id: I8acb55c68dfa080548169dcbcc24b634aa2db297
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-04-13 02:47:51 +00:00
committed by Automerger Merge Worker
parent b009dc72a3 70ef00405c
commit f2e7f45fe6
3 changed files with 9 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java
View File

@@ -72,7 +72,7 @@ public class BatteryTipLoader extends AsyncLoaderCompat<List<BatteryTip>> {
.detect()); .detect());
tips.add(new BatteryDefenderDetector(batteryInfo, context).detect()); tips.add(new BatteryDefenderDetector(batteryInfo, context).detect());
tips.add(new DockDefenderDetector(batteryInfo, context).detect()); tips.add(new DockDefenderDetector(batteryInfo, context).detect());
tips.add(new IncompatibleChargerDetector(context, batteryInfo).detect()); tips.add(new IncompatibleChargerDetector(context).detect());
Collections.sort(tips); Collections.sort(tips);
return tips; return tips;
} }

19
src/com/android/settings/fuelgauge/batterytip/detectors/IncompatibleChargerDetector.java
View File

@@ -18,7 +18,6 @@ package com.android.settings.fuelgauge.batterytip.detectors;
import android.content.Context; import android.content.Context;
import android.util.Log; import android.util.Log;
import com.android.settings.fuelgauge.BatteryInfo;
import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
import com.android.settings.fuelgauge.batterytip.tips.IncompatibleChargerTip; import com.android.settings.fuelgauge.batterytip.tips.IncompatibleChargerTip;
import com.android.settingslib.Utils; import com.android.settingslib.Utils;
@@ -28,25 +27,17 @@ public final class IncompatibleChargerDetector implements BatteryTipDetector {
private static final String TAG = "IncompatibleChargerDetector"; private static final String TAG = "IncompatibleChargerDetector";
private final Context mContext; private final Context mContext;
private final BatteryInfo mBatteryInfo;
public IncompatibleChargerDetector(Context context, BatteryInfo batteryInfo) { public IncompatibleChargerDetector(Context context) {
mContext = context; mContext = context;
mBatteryInfo = batteryInfo;
} }
@Override @Override
public BatteryTip detect() { public BatteryTip detect() {
int state = BatteryTip.StateType.INVISIBLE; final boolean isIncompatibleCharging =
boolean isIncompatibleCharging = false; Utils.containsIncompatibleChargers(mContext, TAG);
final int state = isIncompatibleCharging
// Check incompatible charging state if the device is plugged. ? BatteryTip.StateType.NEW : BatteryTip.StateType.INVISIBLE;
if (mBatteryInfo.pluggedStatus != 0) {
isIncompatibleCharging = Utils.containsIncompatibleChargers(mContext, TAG);
if (isIncompatibleCharging) {
state = BatteryTip.StateType.NEW;
}
}
Log.d(TAG, "detect() state= " + state + " isIncompatibleCharging: " Log.d(TAG, "detect() state= " + state + " isIncompatibleCharging: "
+ isIncompatibleCharging); + isIncompatibleCharging);
return new IncompatibleChargerTip(state); return new IncompatibleChargerTip(state);

22
tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/IncompatibleChargerDetectorTest.java
View File

@@ -25,7 +25,6 @@ import android.hardware.usb.UsbManager;
import android.hardware.usb.UsbPort; import android.hardware.usb.UsbPort;
import android.hardware.usb.UsbPortStatus; import android.hardware.usb.UsbPortStatus;
import com.android.settings.fuelgauge.BatteryInfo;
import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
import org.junit.Before; import org.junit.Before;
@@ -42,7 +41,6 @@ import java.util.List;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public final class IncompatibleChargerDetectorTest { public final class IncompatibleChargerDetectorTest {
@Mock private BatteryInfo mBatteryInfo;
@Mock private UsbPort mUsbPort; @Mock private UsbPort mUsbPort;
@Mock private UsbManager mUsbManager; @Mock private UsbManager mUsbManager;
@Mock private UsbPortStatus mUsbPortStatus; @Mock private UsbPortStatus mUsbPortStatus;
@@ -55,14 +53,11 @@ public final class IncompatibleChargerDetectorTest {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application); mContext = spy(RuntimeEnvironment.application);
when(mContext.getSystemService(UsbManager.class)).thenReturn(mUsbManager); when(mContext.getSystemService(UsbManager.class)).thenReturn(mUsbManager);
mIncompatibleChargerDetector = mIncompatibleChargerDetector = new IncompatibleChargerDetector(mContext);
new IncompatibleChargerDetector(mContext, mBatteryInfo);
} }
@Test @Test
public void detect_unplugDevice_shouldNotShowTip() { public void detect_withoutIncompatibleCharger_shouldNotShowTip() {
mBatteryInfo.pluggedStatus = 0;
BatteryTip batteryTip = mIncompatibleChargerDetector.detect(); BatteryTip batteryTip = mIncompatibleChargerDetector.detect();
assertThat(batteryTip.isVisible()).isFalse(); assertThat(batteryTip.isVisible()).isFalse();
@@ -70,18 +65,7 @@ public final class IncompatibleChargerDetectorTest {
} }
@Test @Test
public void detect_plugDeviceWithoutIncompatibleCharger_shouldNotShowTip() { public void detect_withIncompatibleCharger_showTip() {
mBatteryInfo.pluggedStatus = 1;
BatteryTip batteryTip = mIncompatibleChargerDetector.detect();
assertThat(batteryTip.isVisible()).isFalse();
assertThat(batteryTip.getState()).isEqualTo(BatteryTip.StateType.INVISIBLE);
}
@Test
public void detect_plugDeviceWithIncompatibleCharger_showTip() {
mBatteryInfo.pluggedStatus = 1;
setupIncompatibleCharging(); setupIncompatibleCharging();
BatteryTip batteryTip = mIncompatibleChargerDetector.detect(); BatteryTip batteryTip = mIncompatibleChargerDetector.detect();