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

Commit 24b58ed9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Change naming to be more specific"

parents 7488b79e 17434017

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ package android { 
    field public static final String REVIEW_ACCESSIBILITY_SERVICES = "android.permission.REVIEW_ACCESSIBILITY_SERVICES";

    field public static final String REVOKE_RUNTIME_PERMISSIONS = "android.permission.REVOKE_RUNTIME_PERMISSIONS";

    field public static final String SCORE_NETWORKS = "android.permission.SCORE_NETWORKS";

    field public static final String SECURE_ELEMENT_PRIVILEGED = "android.permission.SECURE_ELEMENT_PRIVILEGED";

    field public static final String SECURE_ELEMENT_PRIVILEGED_OPERATION = "android.permission.SECURE_ELEMENT_PRIVILEGED_OPERATION";

    field public static final String SEND_DEVICE_CUSTOMIZATION_READY = "android.permission.SEND_DEVICE_CUSTOMIZATION_READY";

    field public static final String SEND_SHOW_SUSPENDED_APP_DETAILS = "android.permission.SEND_SHOW_SUSPENDED_APP_DETAILS";

    field public static final String SEND_SMS_NO_CONFIRMATION = "android.permission.SEND_SMS_NO_CONFIRMATION";
@@ -7132,7 +7132,7 @@ package android.provider { 
package android.se.omapi {















  public final class Reader {













    method @RequiresPermission(android.Manifest.permission.SECURE_ELEMENT_PRIVILEGED) public boolean reset();













    method @RequiresPermission(android.Manifest.permission.SECURE_ELEMENT_PRIVILEGED_OPERATION) public boolean reset();















  }





























}

































core/java/android/se/omapi/Reader.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -160,7 +160,7 @@ public final class Reader {













     * @hide















     */















    @SystemApi













    @RequiresPermission(android.Manifest.permission.SECURE_ELEMENT_PRIVILEGED)













    @RequiresPermission(android.Manifest.permission.SECURE_ELEMENT_PRIVILEGED_OPERATION)















    public boolean reset() {















        if (!mService.isConnected()) {















            Log.e(TAG, "service is not connected");

































core/res/AndroidManifest.xml



+1
−1




























Original line number
Diff line number
Diff line








@@ -1798,7 +1798,7 @@













         and bypass OMAPI AccessControlEnforcer.















         <p>Not for use by third-party applications.















         @hide -->













    <permission android:name="android.permission.SECURE_ELEMENT_PRIVILEGED"













    <permission android:name="android.permission.SECURE_ELEMENT_PRIVILEGED_OPERATION"















        android:protectionLevel="signature|privileged" />































    <!-- @deprecated This permission used to allow too broad access to sensitive methods and all its