Messaging: Remove GServices
We don't have an actual implementation returning anything but the defaults, so apply the defaults directly anywhere we need them Change-Id: Ic651b4b13977799f2f4d2c702c430798fbff77f8
This commit is contained in:
@@ -35,8 +35,6 @@ import com.android.messaging.ui.UIIntents;
|
||||
import com.android.messaging.ui.UIIntentsImpl;
|
||||
import com.android.messaging.util.Assert;
|
||||
import com.android.messaging.util.BugleApplicationPrefs;
|
||||
import com.android.messaging.util.BugleGservices;
|
||||
import com.android.messaging.util.BugleGservicesImpl;
|
||||
import com.android.messaging.util.BuglePrefs;
|
||||
import com.android.messaging.util.BugleSubscriptionPrefs;
|
||||
import com.android.messaging.util.BugleWidgetPrefs;
|
||||
@@ -51,7 +49,6 @@ import java.util.concurrent.ConcurrentHashMap;
|
||||
class FactoryImpl extends Factory {
|
||||
private BugleApplication mApplication;
|
||||
private DataModel mDataModel;
|
||||
private BugleGservices mBugleGservices;
|
||||
private BugleApplicationPrefs mBugleApplicationPrefs;
|
||||
private BugleWidgetPrefs mBugleWidgetPrefs;
|
||||
private Context mApplicationContext;
|
||||
@@ -89,7 +86,6 @@ class FactoryImpl extends Factory {
|
||||
factory.mMemoryCacheManager = new MemoryCacheManager();
|
||||
factory.mMediaCacheManager = new BugleMediaCacheManager();
|
||||
factory.mMediaResourceManager = new MediaResourceManager();
|
||||
factory.mBugleGservices = new BugleGservicesImpl(applicationContext);
|
||||
factory.mBugleApplicationPrefs = new BugleApplicationPrefs(applicationContext);
|
||||
factory.mDataModel = new DataModelImpl(applicationContext);
|
||||
factory.mBugleWidgetPrefs = new BugleWidgetPrefs(applicationContext);
|
||||
@@ -99,9 +95,6 @@ class FactoryImpl extends Factory {
|
||||
factory.mSubscriptionPrefs = new SparseArray<BugleSubscriptionPrefs>();
|
||||
factory.mCarrierConfigValuesLoader = new BugleCarrierConfigValuesLoader(applicationContext);
|
||||
|
||||
Assert.initializeGservices(factory.mBugleGservices);
|
||||
LogUtil.initializeGservices(factory.mBugleGservices);
|
||||
|
||||
if (OsUtil.hasRequiredPermissions()) {
|
||||
factory.onRequiredPermissionsAcquired();
|
||||
}
|
||||
@@ -135,11 +128,6 @@ class FactoryImpl extends Factory {
|
||||
return mDataModel;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BugleGservices getBugleGservices() {
|
||||
return mBugleGservices;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BuglePrefs getApplicationPrefs() {
|
||||
return mBugleApplicationPrefs;
|
||||
|
||||
Reference in New Issue
Block a user