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

Commit a563dac5 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

Merge "Cleanup flag verify_non_null_arguments." into main

parents c3b8ea89 82a08389

services/core/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -241,7 +241,6 @@ java_library_static { 
        "connectivity_flags_lib",

        "device_config_service_flags_java",

        "aconfig_new_storage_flags_lib",

        "powerstats_flags_lib",

        "MmdProperties",

        "mmd_flags_lib",

        "profiling_flags_lib",

services/core/java/com/android/server/powerstats/Android.bp

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
aconfig_declarations {

    name: "powerstats_flags",

    package: "com.android.server.powerstats",

    container: "system",

    srcs: ["*.aconfig"],

}



java_aconfig_library {

    name: "powerstats_flags_lib",

    aconfig_declarations: "powerstats_flags",

}

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

+3 −7
Original line number Diff line number Diff line
@@ -217,19 +217,15 @@ public class PowerStatsService extends SystemService { 


        @Override

        public void getSupportedPowerMonitors(@NonNull ResultReceiver resultReceiver) {

            if (Flags.verifyNonNullArguments()) {

            Objects.requireNonNull(resultReceiver);

            }

            getHandler().post(() -> getSupportedPowerMonitorsImpl(resultReceiver));

        }



        @Override

        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));

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

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 


package: "com.android.server.powerstats"

container: "system"



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

+0 −3
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import android.os.Looper; 
import android.os.PowerMonitor;

import android.os.PowerMonitorReadings;

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;
@@ -1242,7 +1241,6 @@ public class PowerStatsServiceTest { 
                .map(PowerMonitor::getName).toList()).contains("ENERGYCONSUMER0");

    }



    @EnableFlags(Flags.FLAG_VERIFY_NON_NULL_ARGUMENTS)

    @Test

    public void testGetSupportedPowerMonitors_withNullArguments() {

        IPowerStatsService iPowerStatsService = mService.getIPowerStatsServiceForTest();
@@ -1250,7 +1248,6 @@ public class PowerStatsServiceTest { 
                () -> iPowerStatsService.getSupportedPowerMonitors(null));

    }



    @EnableFlags(Flags.FLAG_VERIFY_NON_NULL_ARGUMENTS)

    @Test

    public void testGetPowerMonitorReadings_withNullArguments() {

        IPowerStatsService iPowerStatsService = mService.getIPowerStatsServiceForTest();