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

Commit 58610f3d authored by Ioana Alexandru's avatar Ioana Alexandru
Browse files

Replace VISIT_RISKY_URIS with a bugfix flag 

The scope of this flag has been reduced.

Flag: android.app.visit_person_uri DEVELOPMENT
Bug: 281044385
Test: builds
Change-Id: Iccb78a1ec2a16e17848e54465d8c44ef46667263
parent d9a831f2

core/java/android/app/Person.java

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ public final class Person implements Parcelable { 
     */

    public void visitUris(@NonNull Consumer<Uri> visitor) {

        visitor.accept(getIconUri());

        if (Flags.visitRiskyUris()) {

        if (Flags.visitPersonUri()) {

            if (mUri != null && !mUri.isEmpty()) {

                visitor.accept(Uri.parse(mUri));

            }

core/java/android/app/notification.aconfig

+5 −2
Original line number Diff line number Diff line
@@ -46,10 +46,13 @@ flag { 
}



flag {

  name: "visit_risky_uris"

  name: "visit_person_uri"

  namespace: "systemui"

  description: "Guards the security fix that ensures all URIs in intents and Person.java are valid"

  description: "Guards the security fix that ensures all URIs Person.java are valid"

  bug: "281044385"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



# vvv Prototypes for using app icons in notifications vvv

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

+2 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.net.Uri; 
import android.os.Bundle;

import android.os.IBinder;

import android.os.Parcel;

import android.platform.test.annotations.EnableFlags;

import android.platform.test.flag.junit.SetFlagsRule;

import android.util.Log;

import android.view.LayoutInflater;
@@ -87,6 +88,7 @@ import java.util.stream.Stream; 
import javax.annotation.Nullable;



@RunWith(AndroidJUnit4.class)

@EnableFlags(Flags.FLAG_VISIT_PERSON_URI)

public class NotificationVisitUrisTest extends UiServiceTestCase {

    @Rule

    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
@@ -168,7 +170,6 @@ public class NotificationVisitUrisTest extends UiServiceTestCase { 
    @Before

    public void setUp() {

        mContext = InstrumentationRegistry.getInstrumentation().getContext();

        mSetFlagsRule.enableFlags(Flags.FLAG_VISIT_RISKY_URIS);

    }



    @After