Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Forbid granting access to NLSes with too-long component names" into tm-dev am: b70ba506ef

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23733070

Change-Id: Iada4e4183b16e421db412278c7f7bd037b626b03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Matías Hernández
2023-06-29 00:15:35 +00:00
committed by Automerger Merge Worker
parent df967f7144 b70ba506ef
commit 491eefec5c
5 changed files with 47 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/app/NotificationManager.java
View File

@@ -562,6 +562,12 @@ public class NotificationManager {
*/
public static final int BUBBLE_PREFERENCE_SELECTED = 2;
/**
* Maximum length of the component name of a registered NotificationListenerService.
* @hide
*/
public static int MAX_SERVICE_COMPONENT_NAME_LENGTH = 500;
@UnsupportedAppUsage
private static INotificationManager sService;

8
packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java
View File

@@ -243,7 +243,9 @@ public class RestrictedSwitchPreference extends SwitchPreference {
return mHelper != null ? mHelper.packageName : null;
}
public void updateState(@NonNull String packageName, int uid, boolean isEnabled) {
/** Updates enabled state based on associated package. */
public void updateState(
@NonNull String packageName, int uid, boolean isEnableAllowed, boolean isEnabled) {
mHelper.updatePackageDetails(packageName, uid);
if (mAppOpsManager == null) {
mAppOpsManager = getContext().getSystemService(AppOpsManager.class);
@@ -254,7 +256,9 @@ public class RestrictedSwitchPreference extends SwitchPreference {
final boolean ecmEnabled = getContext().getResources().getBoolean(
com.android.internal.R.bool.config_enhancedConfirmationModeEnabled);
final boolean appOpsAllowed = !ecmEnabled || mode == AppOpsManager.MODE_ALLOWED;
if (isEnabled) {
if (!isEnableAllowed && !isEnabled) {
setEnabled(false);
} else if (isEnabled) {
setEnabled(true);
} else if (appOpsAllowed && isDisabledByAppOps()) {
setEnabled(true);

5
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -5449,6 +5449,11 @@ public class NotificationManagerService extends SystemService {
boolean granted, boolean userSet) {
Objects.requireNonNull(listener);
checkNotificationListenerAccess();
if (granted && listener.flattenToString().length()
> NotificationManager.MAX_SERVICE_COMPONENT_NAME_LENGTH) {
throw new IllegalArgumentException(
"Component name too long: " + listener.flattenToString());
}
if (!userSet && isNotificationListenerAccessUserSet(listener)) {
// Don't override user's choice
return;

6
services/core/java/com/android/server/vr/VrManagerService.java
View File

@@ -1049,7 +1049,11 @@ public class VrManagerService extends SystemService
for (ComponentName c : possibleServices) {
if (Objects.equals(c.getPackageName(), pkg)) {
nm.setNotificationListenerAccessGrantedForUser(c, userId, true);
try {
nm.setNotificationListenerAccessGrantedForUser(c, userId, true);
} catch (Exception e) {
Slog.w(TAG, "Could not grant NLS access to package " + pkg, e);
}
}
}
}

25
services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
View File

@@ -79,6 +79,7 @@ import static junit.framework.Assert.assertNull;
import static junit.framework.Assert.assertTrue;
import static junit.framework.Assert.fail;
import static org.junit.Assert.assertThrows;
import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.anyLong;
@@ -3659,6 +3660,30 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
any(), anyInt(), anyBoolean(), anyBoolean(), anyBoolean());
}
@Test
public void testSetListenerAccessForUser_grantWithNameTooLong_throws() {
UserHandle user = UserHandle.of(mContext.getUserId() + 10);
ComponentName c = new ComponentName("com.example.package",
com.google.common.base.Strings.repeat("Blah", 150));
assertThrows(IllegalArgumentException.class,
() -> mBinderService.setNotificationListenerAccessGrantedForUser(
c, user.getIdentifier(), /* enabled= */ true, true));
}
@Test
public void testSetListenerAccessForUser_revokeWithNameTooLong_okay() throws Exception {
UserHandle user = UserHandle.of(mContext.getUserId() + 10);
ComponentName c = new ComponentName("com.example.package",
com.google.common.base.Strings.repeat("Blah", 150));
mBinderService.setNotificationListenerAccessGrantedForUser(
c, user.getIdentifier(), /* enabled= */ false, true);
verify(mListeners).setPackageOrComponentEnabled(
c.flattenToString(), user.getIdentifier(), true, /* enabled= */ false, true);
}
@Test
public void testSetAssistantAccessForUser() throws Exception {
UserInfo ui = new UserInfo();