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

Merge "Fix NullPointerException when full charge unplug a device with work profile" into main

Browse Source
This commit is contained in:
YK Hung
2023-10-11 01:58:24 +00:00
committed by Android (Google) Code Review
parent 7385665d8c 0e277429cb
commit 74927c7e11
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBroadcastReceiver.java
View File

@@ -63,6 +63,10 @@ public final class BatteryUsageBroadcastReceiver extends BroadcastReceiver {
} }
final String action = intent.getAction(); final String action = intent.getAction();
Log.d(TAG, "onReceive:" + action); Log.d(TAG, "onReceive:" + action);
if (DatabaseUtils.isWorkProfile(context)) {
Log.w(TAG, "do nothing for work profile action=" + action);
return;
}
DatabaseUtils.recordDateTime(context, action); DatabaseUtils.recordDateTime(context, action);
final String fullChargeIntentAction = FeatureFactory.getFeatureFactory() final String fullChargeIntentAction = FeatureFactory.getFeatureFactory()
.getPowerUsageFeatureProvider() .getPowerUsageFeatureProvider()

11
tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBroadcastReceiverTest.java
View File

@@ -30,6 +30,7 @@ import android.os.BatteryManager;
import android.os.SystemClock; import android.os.SystemClock;
import android.text.format.DateUtils; import android.text.format.DateUtils;
import com.android.settings.testutils.BatteryTestUtils;
import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before; import org.junit.Before;
@@ -67,6 +68,16 @@ public final class BatteryUsageBroadcastReceiverTest {
assertThat(mBatteryUsageBroadcastReceiver.mFetchBatteryUsageData).isFalse(); assertThat(mBatteryUsageBroadcastReceiver.mFetchBatteryUsageData).isFalse();
} }
@Test
public void onReceive_workProfile_doNothing() {
BatteryTestUtils.setWorkProfile(mContext);
mBatteryUsageBroadcastReceiver.onReceive(mContext,
new Intent(BatteryUsageBroadcastReceiver.ACTION_BATTERY_UNPLUGGING));
assertThat(mBatteryUsageBroadcastReceiver.mFetchBatteryUsageData).isFalse();
}
@Test @Test
public void onReceive_aospNotFullCharged_notFetchUsageData() { public void onReceive_aospNotFullCharged_notFetchUsageData() {
when(mFakeFeatureFactory.powerUsageFeatureProvider.getFullChargeIntentAction()) when(mFakeFeatureFactory.powerUsageFeatureProvider.getFullChargeIntentAction())