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

Merge "Mark DataUsageState as nullable to avoid potential NPE risk" am: 0960af0bf3 am: 325b033f85

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

Change-Id: Ie9d5325556a31c72af3520879212e5fc526ea0dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-09-15 12:45:07 +00:00
committed by Automerger Merge Worker
parent be35244362 325b033f85
commit 8c4db8e545
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,7 @@ import android.graphics.drawable.Drawable;
import android.os.UserHandle; import android.os.UserHandle;
import android.view.View; import android.view.View;
import androidx.annotation.Nullable;
import androidx.preference.PreferenceViewHolder; import androidx.preference.PreferenceViewHolder;
import com.android.settings.R; import com.android.settings.R;
@@ -152,6 +153,7 @@ public class UnrestrictedDataAccessPreference extends AppSwitchPreference implem
} }
} }
@Nullable
public AppStateDataUsageBridge.DataUsageState getDataUsageState() { public AppStateDataUsageBridge.DataUsageState getDataUsageState() {
return mDataUsageState; return mDataUsageState;
} }

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

@@ -194,7 +194,9 @@ public class UnrestrictedDataAccessPreferenceController extends BasePreferenceCo
logSpecialPermissionChange(allowlisted, accessPreference.getEntry().info.packageName); logSpecialPermissionChange(allowlisted, accessPreference.getEntry().info.packageName);
mDataSaverBackend.setIsAllowlisted(accessPreference.getEntry().info.uid, mDataSaverBackend.setIsAllowlisted(accessPreference.getEntry().info.uid,
accessPreference.getEntry().info.packageName, allowlisted); accessPreference.getEntry().info.packageName, allowlisted);
accessPreference.getDataUsageState().isDataSaverAllowlisted = allowlisted; if (accessPreference.getDataUsageState() != null) {
accessPreference.getDataUsageState().isDataSaverAllowlisted = allowlisted;
}
return true; return true;
} }
return false; return false;