Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6de6199a: am 6b71eada: am 221281ce: Merge "Rename getLocalApprovalIntent to createLocalApprovalIntent" into lmp-dev

Browse Source 
* commit '6de6199a7a9df4f5c495a7a038a71b67e29acb93':
  Rename getLocalApprovalIntent to createLocalApprovalIntent
This commit is contained in:
Amith Yamasani
2014-09-05 20:32:18 +00:00
committed by Android Git Automerger
parent f415d8243d 0859c2c760
commit 7bdb80e811
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -8173,8 +8173,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);

2
core/java/android/content/IRestrictionsManager.aidl
View File

@@ -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();
}

6
core/java/android/content/RestrictionsManager.java
View File

@@ -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");

2
services/restrictions/java/com/android/server/restrictions/RestrictionsManagerService.java
View File

@@ -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");
}