Clean up use_battery_changed_broadcast flag (740452e3) · Commits · e / os / android_frameworks_base

services/core/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -255,7 +255,6 @@ java_library_static {
		"core_os_flags_lib",
		"connectivity_flags_lib",
		"device_config_service_flags_java",
		"dreams_flags_lib",
		"aconfig_new_storage_flags_lib",
		"powerstats_flags_lib",
		"MmdProperties",

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

deleted100644 → 0

+0 −11

Original line number	Diff line number	Diff line
		aconfig_declarations {
		name: "dreams_flags",
		package: "com.android.server.dreams",
		container: "system",
		srcs: ["*.aconfig"],
		}

		java_aconfig_library {
		name: "dreams_flags_lib",
		aconfig_declarations: "dreams_flags",
		}

services/core/java/com/android/server/dreams/DreamManagerService.java

+5 −18

Original line number	Diff line number	Diff line
		@@ -201,11 +201,7 @@ public final class DreamManagerService extends SystemService {
		private final BroadcastReceiver mChargingReceiver = new BroadcastReceiver() {
		@Override
		public void onReceive(Context context, Intent intent) {
		if (Flags.useBatteryChangedBroadcast()) {
		mIsCharging = mBatteryManagerInternal.isPowered(BatteryManager.BATTERY_PLUGGED_ANY);
		} else {
		mIsCharging = (BatteryManager.ACTION_CHARGING.equals(intent.getAction()));
		}
		}
		};

		@@ -282,11 +278,7 @@ public final class DreamManagerService extends SystemService {
		mDreamsDisabledByAmbientModeSuppressionConfig = mContext.getResources().getBoolean(
		com.android.internal.R.bool.config_dreamsDisabledByAmbientModeSuppressionConfig);

		if (Flags.useBatteryChangedBroadcast()) {
		mBatteryManagerInternal = getLocalService(BatteryManagerInternal.class);
		} else {
		mBatteryManagerInternal = null;
		}
		}

		@Override
		@@ -317,13 +309,8 @@ public final class DreamManagerService extends SystemService {
		mDockStateReceiver, new IntentFilter(Intent.ACTION_DOCK_EVENT));

		IntentFilter chargingIntentFilter = new IntentFilter();
		if (Flags.useBatteryChangedBroadcast()) {
		chargingIntentFilter.addAction(Intent.ACTION_BATTERY_CHANGED);
		chargingIntentFilter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);
		} else {
		chargingIntentFilter.addAction(BatteryManager.ACTION_CHARGING);
		chargingIntentFilter.addAction(BatteryManager.ACTION_DISCHARGING);
		}
		mContext.registerReceiver(mChargingReceiver, chargingIntentFilter);

		mSettingsObserver = new SettingsObserver(mHandler);
		@@ -342,7 +329,7 @@ public final class DreamManagerService extends SystemService {

		// We don't get an initial broadcast for the batter state, so we have to initialize
		// directly from BatteryManager.
		mIsCharging = mContext.getSystemService(BatteryManager.class).isCharging();
		mIsCharging = mBatteryManagerInternal.isPowered(BatteryManager.BATTERY_PLUGGED_ANY);

		updateWhenToDreamSettings();
		}

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

deleted100644 → 0

+0 −12

Original line number	Diff line number	Diff line
		package: "com.android.server.dreams"
		container: "system"

		flag {
		name: "use_battery_changed_broadcast"
		namespace: "communal"
		description: "Use ACTION_BATTERY_CHANGED broadcast to track charging state"
		bug: "329125239"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}
		No newline at end of file

services/tests/dreamservicetests/src/com/android/server/dreams/DreamManagerServiceTest.java

+9 −6

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import static com.android.dx.mockito.inline.extended.ExtendedMockito.verify;

		import static com.google.common.truth.Truth.assertThat;

		import static org.mockito.ArgumentMatchers.anyInt;
		import static org.mockito.ArgumentMatchers.argThat;
		import static org.mockito.Mockito.spy;
		import static org.mockito.Mockito.when;
		@@ -30,7 +31,6 @@ import android.app.ActivityManagerInternal;
		import android.content.BroadcastReceiver;
		import android.content.ContextWrapper;
		import android.content.Intent;
		import android.os.BatteryManager;
		import android.os.BatteryManagerInternal;
		import android.os.PowerManagerInternal;
		import android.os.UserHandle;
		@@ -71,9 +71,6 @@ public class DreamManagerServiceTest {
		private InputManagerInternal mInputManagerInternal;
		@Mock
		private PowerManagerInternal mPowerManagerInternalMock;

		@Mock
		private BatteryManager mBatteryManager;
		@Mock
		private UserManager mUserManagerMock;

		@@ -102,7 +99,13 @@ public class DreamManagerServiceTest {
		mLocalServiceKeeperRule.overrideLocalService(
		PowerManagerInternal.class, mPowerManagerInternalMock);

		when(mContextSpy.getSystemService(BatteryManager.class)).thenReturn(mBatteryManager);
		Settings.Secure.putInt(mContextSpy.getContentResolver(),
		Settings.Secure.SCREENSAVER_ACTIVATE_ON_SLEEP, 0);
		Settings.Secure.putInt(mContextSpy.getContentResolver(),
		Settings.Secure.SCREENSAVER_ACTIVATE_ON_POSTURED, 0);
		Settings.Secure.putInt(mContextSpy.getContentResolver(),
		Settings.Secure.SCREENSAVER_RESTRICT_TO_WIRELESS_CHARGING, 0);

		when(mContextSpy.getSystemService(UserManager.class)).thenReturn(mUserManagerMock);
		}

		@@ -191,7 +194,7 @@ public class DreamManagerServiceTest {
		UserHandle.USER_CURRENT);

		// Device is charging.
		when(mBatteryManager.isCharging()).thenReturn(true);
		when(mBatteryManagerInternal.isPowered(anyInt())).thenReturn(true);

		// Initialize service so settings are read.
		final DreamManagerService service = createService();