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

Commit 896cf5eb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Provide API to access Intent that triggered StrictMode violation" into sc-dev am: f47f0575 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifd7725866ca164cc9d7b666f1227d3ac48a36409
parents 426ac275 f47f0575

core/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -31881,6 +31881,8 @@ package android.os.strictmode { 
  }















  public final class UnsafeIntentLaunchViolation extends android.os.strictmode.Violation {













    ctor public UnsafeIntentLaunchViolation(@NonNull android.content.Intent);













    method @Nullable public android.content.Intent getIntent();















  }





























  public final class UntaggedSocketViolation extends android.os.strictmode.Violation {

























core/java/android/os/strictmode/UnsafeIntentLaunchViolation.java



+16
−1




























Original line number
Diff line number
Diff line








@@ -17,10 +17,13 @@













package android.os.strictmode;































import android.annotation.NonNull;













import android.annotation.Nullable;















import android.app.PendingIntent;















import android.content.Intent;















import android.net.Uri;





























import java.util.Objects;





























/**















 * Violation raised when your app launches an {@link Intent} which originated















 * from outside your app.









@@ -46,8 +49,20 @@ import android.net.Uri;













 * not protected, your app is likely vulnerable to malicious apps.















 */















public final class UnsafeIntentLaunchViolation extends Violation {













    /** @hide */













    private transient Intent mIntent;





























    public UnsafeIntentLaunchViolation(@NonNull Intent intent) {















        super("Launch of unsafe intent: " + intent);













        mIntent = Objects.requireNonNull(intent);













    }



























    /**













     * Return the {@link Intent} which caused this violation to be raised. Note













     * that this value is not available if this violation has been serialized













     * since intents cannot be serialized.













     */













    @SuppressWarnings("IntentBuilderName")













    public @Nullable Intent getIntent() {













        return mIntent;















    }















}