commit d91d606ed88767a773cc632c2f977141e10e294a
author Eugene Susla <eugenesusla@google.com> Thu Dec 12 15:10:33 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 12 15:10:33 2019 +0000
tree 24e723dbb39685ec87a6a75b92a42cd6aac3142d
parent 0feede8f74b233f749623281a936d1ef71914eda
parent 5fb3f0eed78f7aa559f65192a83cd9e1a769e11a

Merge "Rename updateUSerSensitive API"

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 472f1ec..7e846d8 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -6885,7 +6885,7 @@
     method @BinderThread public abstract void onRevokeRuntimePermissions(@NonNull java.util.Map<java.lang.String,java.util.List<java.lang.String>>, boolean, int, @NonNull String, @NonNull java.util.function.Consumer<java.util.Map<java.lang.String,java.util.List<java.lang.String>>>);
     method @BinderThread public abstract void onSetRuntimePermissionGrantStateByDeviceAdmin(@NonNull String, @NonNull String, @NonNull String, int, @NonNull java.util.function.Consumer<java.lang.Boolean>);
     method @BinderThread public void onStageAndApplyRuntimePermissionsBackup(@NonNull android.os.UserHandle, @NonNull java.io.InputStream, @NonNull Runnable);
-    method @BinderThread public void onUpdateUserSensitive();
+    method @BinderThread public void onUpdateUserSensitivePermissionFlags();
     field public static final String SERVICE_INTERFACE = "android.permission.PermissionControllerService";
   }
 

core/java/android/permission/PermissionControllerService.java

diff --git a/core/java/android/permission/PermissionControllerService.java b/core/java/android/permission/PermissionControllerService.java
index 8f765fa..f914663 100644
--- a/core/java/android/permission/PermissionControllerService.java
+++ b/core/java/android/permission/PermissionControllerService.java
@@ -221,7 +221,7 @@
      * permission controller package.
      */
     @BinderThread
-    public void onUpdateUserSensitive() {
+    public void onUpdateUserSensitivePermissionFlags() {
         throw new AbstractMethodError("Must be overridden in implementing class");
     }
 
@@ -449,7 +449,7 @@
             public void updateUserSensitive(AndroidFuture callback) {
                 Preconditions.checkNotNull(callback, "callback cannot be null");
 
-                onUpdateUserSensitive();
+                onUpdateUserSensitivePermissionFlags();
                 callback.complete(null);
             }
         };