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

Commit 17130bd8 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "Settings: Fix Settings App crashing when Tethering data usage stats.""

parents 6144c25d f17a7af5

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

100755 → 100644
+0 −15
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ import com.android.settingslib.net.ChartDataLoader; 
import com.android.settingslib.net.UidDetailProvider;



import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;

import static android.net.TrafficStats.UID_TETHERING;



public class AppDataUsage extends DataUsageBase implements Preference.OnPreferenceChangeListener,

        DataSaverBackend.Listener {
@@ -202,20 +201,6 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen 
                mLabel = Utils.getUserLabel(getActivity(), info);

                mPackageName = getActivity().getPackageName();

            }

            int userId = 0;

            //UID_TETHERING will return wrong userId from UidDetailProvider, user UserHandle instead

            if (mAppItem.key == UID_TETHERING) {

                userId = UserHandle.getUserId(mAppItem.key);

            } else {

                userId = UidDetailProvider.getUserIdForKey(mAppItem.key);

            }



            final UserManager um = UserManager.get(getActivity());

            final UserInfo info = um.getUserInfo(userId);

            final PackageManager pm = getPackageManager();

            mIcon = Utils.getUserIcon(getActivity(), um, info);

            mLabel = Utils.getUserLabel(getActivity(), info);

            mPackageName = getActivity().getPackageName();

            removePreference(KEY_UNRESTRICTED_DATA);

            removePreference(KEY_APP_SETTINGS);

            removePreference(KEY_RESTRICT_BACKGROUND);