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

Commit 4ca688ad authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Migrate THROW_SECURITY_EXCEPTIONS" am: 3724bc6c am: e0b1e5c6 am: 39a0624f 

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

Change-Id: I2b4e2a38a596bfeb76e9a5af247b4bbb509db9ab
parents 8a951ec3 39a0624f

core/java/android/content/om/OverlayManager.java

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import android.annotation.SystemApi; 
import android.annotation.SystemService;

import android.compat.Compatibility;

import android.compat.annotation.ChangeId;

import android.compat.annotation.EnabledAfter;

import android.compat.annotation.EnabledSince;

import android.content.Context;

import android.os.Build;

import android.os.Process;
@@ -90,7 +90,7 @@ public class OverlayManager { 
     * java.lang.IllegalStateException}, which existed in the source prior to R.

     */

    @ChangeId

    @EnabledAfter(targetSdkVersion = Build.VERSION_CODES.Q)

    @EnabledSince(targetSdkVersion = Build.VERSION_CODES.R)

    private static final long THROW_SECURITY_EXCEPTIONS = 147340954;



    /**