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

resolve merge conflicts of e6431c7 to master

Browse Source 
Change-Id: I9d3c5fd5c8b73add93894a21d2f17ed0ae442a32
This commit is contained in:
Matthew Fritze
2016-09-13 19:08:11 -07:00
parent 73f8eda988 e6431c79c7
commit 14e9535fc8
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/datausage/BillingCycleSettings.java
View File

@@ -178,7 +178,9 @@ public class BillingCycleSettings extends DataUsageBase implements
return; return;
} }
Fragment targetFragment = (Fragment) parent; Fragment targetFragment = (Fragment) parent;
if (!targetFragment.isAdded()) return; if (!targetFragment.isAdded()) {
return;
}
final Bundle args = new Bundle(); final Bundle args = new Bundle();
args.putParcelable(EXTRA_TEMPLATE, parent.getNetworkTemplate()); args.putParcelable(EXTRA_TEMPLATE, parent.getNetworkTemplate());

2
src/com/android/settings/datausage/DataUsageSummary.java
View File

@@ -20,6 +20,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.INetworkStatsSession; import android.net.INetworkStatsSession;
import android.net.NetworkPolicy;
import android.net.NetworkTemplate; import android.net.NetworkTemplate;
import android.net.TrafficStats; import android.net.TrafficStats;
import android.os.Bundle; import android.os.Bundle;
@@ -226,7 +227,6 @@ public class DataUsageSummary extends DataUsageBase implements Indexable, DataUs
DataUsageController.DataUsageInfo info = mDataUsageController.getDataUsageInfo( DataUsageController.DataUsageInfo info = mDataUsageController.getDataUsageInfo(
mDefaultTemplate); mDefaultTemplate);
Context context = getContext(); Context context = getContext();
mDataInfoControler.updateDataLimit(info, mDataInfoControler.updateDataLimit(info,
services.mPolicyEditor.getPolicy(mDefaultTemplate)); services.mPolicyEditor.getPolicy(mDefaultTemplate));