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

Commit 65f1b9ef authored by Svet Ganov's avatar Svet Ganov
Browse files

Use proper API to get op name 

Test: atest CtsAppOpstTestCases

Change-Id: Ibc5d9775092e6d82e7beb7163d91c1f9ea87e1be
parent 6083d7fb

core/java/android/app/AppOpsManager.java

+9 −0
Original line number Diff line number Diff line
@@ -1730,6 +1730,15 @@ public class AppOpsManager { 
        return op < sOpNames.length ? sOpNames[op] : ("Unknown(" + op + ")");

    }



    /**

     * Retrieve a non-localized public name for the operation.

     *

     * @hide

     */

    public static @NonNull String opToPublicName(int op) {

        return sOpToString[op];

    }



    /**

     * @hide

     */

core/java/android/provider/Settings.java

+1 −1
Original line number Diff line number Diff line
@@ -14109,7 +14109,7 @@ public final class Settings { 
         *     intervalMultiplier    (int)

         * </pre>

         *

         * Ex: "enabled=true,baseIntervalMillis=1000,intervalMultiplier=10"

         * Ex: "mode=HISTORICAL_MODE_ENABLED_ACTIVE,baseIntervalMillis=1000,intervalMultiplier=10"

         *

         * @see #APPOP_HISTORY_MODE

         * @see #APPOP_HISTORY_BASE_INTERVAL_MILLIS

services/core/java/com/android/server/appop/HistoricalRegistry.java

+1 −1
Original line number Diff line number Diff line
@@ -1085,7 +1085,7 @@ final class HistoricalRegistry { 
                throws IOException, XmlPullParserException {

            final int op = XmlUtils.readIntAttribute(parser, ATTR_NAME);

            if (filterOpNames != null && !ArrayUtils.contains(filterOpNames,

                    AppOpsManager.opToName(op))) {

                    AppOpsManager.opToPublicName(op))) {

                XmlUtils.skipCurrentTag(parser);

                return null;

            }