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

Merge "Migrate THROW_SECURITY_EXCEPTIONS" am: 3724bc6c47 am: e0b1e5c604 am: 39a0624f7f

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

Change-Id: I2b4e2a38a596bfeb76e9a5af247b4bbb509db9ab
This commit is contained in:
Treehugger Robot
2020-11-18 09:57:57 +00:00
committed by Automerger Merge Worker
parent 8a951ec3ef 39a0624f7f
commit 4ca688adf8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/content/om/OverlayManager.java
View File

@@ -23,7 +23,7 @@ import android.annotation.SystemApi;
import android.annotation.SystemService; import android.annotation.SystemService;
import android.compat.Compatibility; import android.compat.Compatibility;
import android.compat.annotation.ChangeId; import android.compat.annotation.ChangeId;
import android.compat.annotation.EnabledAfter; import android.compat.annotation.EnabledSince;
import android.content.Context; import android.content.Context;
import android.os.Build; import android.os.Build;
import android.os.Process; import android.os.Process;
@@ -90,7 +90,7 @@ public class OverlayManager {
* java.lang.IllegalStateException}, which existed in the source prior to R. * java.lang.IllegalStateException}, which existed in the source prior to R.
*/ */
@ChangeId @ChangeId
@EnabledAfter(targetSdkVersion = Build.VERSION_CODES.Q) @EnabledSince(targetSdkVersion = Build.VERSION_CODES.R)
private static final long THROW_SECURITY_EXCEPTIONS = 147340954; private static final long THROW_SECURITY_EXCEPTIONS = 147340954;
/** /**