Merge "Verify arguments passed are non-null." into main (b6eb5b62) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/powerstats/PowerStatsService.java

+18 −3

Original line number	Diff line number	Diff line
		@@ -62,6 +62,7 @@ import java.io.PrintWriter;
		import java.util.ArrayList;
		import java.util.List;
		import java.util.Locale;
		import java.util.Objects;
		import java.util.concurrent.CompletableFuture;
		import java.util.concurrent.Executor;

		@@ -207,19 +208,28 @@ public class PowerStatsService extends SystemService {
		private final IBinder mService = new IPowerStatsService.Stub() {

		@Override
		public void getSupportedPowerMonitors(ResultReceiver resultReceiver) {
		public void getSupportedPowerMonitors(@NonNull ResultReceiver resultReceiver) {
		if (Flags.verifyNonNullArguments()) {
		Objects.requireNonNull(resultReceiver);
		}
		getHandler().post(() -> getSupportedPowerMonitorsImpl(resultReceiver));
		}

		@Override
		public void getPowerMonitorReadings(int[] powerMonitorIds, ResultReceiver resultReceiver) {
		public void getPowerMonitorReadings(@NonNull int[] powerMonitorIds,
		@NonNull ResultReceiver resultReceiver) {
		if (Flags.verifyNonNullArguments()) {
		Objects.requireNonNull(powerMonitorIds);
		Objects.requireNonNull(resultReceiver);
		}
		int callingUid = Binder.getCallingUid();
		getHandler().post(() ->
		getPowerMonitorReadingsImpl(powerMonitorIds, resultReceiver, callingUid));
		}

		@Override
		protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
		protected void dump(@NonNull FileDescriptor fd, @NonNull PrintWriter pw,
		@Nullable String[] args) {
		if (!DumpUtils.checkDumpPermission(mContext, TAG, pw)) return;

		if (mPowerStatsLogger == null) {
		@@ -263,6 +273,11 @@ public class PowerStatsService extends SystemService {
		}
		};

		@VisibleForTesting
		IPowerStatsService getIPowerStatsServiceForTest() {
		return (IPowerStatsService) mService;
		}

		private class DeviceConfigListener implements DeviceConfig.OnPropertiesChangedListener {
		public Executor mExecutor = new HandlerExecutor(getHandler());

services/core/java/com/android/server/powerstats/flags.aconfig

+11 −0

Original line number	Diff line number	Diff line
		@@ -11,3 +11,14 @@ flag {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "verify_non_null_arguments"
		namespace: "backstage_power"
		description: "Verify arguments passed are non-null"
		bug: "356731520"
		is_fixed_read_only: true
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}
		No newline at end of file

services/tests/powerstatstests/src/com/android/server/powerstats/PowerStatsServiceTest.java

+24 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package com.android.server.powerstats;
		import static com.google.common.truth.Truth.assertThat;

		import static org.junit.Assert.assertFalse;
		import static org.junit.Assert.assertThrows;
		import static org.junit.Assert.assertTrue;
		import static org.junit.Assert.fail;

		@@ -37,6 +38,8 @@ import android.os.IPowerStatsService;
		import android.os.Looper;
		import android.os.PowerMonitor;
		import android.os.ResultReceiver;
		import android.platform.test.annotations.EnableFlags;
		import android.platform.test.flag.junit.SetFlagsRule;
		import android.provider.DeviceConfig;
		import android.provider.DeviceConfigInterface;

		@@ -58,6 +61,7 @@ import com.android.server.powerstats.nano.StateResidencyResultProto;
		import com.android.server.testutils.FakeDeviceConfigInterface;

		import org.junit.Before;
		import org.junit.Rule;
		import org.junit.Test;

		import java.io.ByteArrayOutputStream;
		@@ -101,6 +105,8 @@ public class PowerStatsServiceTest {
		private static final int STATE_RESIDENCY_COUNT = 4;
		private static final int APP_UID = 10042;

		@Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();

		private final Context mContext = InstrumentationRegistry.getInstrumentation().getContext();
		private PowerStatsService mService;
		private TestPowerStatsHALWrapper mPowerStatsHALWrapper = new TestPowerStatsHALWrapper();
		@@ -1198,4 +1204,22 @@ public class PowerStatsServiceTest {
		assertThat(Arrays.stream(supportedPowerMonitorsResult.powerMonitors)
		.map(PowerMonitor::getName).toList()).contains("ENERGYCONSUMER0");
		}

		@EnableFlags(Flags.FLAG_VERIFY_NON_NULL_ARGUMENTS)
		@Test
		public void testGetSupportedPowerMonitors_withNullArguments() {
		IPowerStatsService iPowerStatsService = mService.getIPowerStatsServiceForTest();
		assertThrows(NullPointerException.class,
		() -> iPowerStatsService.getSupportedPowerMonitors(null));
		}

		@EnableFlags(Flags.FLAG_VERIFY_NON_NULL_ARGUMENTS)
		@Test
		public void testGetPowerMonitorReadings_withNullArguments() {
		IPowerStatsService iPowerStatsService = mService.getIPowerStatsServiceForTest();
		assertThrows(NullPointerException.class, () -> iPowerStatsService.getPowerMonitorReadings(
		null, new GetPowerMonitorsResult()));
		assertThrows(NullPointerException.class, () -> iPowerStatsService.getPowerMonitorReadings(
		new int[] {0}, null));
		}
		}