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

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

Merge "Allow some OpEntry#* methods for apps targeting R" into rvc-dev am:... 

Merge "Allow some OpEntry#* methods for apps targeting R" into rvc-dev am: d775b640 am: 413c7490

Change-Id: I5708c77f78919fa712698b8a8145c9c0421373e4
parents 75a57674 413c7490

core/java/android/app/AppOpsManager.java

+3 −3
Original line number Diff line number Diff line
@@ -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);