diff options
| author | 2019-01-22 03:51:14 +0000 | |
|---|---|---|
| committer | 2019-01-22 03:51:14 +0000 | |
| commit | 4188aeb5d6fe26c6edb7f095446e70990aeac513 (patch) | |
| tree | d8665272c121966147c54a918a898d43e621a050 | |
| parent | ed509a4d176b1571375f2cc7302043d4ac3127c0 (diff) | |
| parent | 65f1b9ef4494c1f397bc4fe47cffa1411f547484 (diff) | |
Merge "Use proper API to get op name"
| -rw-r--r-- | core/java/android/app/AppOpsManager.java | 9 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/appop/HistoricalRegistry.java | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java index e155fe201f98..5868771ff5c4 100644 --- a/core/java/android/app/AppOpsManager.java +++ b/core/java/android/app/AppOpsManager.java @@ -1731,6 +1731,15 @@ public class AppOpsManager { } /** + * Retrieve a non-localized public name for the operation. + * + * @hide + */ + public static @NonNull String opToPublicName(int op) { + return sOpToString[op]; + } + + /** * @hide */ public static int strDebugOpToOp(String op) { diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 8ef7ae1d89d3..516f49ccc910 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -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 diff --git a/services/core/java/com/android/server/appop/HistoricalRegistry.java b/services/core/java/com/android/server/appop/HistoricalRegistry.java index 714a807da1b0..c5842e59cce1 100644 --- a/services/core/java/com/android/server/appop/HistoricalRegistry.java +++ b/services/core/java/com/android/server/appop/HistoricalRegistry.java @@ -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; } |