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

Merge "Allow some OpEntry#* methods for apps targeting R" into rvc-dev am: d775b6404f am: 413c74903e am: c6f6ce73ea

Browse Source 
Change-Id: I3cb06f5127977d56486af67f20e566c08d2c66e7
This commit is contained in:
TreeHugger Robot
2020-05-12 23:54:51 +00:00
committed by Automerger Merge Worker
parent f7ec34e017 c6f6ce73ea
commit 86d822fb3d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/app/AppOpsManager.java
View File

@@ -3688,7 +3688,7 @@ public class AppOpsManager {
/**
* @hide
*/
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.Q, publicAlternatives = "{@code "
@UnsupportedAppUsage(/*maxTargetSdk = Build.VERSION_CODES.R,*/ publicAlternatives = "{@code "
+ "#getOpStr()}")
public int getOp() {
return mOp;
@@ -3707,7 +3707,7 @@ public class AppOpsManager {
* @deprecated Use {@link #getLastAccessTime(int)} instead
*/
@Deprecated
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.Q, publicAlternatives = "{@code "
@UnsupportedAppUsage(/*maxTargetSdk = Build.VERSION_CODES.R,*/ publicAlternatives = "{@code "
+ "#getLastAccessTime(int)}")
public long getTime() {
return getLastAccessTime(OP_FLAGS_ALL);
@@ -3822,7 +3822,7 @@ public class AppOpsManager {
* @deprecated Use {@link #getLastRejectTime(int)} instead
*/
@Deprecated
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.Q, publicAlternatives = "{@code "
@UnsupportedAppUsage(/*maxTargetSdk = Build.VERSION_CODES.R,*/ publicAlternatives = "{@code "
+ "#getLastRejectTime(int)}")
public long getRejectTime() {
return getLastRejectTime(OP_FLAGS_ALL);