Commit 11ad5850 authored Dec 17, 2024 by mrulhania Committed by Manjeet Rulhania Dec 17, 2024

Handle null in Activity#requestPermissions optimization

The recent optimization introduced in ag/30469303
caused NPE. App may pass null as an element accidentally
in `permissions` collection parameter, the optimization
shouldn't change the behavior.

Fix: 383954592
Test: atest android.permissionui.cts.PermissionTest23#testNullAndRealPermission
FLAG: EXEMPT bug fix
Change-Id: Ic271664391afaa3512c1e34f26ef7e792e03213f

parent 8d7d869d

core/java/android/app/Activity.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -5834,8 +5834,12 @@ public class Activity extends ContextThemeWrapper
		final int size = permissions.length;
		int[] results = new int[size];
		for (int i = 0; i < size; i++) {
		if (permissions[i] == null) {
		results[i] = Context.PERMISSION_REQUEST_STATE_UNREQUESTABLE;
		} else {
		results[i] = deviceContext.getPermissionRequestState(permissions[i]);
		}
		}
		return results;
		}