Merge "Rename getLocalApprovalIntent to createLocalApprovalIntent" into lmp-dev (4b278afa) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -8168,8 +8168,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);

+1 −1

Original line number	Diff line number	Diff line
		@@ -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();
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -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");

+1 −1

Original line number	Diff line number	Diff line
		@@ -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");
		}