PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 49dc9825: Prepare settings for METADATA_NAME_CONFIG_ACTIVITY removal.

Browse Source 
* commit '49dc9825569d0c555466303d7d78f1bc75e1602b':
  Prepare settings for METADATA_NAME_CONFIG_ACTIVITY removal.
This commit is contained in:
John Spurlock
2012-09-26 08:25:28 -07:00
committed by Android Git Automerger
parent 81957fc4b4 49dc982556
commit 68dfd96f50
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/DreamBackend.java
View File

@@ -29,7 +29,6 @@ import android.graphics.drawable.Drawable;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.provider.Settings; import android.provider.Settings;
import android.service.dreams.Dream;
import android.service.dreams.IDreamManager; import android.service.dreams.IDreamManager;
import android.util.Log; import android.util.Log;
@@ -41,6 +40,11 @@ import java.util.List;
public class DreamBackend { public class DreamBackend {
private static final String TAG = DreamSettings.class.getSimpleName() + ".Backend"; 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 { public static class DreamInfo {
CharSequence caption; CharSequence caption;
Drawable icon; Drawable icon;
@@ -205,7 +209,7 @@ public class DreamBackend {
|| resolveInfo.serviceInfo == null || resolveInfo.serviceInfo == null
|| resolveInfo.serviceInfo.metaData == null) || resolveInfo.serviceInfo.metaData == null)
return 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); return cn == null ? null : ComponentName.unflattenFromString(cn);
} }