Snap for 4829593 from ee96c3a259ad1ee3a8604730f8c722224ec07a50 to pi-release (c27a2117) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/fuelgauge/batterytip/StatsManagerConfig.java

+167 −1

Original line number	Original line	Diff line number	Diff line
	@@ -46,15 +46,181 @@ public class StatsManagerConfig {
	AnomalyType.EXCESSIVE_WAKEUPS_IN_BACKGROUND,		AnomalyType.EXCESSIVE_WAKEUPS_IN_BACKGROUND,
	AnomalyType.EXCESSIVE_UNOPTIMIZED_BLE_SCAN,		AnomalyType.EXCESSIVE_UNOPTIMIZED_BLE_SCAN,
	AnomalyType.EXCESSIVE_BACKGROUND_SERVICE,		AnomalyType.EXCESSIVE_BACKGROUND_SERVICE,
	AnomalyType.EXCESSIVE_WIFI_SCAN})		AnomalyType.EXCESSIVE_WIFI_SCAN,
			AnomalyType.EXCESSIVE_FLASH_WRITES,
			AnomalyType.EXCESSIVE_MEMORY_IN_BACKGROUND,
			AnomalyType.EXCESSIVE_DAVEY_RATE,
			AnomalyType.EXCESSIVE_JANKY_FRAMES,
			AnomalyType.SLOW_COLD_START_TIME,
			AnomalyType.SLOW_HOT_START_TIME,
			AnomalyType.SLOW_WARM_START_TIME,
			AnomalyType.EXCESSIVE_BACKGROUND_SYNCS,
			AnomalyType.EXCESSIVE_GPS_SCANS_IN_BACKGROUND,
			AnomalyType.EXCESSIVE_JOB_SCHEDULING,
			AnomalyType.EXCESSIVE_MOBILE_NETWORK_IN_BACKGROUND,
			AnomalyType.EXCESSIVE_WIFI_LOCK_TIME,
			AnomalyType.JOB_TIMED_OUT,
			AnomalyType.LONG_UNOPTIMIZED_BLE_SCAN,
			AnomalyType.BACKGROUND_ANR,
			AnomalyType.BACKGROUND_CRASH_RATE,
			AnomalyType.EXCESSIVE_ANR_LOOPING,
			AnomalyType.EXCESSIVE_ANRS,
			AnomalyType.EXCESSIVE_CRASH_RATE,
			AnomalyType.EXCESSIVE_CRASH_LOOPING,
			AnomalyType.NUMBER_OF_OPEN_FILES,
			})
	public @interface AnomalyType {		public @interface AnomalyType {
			/**
			* This represents an error condition in the anomaly detection.
			*/
	int NULL = -1;		int NULL = -1;

			/**
			* The anomaly type does not match any other defined type.
			*/
	int UNKNOWN_REASON = 0;		int UNKNOWN_REASON = 0;

			/**
			* The application held a partial (screen off) wake lock for a period of time that
			* exceeded the threshold with the screen off when not charging.
			*/
	int EXCESSIVE_WAKELOCK_ALL_SCREEN_OFF = 1;		int EXCESSIVE_WAKELOCK_ALL_SCREEN_OFF = 1;

			/**
			* The application exceeded the maximum number of wakeups while in the background
			* when not charging.
			*/
	int EXCESSIVE_WAKEUPS_IN_BACKGROUND = 2;		int EXCESSIVE_WAKEUPS_IN_BACKGROUND = 2;

			/**
			* The application did unoptimized Bluetooth scans too frequently when not charging.
			*/
	int EXCESSIVE_UNOPTIMIZED_BLE_SCAN = 3;		int EXCESSIVE_UNOPTIMIZED_BLE_SCAN = 3;

			/**
			* The application ran in the background for a period of time that exceeded the
			* threshold.
			*/
	int EXCESSIVE_BACKGROUND_SERVICE = 4;		int EXCESSIVE_BACKGROUND_SERVICE = 4;

			/**
			* The application exceeded the maximum number of wifi scans when not charging.
			*/
	int EXCESSIVE_WIFI_SCAN = 5;		int EXCESSIVE_WIFI_SCAN = 5;

			/**
			* The application exceed the maximum number of flash writes
			*/
			int EXCESSIVE_FLASH_WRITES = 6;

			/**
			* The application used more than the maximum memory, while not spending any time
			* in the foreground.
			*/
			int EXCESSIVE_MEMORY_IN_BACKGROUND = 7;

			/**
			* The application exceeded the maximum percentage of frames with a render rate of
			* greater than 700ms.
			*/
			int EXCESSIVE_DAVEY_RATE = 8;

			/**
			* The application exceeded the maximum percentage of frames with a render rate
			* greater than 16ms.
			*/
			int EXCESSIVE_JANKY_FRAMES = 9;

			/**
			* The application exceeded the maximum cold start time - the app has not been
			* launched since last system start, died or was killed.
			*/
			int SLOW_COLD_START_TIME = 10;

			/**
			* The application exceeded the maximum hot start time - the app and activity are
			* already in memory.
			*/
			int SLOW_HOT_START_TIME = 11;

			/**
			* The application exceeded the maximum warm start time - the app was already in
			* memory but the activity wasn’t created yet or was removed from memory.
			*/
			int SLOW_WARM_START_TIME = 12;

			/**
			* The application exceeded the maximum number of syncs while in the background.
			*/
			int EXCESSIVE_BACKGROUND_SYNCS = 13;

			/**
			* The application exceeded the maximum number of gps scans while in the background.
			*/
			int EXCESSIVE_GPS_SCANS_IN_BACKGROUND = 14;

			/**
			* The application scheduled more than the maximum number of jobs while not charging.
			*/
			int EXCESSIVE_JOB_SCHEDULING = 15;

			/**
			* The application exceeded the maximum amount of mobile network traffic while in
			* the background.
			*/
			int EXCESSIVE_MOBILE_NETWORK_IN_BACKGROUND = 16;

			/**
			* The application held the WiFi lock for more than the maximum amount of time while
			* not charging.
			*/
			int EXCESSIVE_WIFI_LOCK_TIME = 17;

			/**
			* The application scheduled a job that ran longer than the maximum amount of time.
			*/
			int JOB_TIMED_OUT = 18;

			/**
			* The application did an unoptimized Bluetooth scan that exceeded the maximum
			* time while in the background.
			*/
			int LONG_UNOPTIMIZED_BLE_SCAN = 19;

			/**
			* The application exceeded the maximum ANR rate while in the background.
			*/
			int BACKGROUND_ANR = 20;

			/**
			* The application exceeded the maximum crash rate while in the background.
			*/
			int BACKGROUND_CRASH_RATE = 21;

			/**
			* The application exceeded the maximum ANR-looping rate.
			*/
			int EXCESSIVE_ANR_LOOPING = 22;

			/**
			* The application exceeded the maximum ANR rate.
			*/
			int EXCESSIVE_ANRS = 23;

			/**
			* The application exceeded the maximum crash rate.
			*/
			int EXCESSIVE_CRASH_RATE = 24;

			/**
			* The application exceeded the maximum crash-looping rate.
			*/
			int EXCESSIVE_CRASH_LOOPING = 25;

			/**
			* The application crashed because no more file descriptors were available.
			*/
			int NUMBER_OF_OPEN_FILES = 26;
	}		}

	}		}

