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

Commit ec8727b4 authored by Artur Satayev's avatar Artur Satayev
Browse files

Restrict some OpEntry#* methods for apps targeting R. 

Partial revert of Ie4a2cb155c40d46c52d44e0f53c05d52a8a9b523.

Bug: 156307884,156254238
Test: m
Change-Id: I6fd0d4a010987170c2da258d331ac3143686ffe7
parent 0c82027e

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.R,*/ 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.R,*/ 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.R,*/ publicAlternatives = "{@code "

        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, publicAlternatives = "{@code "

                + "#getLastRejectTime(int)}")

        public long getRejectTime() {

            return getLastRejectTime(OP_FLAGS_ALL);