release-request-5f16c261-dcc8-4c4f-a0bd-deb507084f3d-for-git_oc-mr1-release-43... (ee4e80b3) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/development/DevelopmentSettings.java

+10 −7

Original line number	Diff line number	Diff line
		@@ -900,6 +900,8 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
		}

		private void updatePasswordSummary() {
		mPassword.setEnabled(mBackupManager != null);
		if (mBackupManager != null) {
		try {
		if (mBackupManager.hasBackupPassword()) {
		mPassword.setSummary(R.string.local_backup_password_summary_change);
		@@ -910,6 +912,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
		// Not much we can do here
		}
		}
		}

		private void writeBtHciSnoopLogOptions() {
		BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();

+0 −5

Original line number	Diff line number	Diff line
		@@ -211,11 +211,6 @@ public class LocationSettings extends LocationSettingsBase
		request.contentDescription);
		pref.setIcon(request.icon);
		pref.setTitle(request.label);
		if (request.isHighBattery) {
		pref.setSummary(R.string.location_high_battery_use);
		} else {
		pref.setSummary(R.string.location_low_battery_use);
		}
		pref.setOnPreferenceClickListener(
		new PackageEntryClickedListener(request.packageName, request.userHandle));
		recentLocationPrefs.add(pref);

+1 −1

Original line number	Diff line number	Diff line
		@@ -433,7 +433,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
		String dnsServers = mLinkProperties.getDnsServers().stream()
		.filter(Inet4Address.class::isInstance)
		.map(InetAddress::getHostAddress)
		.collect(Collectors.joining(","));
		.collect(Collectors.joining("\n"));

		// Update UI.
		updatePreference(mIpAddressPref, ipv4Address);

+10 −1

Original line number	Diff line number	Diff line
		@@ -2,6 +2,15 @@ LOCAL_PATH:= $(call my-dir)
		include $(CLEAR_VARS)

		LOCAL_MODULE_TAGS := tests
		LOCAL_CERTIFICATE := platform

		LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle

		LOCAL_STATIC_JAVA_LIBRARIES := \
		android-support-test \
		mockito-target \
		ub-uiautomator \
		truth-prebuilt \

		LOCAL_SRC_FILES := $(call all-subdir-java-files)

		@@ -9,7 +18,7 @@ LOCAL_PROGUARD_ENABLED := disabled

		LOCAL_PACKAGE_NAME := AnomalyTester

		LOCAL_CERTIFICATE := platform
		LOCAL_INSTRUMENTATION_FOR := Settings

		LOCAL_USE_AAPT2 := true

+8 −0

Original line number	Diff line number	Diff line
		@@ -22,11 +22,13 @@
		<uses-permission android:name="android.permission.WAKE_LOCK"/>
		<uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
		<uses-permission android:name="android.permission.WRITE_SETTINGS"/>

		<application
		android:allowBackup="false"
		android:label="@string/app_name"
		android:supportsRtl="true"
		android:theme="@android:style/Theme.Material.Light.DarkActionBar">
		<uses-library android:name="android.test.runner" />
		<activity
		android:name=".AnomalyActivity"
		android:exported="true">
		@@ -41,4 +43,10 @@
		android:exported="false"/>
		</application>

		<instrumentation
		android:name="android.support.test.runner.AndroidJUnitRunner"
		android:targetPackage="com.android.settings"
		android:label="Settings Test Cases">
		</instrumentation>

		</manifest>
		No newline at end of file