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

Fix issue #7255954: API Review: rename Dream to DreamService

Browse Source 
Change-Id: Ic374130cb37cbbfad0421089aecf30de87c4d369
This commit is contained in:
Dianne Hackborn
2012-09-28 18:02:15 -07:00
parent a59f1aacc0
commit e60b705a72
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,7 +33,7 @@ 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.DreamService;
import android.service.dreams.IDreamManager; import android.service.dreams.IDreamManager;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Log; import android.util.Log;
@@ -78,7 +78,7 @@ public class DreamBackend {
public DreamBackend(Context context) { public DreamBackend(Context context) {
mContext = context; mContext = context;
mDreamManager = IDreamManager.Stub.asInterface( mDreamManager = IDreamManager.Stub.asInterface(
ServiceManager.getService(Dream.DREAM_SERVICE)); ServiceManager.getService(DreamService.DREAM_SERVICE));
mComparator = new DreamInfoComparator(getDefaultDream()); mComparator = new DreamInfoComparator(getDefaultDream());
} }
@@ -86,8 +86,7 @@ public class DreamBackend {
logd("getDreamInfos()"); logd("getDreamInfos()");
ComponentName activeDream = getActiveDream(); ComponentName activeDream = getActiveDream();
PackageManager pm = mContext.getPackageManager(); PackageManager pm = mContext.getPackageManager();
Intent dreamIntent = new Intent(Intent.ACTION_MAIN) Intent dreamIntent = new Intent(DreamService.SERVICE_INTERFACE);
.addCategory(Dream.CATEGORY_DREAM);
List<ResolveInfo> resolveInfos = pm.queryIntentServices(dreamIntent, List<ResolveInfo> resolveInfos = pm.queryIntentServices(dreamIntent,
PackageManager.GET_META_DATA); PackageManager.GET_META_DATA);
List<DreamInfo> dreamInfos = new ArrayList<DreamInfo>(resolveInfos.size()); List<DreamInfo> dreamInfos = new ArrayList<DreamInfo>(resolveInfos.size());
@@ -220,9 +219,9 @@ public class DreamBackend {
XmlResourceParser parser = null; XmlResourceParser parser = null;
Exception caughtException = null; Exception caughtException = null;
try { try {
parser = resolveInfo.serviceInfo.loadXmlMetaData(pm, Dream.DREAM_META_DATA); parser = resolveInfo.serviceInfo.loadXmlMetaData(pm, DreamService.DREAM_META_DATA);
if (parser == null) { if (parser == null) {
Log.w(TAG, "No " + Dream.DREAM_META_DATA + " meta-data"); Log.w(TAG, "No " + DreamService.DREAM_META_DATA + " meta-data");
return null; return null;
} }
Resources res = pm.getResourcesForApplication(resolveInfo.serviceInfo.applicationInfo); Resources res = pm.getResourcesForApplication(resolveInfo.serviceInfo.applicationInfo);