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

Fix build failure.

Browse Source 
+ Merge commit 'a049c988e75a0bb496b587ade60930c4d40e4aaf' into
manual_merge_a049c98

Test: Fixing merge conflict
Change-Id: I4eebc1352ec7274811118a71f8cf97c864771145
This commit is contained in:
Sanket Padawe
2016-10-17 11:39:03 -07:00
parent 23665b0766 a049c988e7
commit 1aa65f3b92
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/datausage/CellDataPreference.java
View File

@@ -114,11 +114,10 @@ public class CellDataPreference extends CustomDialogPreference implements Templa
final Context context = getContext(); final Context context = getContext();
FeatureFactory.getFactory(context).getMetricsFeatureProvider() FeatureFactory.getFactory(context).getMetricsFeatureProvider()
.action(context, MetricsEvent.ACTION_CELL_DATA_TOGGLE, !mChecked); .action(context, MetricsEvent.ACTION_CELL_DATA_TOGGLE, !mChecked);
if (mChecked) {
final SubscriptionInfo currentSir = mSubscriptionManager.getActiveSubscriptionInfo( final SubscriptionInfo currentSir = mSubscriptionManager.getActiveSubscriptionInfo(
mSubId); mSubId);
final SubscriptionInfo nextSir = mSubscriptionManager.getDefaultDataSubscriptionInfo(); final SubscriptionInfo nextSir = mSubscriptionManager.getDefaultDataSubscriptionInfo();
if (mChecked) {
// If the device is single SIM or is enabling data on the active data SIM then forgo // If the device is single SIM or is enabling data on the active data SIM then forgo
// the pop-up. // the pop-up.
if (!Utils.showSimCardTile(getContext()) || if (!Utils.showSimCardTile(getContext()) ||
@@ -139,6 +138,12 @@ public class CellDataPreference extends CustomDialogPreference implements Templa
// If we are showing the Sim Card tile then we are a Multi-Sim device. // If we are showing the Sim Card tile then we are a Multi-Sim device.
if (Utils.showSimCardTile(getContext())) { if (Utils.showSimCardTile(getContext())) {
mMultiSimDialog = true; mMultiSimDialog = true;
if (nextSir != null && currentSir != null &&
currentSir.getSubscriptionId() == nextSir.getSubscriptionId()) {
setMobileDataEnabled(true);
disableDataForOtherSubscriptions(mSubId);
return;
}
super.performClick(view); super.performClick(view);
} else { } else {
setMobileDataEnabled(true); setMobileDataEnabled(true);