commit 49dc9825569d0c555466303d7d78f1bc75e1602b
author John Spurlock <jspurlock@google.com> Wed Sep 26 11:16:34 2012 -0400
committer John Spurlock <jspurlock@google.com> Wed Sep 26 11:16:34 2012 -0400
tree 2751a0e1f4c27c56ad94e85957c6b3bc70acbdcb
parent bf7fe20d5b66e30523a3ba7c84a69350709644d5

Prepare settings for METADATA_NAME_CONFIG_ACTIVITY removal.

This is to avoid even a temporary build breakage. Using the new
xml file will be done in a followup commit.

Bug:7172816
Change-Id: If6fedefbee38428eda5b39994c3ad8ff86c8fef9

src/com/android/settings/DreamBackend.java

diff --git a/src/com/android/settings/DreamBackend.java b/src/com/android/settings/DreamBackend.java
index 2f0443b..68a31a1 100644
--- a/src/com/android/settings/DreamBackend.java
+++ b/src/com/android/settings/DreamBackend.java
@@ -29,7 +29,6 @@
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.provider.Settings;
-import android.service.dreams.Dream;
 import android.service.dreams.IDreamManager;
 import android.util.Log;
 
@@ -41,6 +40,11 @@
 public class DreamBackend {
     private static final String TAG = DreamSettings.class.getSimpleName() + ".Backend";
 
+    // avoid breaking when the api changes.
+    // FIXME: use the new xml file when available
+    private static final String OLD_METADATA_NAME_CONFIG_ACTIVITY =
+            "android.service.dreams.config_activity";
+
     public static class DreamInfo {
         CharSequence caption;
         Drawable icon;
@@ -205,7 +209,7 @@
                 || resolveInfo.serviceInfo == null
                 || resolveInfo.serviceInfo.metaData == null)
             return null;
-        String cn = resolveInfo.serviceInfo.metaData.getString(Dream.METADATA_NAME_CONFIG_ACTIVITY);
+        String cn = resolveInfo.serviceInfo.metaData.getString(OLD_METADATA_NAME_CONFIG_ACTIVITY);
         return cn == null ? null : ComponentName.unflattenFromString(cn);
     }