Put mobile NetworkTemplate in Intent for SearchResultTeampoline
BillingCycleSettings and Settings.ACTION_MOBILE_DATA_USAGE needs mobile NetworkTemplate to work correctly. Bug: 268411305 Test: manual Change-Id: I7e2eafff39f1bffeb8adbe4d7c3567b7a4ea7dda
This commit is contained in:
@@ -69,6 +69,7 @@ import com.android.settingslib.net.UidDetailProvider;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
/**
|
||||
* Panel showing data usage history across various networks, including options
|
||||
@@ -266,6 +267,14 @@ public class DataUsageList extends DataUsageBaseFragment
|
||||
mSubId = intent.getIntExtra(Settings.EXTRA_SUB_ID,
|
||||
SubscriptionManager.INVALID_SUBSCRIPTION_ID);
|
||||
mTemplate = intent.getParcelableExtra(Settings.EXTRA_NETWORK_TEMPLATE);
|
||||
|
||||
if (mTemplate == null) {
|
||||
Optional<NetworkTemplate> mobileNetworkTemplateFromSim =
|
||||
DataUsageUtils.getMobileNetworkTemplateFromSubId(getContext(), getIntent());
|
||||
if (mobileNetworkTemplateFromSim.isPresent()) {
|
||||
mTemplate = mobileNetworkTemplateFromSim.get();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user