Snap for 7579381 from 7c55ea3fc03c4397618046689dc954a331d4cfdd to sc-release (070a4bde) · Commits · e / os / android_packages_apps_Settings

res/values/config.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -545,4 +545,7 @@
		<item>2</item>
		<item>3</item>
		</integer-array>

		<!-- Whether to aggregate for network selection list-->
		<bool name="config_network_selection_list_aggregation_enabled">false</bool>
		</resources>

res/xml/mobile_network_settings.xml

+2 −1

Original line number	Diff line number	Diff line
		@@ -86,7 +86,8 @@
		<Preference
		android:key="carrier_wifi_network"
		android:title="@string/carrier_wifi_network_title"
		android:selectable="false"/>
		android:selectable="false"
		settings:searchable="false"/>

		<SwitchPreference
		android:key="mms_message"

src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -173,6 +173,9 @@ public class AppBatteryPreferenceController extends BasePreferenceController
		new AsyncTask<Void, Void, BatteryDiffEntry>() {
		@Override
		protected BatteryDiffEntry doInBackground(Void... unused) {
		if (mPackageName == null) {
		return null;
		}
		final List<BatteryDiffEntry> batteryDiffEntries =
		BatteryChartPreferenceController.getBatteryLast24HrUsageData(mContext);
		if (batteryDiffEntries == null) {
		@@ -186,8 +189,7 @@ public class AppBatteryPreferenceController extends BasePreferenceController
		== ConvertUtils.CONSUMER_TYPE_UID_BATTERY)
		.filter(entry -> entry.mBatteryHistEntry.mUserId == mUserId)
		.filter(entry -> {
		if (entry.mBatteryHistEntry.mPackageName
		.equals(mPackageName)) {
		if (mPackageName.equals(entry.getPackageName())) {
		Log.i(TAG, "Return target application: "
		+ entry.mBatteryHistEntry.mPackageName
		+ " \| uid: " + entry.mBatteryHistEntry.mUid

src/com/android/settings/fuelgauge/BatteryChartPreferenceController.java

+7 −15

Original line number	Diff line number	Diff line
		@@ -226,8 +226,8 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll
		new Pair(ConvertUtils.METRIC_KEY_PACKAGE, packageName),
		new Pair(ConvertUtils.METRIC_KEY_BATTERY_LEVEL, histEntry.mBatteryLevel),
		new Pair(ConvertUtils.METRIC_KEY_BATTERY_USAGE, powerPref.getPercent()));
		Log.d(TAG, String.format("handleClick() label=%s key=%s enntry=\n%s",
		diffEntry.getAppLabel(), histEntry.getKey(), histEntry));
		Log.d(TAG, String.format("handleClick() label=%s key=%s package=%s",
		diffEntry.getAppLabel(), histEntry.getKey(), histEntry.mPackageName));
		AdvancedPowerUsageDetail.startBatteryDetailPage(
		mActivity, mFragment, diffEntry, powerPref.getPercent(),
		isValidToShowSummary(packageName), getSlotInformation());
		@@ -285,9 +285,10 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll
		}
		forceRefreshUi();
		Log.d(TAG, String.format(
		"setBatteryHistoryMap() size=%d\nkeys=%s\nlevels=%s",
		"setBatteryHistoryMap() size=%d key=%s\nlevels=%s",
		batteryHistoryMap.size(),
		utcToLocalTime(mPrefContext, mBatteryHistoryKeys),
		ConvertUtils.utcToLocalTime(mPrefContext,
		mBatteryHistoryKeys[mBatteryHistoryKeys.length - 1]),
		Arrays.toString(mBatteryHistoryLevels)));

		// Loads item icon and label in the background.
		@@ -403,14 +404,14 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll
		final String appLabel = entry.getAppLabel();
		final Drawable appIcon = entry.getAppIcon();
		if (TextUtils.isEmpty(appLabel) \|\| appIcon == null) {
		Log.w(TAG, "cannot find app resource for\n" + entry);
		Log.w(TAG, "cannot find app resource for:" + entry.getPackageName());
		continue;
		}
		final String prefKey = entry.mBatteryHistEntry.getKey();
		PowerGaugePreference pref = mAppListPrefGroup.findPreference(prefKey);
		if (pref != null) {
		isAdded = true;
		Log.w(TAG, "preference should be removed for\n" + entry);
		Log.w(TAG, "preference should be removed for:" + entry.getPackageName());
		} else {
		pref = (PowerGaugePreference) mPreferenceCache.get(prefKey);
		}
		@@ -587,15 +588,6 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll
		mHandler.post(() -> mPreferenceScreen.addPreference(mFooterPreference));
		}

		private static String utcToLocalTime(Context context, long[] timestamps) {
		final StringBuilder builder = new StringBuilder();
		for (int index = 0; index < timestamps.length; index++) {
		builder.append(String.format("%s\| ",
		ConvertUtils.utcToLocalTime(context, timestamps[index])));
		}
		return builder.toString();
		}

		private static boolean contains(String target, CharSequence[] packageNames) {
		if (target != null && packageNames != null) {
		for (CharSequence packageName : packageNames) {

src/com/android/settings/fuelgauge/BatteryChartView.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -139,6 +139,7 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick

		/** Sets all levels value to draw the trapezoid shape */
		public void setLevels(int[] levels) {
		Log.d(TAG, "setLevels() " + (levels == null ? "null" : levels.length));
		if (levels == null) {
		mLevels = null;
		return;