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

Commit 8c4db8e5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Mark DataUsageState as nullable to avoid potential NPE risk" am: 0960af0b am: 325b033f 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2217422



Change-Id: Ie9d5325556a31c72af3520879212e5fc526ea0dc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents be352443 325b033f

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

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.graphics.drawable.Drawable; 
import android.os.UserHandle;

import android.view.View;



import androidx.annotation.Nullable;

import androidx.preference.PreferenceViewHolder;



import com.android.settings.R;
@@ -152,6 +153,7 @@ public class UnrestrictedDataAccessPreference extends AppSwitchPreference implem 
        }

    }



    @Nullable

    public AppStateDataUsageBridge.DataUsageState getDataUsageState() {

        return mDataUsageState;

    }

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

+3 −1
Original line number Diff line number Diff line
@@ -194,7 +194,9 @@ public class UnrestrictedDataAccessPreferenceController extends BasePreferenceCo 
            logSpecialPermissionChange(allowlisted, accessPreference.getEntry().info.packageName);

            mDataSaverBackend.setIsAllowlisted(accessPreference.getEntry().info.uid,

                    accessPreference.getEntry().info.packageName, allowlisted);

            if (accessPreference.getDataUsageState() != null) {

                accessPreference.getDataUsageState().isDataSaverAllowlisted = allowlisted;

            }

            return true;

        }

        return false;