diff options
4 files changed, 6 insertions, 6 deletions
diff --git a/api/current.txt b/api/current.txt index f90596ed288f..d9ae9602fff2 100644 --- a/api/current.txt +++ b/api/current.txt @@ -8166,8 +8166,8 @@ package android.content { } public class RestrictionsManager { + method public android.content.Intent createLocalApprovalIntent(); method public android.os.Bundle getApplicationRestrictions(); - method public android.content.Intent getLocalApprovalIntent(); method public java.util.List<android.content.RestrictionEntry> getManifestRestrictions(java.lang.String); method public boolean hasRestrictionsProvider(); method public void notifyPermissionResponse(java.lang.String, android.os.PersistableBundle); diff --git a/core/java/android/content/IRestrictionsManager.aidl b/core/java/android/content/IRestrictionsManager.aidl index 495ac2ee4908..db9146ffbae1 100644 --- a/core/java/android/content/IRestrictionsManager.aidl +++ b/core/java/android/content/IRestrictionsManager.aidl @@ -30,5 +30,5 @@ interface IRestrictionsManager { void requestPermission(in String packageName, in String requestType, in String requestId, in PersistableBundle requestData); void notifyPermissionResponse(in String packageName, in PersistableBundle response); - Intent getLocalApprovalIntent(); + Intent createLocalApprovalIntent(); } diff --git a/core/java/android/content/RestrictionsManager.java b/core/java/android/content/RestrictionsManager.java index 849df5535519..21a6a0ddad5b 100644 --- a/core/java/android/content/RestrictionsManager.java +++ b/core/java/android/content/RestrictionsManager.java @@ -155,7 +155,7 @@ public class RestrictionsManager { * The intent must contain {@link #EXTRA_REQUEST_BUNDLE} as an extra and the bundle must * contain at least {@link #REQUEST_KEY_MESSAGE} for the activity to display. * <p> - * @see #getLocalApprovalIntent() + * @see #createLocalApprovalIntent() */ public static final String ACTION_REQUEST_LOCAL_APPROVAL = "android.content.action.REQUEST_LOCAL_APPROVAL"; @@ -473,10 +473,10 @@ public class RestrictionsManager { } } - public Intent getLocalApprovalIntent() { + public Intent createLocalApprovalIntent() { try { if (mService != null) { - return mService.getLocalApprovalIntent(); + return mService.createLocalApprovalIntent(); } } catch (RemoteException re) { Log.w(TAG, "Couldn't reach service"); diff --git a/services/restrictions/java/com/android/server/restrictions/RestrictionsManagerService.java b/services/restrictions/java/com/android/server/restrictions/RestrictionsManagerService.java index fb29b6ae3e5e..218f899d987f 100644 --- a/services/restrictions/java/com/android/server/restrictions/RestrictionsManagerService.java +++ b/services/restrictions/java/com/android/server/restrictions/RestrictionsManagerService.java @@ -139,7 +139,7 @@ public final class RestrictionsManagerService extends SystemService { } @Override - public Intent getLocalApprovalIntent() throws RemoteException { + public Intent createLocalApprovalIntent() throws RemoteException { if (DEBUG) { Log.i(LOG_TAG, "requestPermission"); } |