src/com/android/settings/sound/AudioSwitchPreferenceController.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -118,7 +118,6 @@ public abstract class AudioSwitchPreferenceController extends BasePreferenceCont
	Log.e(TAG, "Bluetooth is not supported on this device");		Log.e(TAG, "Bluetooth is not supported on this device");
	return;		return;
	}		}
	mLocalBluetoothManager.setForegroundActivity(mContext);
	mProfileManager = mLocalBluetoothManager.getProfileManager();		mProfileManager = mLocalBluetoothManager.getProfileManager();
	}		}

	@@ -171,11 +170,13 @@ public abstract class AudioSwitchPreferenceController extends BasePreferenceCont

	@Override		@Override
	public void onStart() {		public void onStart() {
			mLocalBluetoothManager.setForegroundActivity(mContext);
	register();		register();
	}		}

	@Override		@Override
	public void onStop() {		public void onStop() {
			mLocalBluetoothManager.setForegroundActivity(null);
	unregister();		unregister();
	}		}

tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -230,6 +230,7 @@ public class AudioOutputSwitchPreferenceControllerTest {
	verify(mLocalBluetoothManager.getEventManager()).registerCallback(		verify(mLocalBluetoothManager.getEventManager()).registerCallback(
	any(BluetoothCallback.class));		any(BluetoothCallback.class));
	verify(mContext).registerReceiver(any(BroadcastReceiver.class), any(IntentFilter.class));		verify(mContext).registerReceiver(any(BroadcastReceiver.class), any(IntentFilter.class));
			verify(mLocalBluetoothManager).setForegroundActivity(mContext);
	}		}

	@Test		@Test
	@@ -240,6 +241,7 @@ public class AudioOutputSwitchPreferenceControllerTest {
	verify(mLocalBluetoothManager.getEventManager()).unregisterCallback(		verify(mLocalBluetoothManager.getEventManager()).unregisterCallback(
	any(BluetoothCallback.class));		any(BluetoothCallback.class));
	verify(mContext).unregisterReceiver(any(BroadcastReceiver.class));		verify(mContext).unregisterReceiver(any(BroadcastReceiver.class));
			verify(mLocalBluetoothManager).setForegroundActivity(null);
	}		}

	@Test		@Test