Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14e9535f authored by Matthew Fritze's avatar Matthew Fritze
Browse files

resolve merge conflicts of e6431c79 to master 

Change-Id: I9d3c5fd5c8b73add93894a21d2f17ed0ae442a32
parents 73f8eda9 e6431c79

src/com/android/settings/datausage/BillingCycleSettings.java

+4 −2
Original line number Diff line number Diff line
@@ -178,7 +178,9 @@ public class BillingCycleSettings extends DataUsageBase implements 
                return;

            }

            Fragment targetFragment = (Fragment) parent;

            if (!targetFragment.isAdded()) return;

            if (!targetFragment.isAdded()) {

                return;

            }



            final Bundle args = new Bundle();

            args.putParcelable(EXTRA_TEMPLATE, parent.getNetworkTemplate());

src/com/android/settings/datausage/DataUsageSummary.java

+1 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.content.Context; 
import android.content.Intent;

import android.net.ConnectivityManager;

import android.net.INetworkStatsSession;

import android.net.NetworkPolicy;

import android.net.NetworkTemplate;

import android.net.TrafficStats;

import android.os.Bundle;
@@ -226,7 +227,6 @@ public class DataUsageSummary extends DataUsageBase implements Indexable, DataUs 
        DataUsageController.DataUsageInfo info = mDataUsageController.getDataUsageInfo(

                mDefaultTemplate);

        Context context = getContext();



        mDataInfoControler.updateDataLimit(info,

                services.mPolicyEditor.getPolicy(mDefaultTemplate));