Merge "Remove android.os.vibrator.throttle_vibration_params_requests" into main (4a7694e7) · Commits · e / os / android_frameworks_base

core/java/android/os/vibrator/flags.aconfig

+0 −10

Original line number	Diff line number	Diff line
		@@ -30,16 +30,6 @@ flag {
		}
		}

		flag {
		namespace: "haptics"
		name: "throttle_vibration_params_requests"
		description: "Control the frequency of vibration params requests to prevent overloading the vendor service"
		bug: "355320860"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		namespace: "haptics"
		name: "vibration_attribute_ime_usage_api"

services/core/java/com/android/server/vibrator/VibratorControlService.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -41,7 +41,6 @@ import android.os.RemoteException;
		import android.os.SystemClock;
		import android.os.VibrationAttributes;
		import android.os.VibrationEffect;
		import android.os.vibrator.Flags;
		import android.util.IndentingPrintWriter;
		import android.util.IntArray;
		import android.util.Slog;
		@@ -266,8 +265,7 @@ final class VibratorControlService extends IVibratorControlService.Stub {
		return null;
		}

		if (Flags.throttleVibrationParamsRequests() && mVibrationParamRequest != null
		&& mVibrationParamRequest.usage == usage) {
		if (mVibrationParamRequest != null && mVibrationParamRequest.usage == usage) {
		// Reuse existing future for ongoing request with same usage.
		return mVibrationParamRequest.future;
		}

services/tests/vibrator/src/com/android/server/vibrator/VibratorControlServiceTest.java

+0 −29

Original line number	Diff line number	Diff line
		@@ -45,12 +45,7 @@ import android.os.Handler;
		import android.os.IBinder;
		import android.os.Process;
		import android.os.test.TestLooper;
		import android.os.vibrator.Flags;
		import android.os.vibrator.VibrationConfig;
		import android.platform.test.annotations.RequiresFlagsDisabled;
		import android.platform.test.annotations.RequiresFlagsEnabled;
		import android.platform.test.flag.junit.CheckFlagsRule;
		import android.platform.test.flag.junit.DeviceFlagsValueProvider;
		import android.util.SparseArray;

		import androidx.test.InstrumentationRegistry;
		@@ -76,8 +71,6 @@ public class VibratorControlServiceTest {

		@Rule
		public MockitoRule rule = MockitoJUnit.rule();
		@Rule
		public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();

		@Mock private VibrationScaler mMockVibrationScaler;
		@Mock private PackageManagerInternal mPackageManagerInternalMock;
		@@ -325,7 +318,6 @@ public class VibratorControlServiceTest {
		}

		@Test
		@RequiresFlagsEnabled(Flags.FLAG_THROTTLE_VIBRATION_PARAMS_REQUESTS)
		public void testRequestVibrationParams_withOngoingRequestAndSameUsage_returnOngoingFuture() {
		int timeoutInMillis = 10;
		mVibratorControlService.registerVibratorController(mFakeVibratorController);
		@@ -343,27 +335,6 @@ public class VibratorControlServiceTest {
		assertThat(mFakeVibratorController.requestVibrationParamsCounter).isEqualTo(1);
		}

		@Test
		@RequiresFlagsDisabled(Flags.FLAG_THROTTLE_VIBRATION_PARAMS_REQUESTS)
		public void testRequestVibrationParams_withOngoingRequestAndSameUsage_returnNewFuture() {
		int timeoutInMillis = 10;
		mVibratorControlService.registerVibratorController(mFakeVibratorController);
		CompletableFuture<Void> future =
		mVibratorControlService.triggerVibrationParamsRequest(UID, USAGE_RINGTONE,
		timeoutInMillis);
		CompletableFuture<Void> future2 =
		mVibratorControlService.triggerVibrationParamsRequest(UID, USAGE_RINGTONE,
		timeoutInMillis);
		mTestLooper.dispatchAll();

		assertThat(future).isNotNull();
		assertThat(future2).isNotNull();
		assertThat(future).isNotEqualTo(future2);
		assertThat(future.isDone()).isTrue();
		assertThat(future2.isDone()).isTrue();
		assertThat(mFakeVibratorController.requestVibrationParamsCounter).isEqualTo(2);
		}

		private static int buildVibrationTypesMask(int... types) {
		int typesMask = 0;
		for (int type : types) {