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

Commit 4188aeb5 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android (Google) Code Review
Browse files

Merge "Use proper API to get op name"

parents ed509a4d 65f1b9ef

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
@@ -14143,7 +14143,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;

            }