8 files changed, 18 insertions, 6 deletions
diff --git a/core/java/android/text/method/TextKeyListener.java b/core/java/android/text/method/TextKeyListener.java
index 5be2a4866c4f..0c12c55b012b 100644
--- a/core/java/android/text/method/TextKeyListener.java
+++ b/core/java/android/text/method/TextKeyListener.java
@@ -246,8 +246,11 @@ public class TextKeyListener extends BaseKeyListener implements SpanWatcher {
     private void initPrefs(Context context) {
         final ContentResolver contentResolver = context.getContentResolver();
         mResolver = new WeakReference<ContentResolver>(contentResolver);
-        mObserver = new SettingsObserver();
-        contentResolver.registerContentObserver(Settings.System.CONTENT_URI, true, mObserver);
+
+        if (mObserver == null) {
+            mObserver = new SettingsObserver();
+            contentResolver.registerContentObserver(Settings.System.CONTENT_URI, true, mObserver);
+        }
 
         updatePrefs(contentResolver);
         mPrefsInited = true;
diff --git a/core/res/res/layout/always_use_checkbox.xml b/core/res/res/layout/always_use_checkbox.xml
index baa4bee88066..a955352713b6 100644
--- a/core/res/res/layout/always_use_checkbox.xml
+++ b/core/res/res/layout/always_use_checkbox.xml
@@ -26,14 +26,14 @@
     
     <CheckBox
         android:id="@+id/alwaysUse"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:focusable="true"
         android:clickable="true" />
     
     <TextView 
         android:id="@+id/clearDefaultHint"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:paddingLeft="36dip"
diff --git a/drm/common/Android.mk b/drm/common/Android.mk
index 249fe8e4026e..808b2c283eff 100644
--- a/drm/common/Android.mk
+++ b/drm/common/Android.mk
@@ -38,4 +38,6 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_MODULE:= libdrmframeworkcommon
 
+LOCAL_MODULE_TAGS := optional
+
 include $(BUILD_STATIC_LIBRARY)
diff --git a/drm/drmioserver/Android.mk b/drm/drmioserver/Android.mk
index 32afdd32f5b2..11571c7904bc 100644
--- a/drm/drmioserver/Android.mk
+++ b/drm/drmioserver/Android.mk
@@ -38,4 +38,6 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_MODULE:= drmioserver
 
+LOCAL_MODULE_TAGS := optional
+
 include $(BUILD_EXECUTABLE)
diff --git a/drm/drmserver/Android.mk b/drm/drmserver/Android.mk
index 46a51bcf926c..5df2ff87c17e 100644
--- a/drm/drmserver/Android.mk
+++ b/drm/drmserver/Android.mk
@@ -41,4 +41,6 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_MODULE:= drmserver
 
+LOCAL_MODULE_TAGS := optional
+
 include $(BUILD_EXECUTABLE)
diff --git a/drm/jni/Android.mk b/drm/jni/Android.mk
index 95ce75af2086..b65e4daafe63 100644
--- a/drm/jni/Android.mk
+++ b/drm/jni/Android.mk
@@ -44,5 +44,7 @@ LOCAL_C_INCLUDES += \
 
 LOCAL_PRELINK_MODULE := false
 
+LOCAL_MODULE_TAGS := optional
+
 include $(BUILD_SHARED_LIBRARY)
 
diff --git a/drm/libdrmframework/Android.mk b/drm/libdrmframework/Android.mk
index 765adba3a474..99133ba28f2f 100644
--- a/drm/libdrmframework/Android.mk
+++ b/drm/libdrmframework/Android.mk
@@ -42,6 +42,8 @@ LOCAL_C_INCLUDES += \
 
 LOCAL_PRELINK_MODULE := false
 
+LOCAL_MODULE_TAGS := optional
+
 include $(BUILD_SHARED_LIBRARY)
 
 include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/drm/libdrmframework/plugins/passthru/Android.mk b/drm/libdrmframework/plugins/passthru/Android.mk
index 169b89babbf5..7856d3730bad 100644
--- a/drm/libdrmframework/plugins/passthru/Android.mk
+++ b/drm/libdrmframework/plugins/passthru/Android.mk
@@ -43,7 +43,6 @@ LOCAL_C_INCLUDES += \
 # Set the following flag to enable the decryption passthru flow
 #LOCAL_CFLAGS += -DENABLE_PASSTHRU_DECRYPTION
 
-PRODUCT_COPY_FILES += \
-    $(TARGET_OUT_SHARED_LIBRARIES)/libdrmpassthruplugin.so:system/lib/drm/plugins/native/libdrmpassthruplugin.so
+LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_SHARED_LIBRARY)