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

Commit 29ab947f authored by Matías Hernández's avatar Matías Hernández Committed by Android (Google) Code Review
Browse files

Merge "Inline preferences_throws_on_invalid_uid" into main

parents f8eada9a 33ec5789

services/core/java/com/android/server/notification/PreferencesHelper.java

+2 −4
Original line number Diff line number Diff line
@@ -547,10 +547,8 @@ public class PreferencesHelper implements RankingConfig { 
    @NonNull

    private PackagePreferences getOrCreatePackagePreferencesLocked(String pkg, int uid) {

        Objects.requireNonNull(pkg);

        if (Flags.preferencesThrowsOnInvalidUid()) {

        Preconditions.checkArgument(uid != INVALID_UID,

                "Valid uid required to get settings of %s", pkg);

        }



        // TODO (b/194833441): use permissionhelper instead of DEFAULT_IMPORTANCE

        return getOrCreatePackagePreferencesSupportingInvalidUidLocked(pkg,

services/core/java/com/android/server/notification/flags.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -211,16 +211,6 @@ flag { 
  bug: "432250872"

}



flag {

  name: "preferences_throws_on_invalid_uid"

  namespace: "systemui"

  description: "Throw IAE when calling getOrCreatePackagePreferences() with INVALID_UID."

  bug: "430250142"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



flag {

  name: "show_noisy_bundled_notifications"

  namespace: "notifications"

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

+0 −1
Original line number Diff line number Diff line
@@ -5770,7 +5770,6 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 
    }















    @Test













    @EnableFlags(Flags.FLAG_PREFERENCES_THROWS_ON_INVALID_UID)















    public void updateNotificationChannelFromPrivilegedListener_invalidPackage_throws()















            throws Exception {















        when(mListeners.checkServiceTokenLocked(any())).thenReturn(mListener);