am fe9b6d3e: am aead1b25: am 43be4b9b: Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev
* commit 'fe9b6d3e2e08e689a6b770df497e717a1a5e767e':
Stop long passwords crashing CryptKeeper
diff --git a/res/xml/testing_settings.xml b/res/xml/testing_settings.xml
index d8d7705..4e5c5dd 100644
--- a/res/xml/testing_settings.xml
+++ b/res/xml/testing_settings.xml
@@ -18,7 +18,8 @@
android:title="@string/testing" >
<PreferenceScreen
- android:title="@string/testing_phone_info">
+ android:title="@string/testing_phone_info"
+ android:key="radio_info_settings">
<intent android:action="android.intent.action.MAIN"
android:targetPackage="com.android.settings"
android:targetClass="com.android.settings.RadioInfo" />
diff --git a/src/com/android/settings/TestingSettings.java b/src/com/android/settings/TestingSettings.java
index 3994560..b20d327 100644
--- a/src/com/android/settings/TestingSettings.java
+++ b/src/com/android/settings/TestingSettings.java
@@ -17,7 +17,9 @@
package com.android.settings;
import android.os.Bundle;
+import android.os.UserHandle;
import android.preference.PreferenceActivity;
+import android.preference.PreferenceScreen;
public class TestingSettings extends PreferenceActivity {
@@ -26,6 +28,12 @@
super.onCreate(savedInstanceState);
addPreferencesFromResource(R.xml.testing_settings);
+
+ if (UserHandle.myUserId() != UserHandle.USER_OWNER) {
+ PreferenceScreen preferenceScreen = (PreferenceScreen)
+ findPreference("radio_info_settings");
+ getPreferenceScreen().removePreference(preferenceScreen);
+ }
}
}
diff --git a/src/com/android/settings/widget/SettingsAppWidgetProvider.java b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
index 1f5aaf4..7f1f747 100644
--- a/src/com/android/settings/widget/SettingsAppWidgetProvider.java
+++ b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
@@ -945,6 +945,8 @@
.getUriFor(Settings.System.SCREEN_BRIGHTNESS), false, this);
resolver.registerContentObserver(Settings.System
.getUriFor(Settings.System.SCREEN_BRIGHTNESS_MODE), false, this);
+ resolver.registerContentObserver(Settings.System
+ .getUriFor(Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ), false, this);
}
void stopObserving() {
diff --git a/tests/src/com/android/settings/bluetooth/Utf8ByteLengthFilterTest.java b/tests/src/com/android/settings/bluetooth/Utf8ByteLengthFilterTest.java
index 0ed7812..ecbd947 100644
--- a/tests/src/com/android/settings/bluetooth/Utf8ByteLengthFilterTest.java
+++ b/tests/src/com/android/settings/bluetooth/Utf8ByteLengthFilterTest.java
@@ -22,27 +22,8 @@
import com.android.settings.bluetooth.Utf8ByteLengthFilter;
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargets;
-
-@TestTargetClass(Utf8ByteLengthFilter.class)
public class Utf8ByteLengthFilterTest extends AndroidTestCase {
- @TestTargets({
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "filter",
- args = {java.lang.CharSequence.class, int.class, int.class, android.text.Spanned.class,
- int.class, int.class}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "Utf8ByteLengthFilter",
- args = {int.class}
- )
- })
public void testFilter() {
// Define the variables
CharSequence source;