Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51a0e5b5 authored by Amith Yamasani's avatar Amith Yamasani
Browse files

Rename getLocalApprovalIntent to createLocalApprovalIntent 

Based on API review.

Bug: 17389920
Change-Id: I84674f25a84d317f017473b6f4ac19c849079323
parent 450592d3

api/current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -8166,8 +8166,8 @@ package android.content { 
  }

  }

















  public class RestrictionsManager {







  public class RestrictionsManager {














    method public android.content.Intent createLocalApprovalIntent();











    method public android.os.Bundle getApplicationRestrictions();







    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 java.util.List<android.content.RestrictionEntry> getManifestRestrictions(java.lang.String);











    method public boolean hasRestrictionsProvider();







    method public boolean hasRestrictionsProvider();











    method public void notifyPermissionResponse(java.lang.String, android.os.PersistableBundle);







    method public void notifyPermissionResponse(java.lang.String, android.os.PersistableBundle);

























core/java/android/content/IRestrictionsManager.aidl



+1
−1




























Original line number
Original line
Diff line number
Diff line








@@ -30,5 +30,5 @@ interface IRestrictionsManager {









    void requestPermission(in String packageName, in String requestType, in String requestId,







    void requestPermission(in String packageName, in String requestType, in String requestId,











            in PersistableBundle requestData);







            in PersistableBundle requestData);











    void notifyPermissionResponse(in String packageName, in PersistableBundle response);







    void notifyPermissionResponse(in String packageName, in PersistableBundle response);











    Intent getLocalApprovalIntent();







    Intent createLocalApprovalIntent();











}






}
























core/java/android/content/RestrictionsManager.java



+3
−3




























Original line number
Original line
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







     * 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.







     * contain at least {@link #REQUEST_KEY_MESSAGE} for the activity to display.











     * <p>







     * <p>











     * @see #getLocalApprovalIntent()







     * @see #createLocalApprovalIntent()











     */







     */











    public static final String ACTION_REQUEST_LOCAL_APPROVAL =







    public static final String ACTION_REQUEST_LOCAL_APPROVAL =











            "android.content.action.REQUEST_LOCAL_APPROVAL";







            "android.content.action.REQUEST_LOCAL_APPROVAL";










@@ -473,10 +473,10 @@ public class RestrictionsManager {









        }







        }











    }







    }































    public Intent getLocalApprovalIntent() {







    public Intent createLocalApprovalIntent() {











        try {







        try {











            if (mService != null) {







            if (mService != null) {











                return mService.getLocalApprovalIntent();







                return mService.createLocalApprovalIntent();











            }







            }











        } catch (RemoteException re) {







        } catch (RemoteException re) {











            Log.w(TAG, "Couldn't reach service");







            Log.w(TAG, "Couldn't reach service");

































services/restrictions/java/com/android/server/restrictions/RestrictionsManagerService.java



+1
−1




























Original line number
Original line
Diff line number
Diff line








@@ -139,7 +139,7 @@ public final class RestrictionsManagerService extends SystemService {









        }







        }































        @Override







        @Override











        public Intent getLocalApprovalIntent() throws RemoteException {







        public Intent createLocalApprovalIntent() throws RemoteException {











            if (DEBUG) {







            if (DEBUG) {











                Log.i(LOG_TAG, "requestPermission");







                Log.i(LOG_TAG, "requestPermission");











            }







            }