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

Commit a224e76d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "code_sync_from_aosp" into rvc-dev am: 24466c49 am:... 

Merge changes from topic "code_sync_from_aosp" into rvc-dev am: 24466c49 am: a194a42d am: 7ab065e2

Change-Id: I9363cc26b19b7bc4fe4b9659ee86d0023702d314
parents af843b32 7ab065e2

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -206,7 +206,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";
@@ -9538,7 +9538,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








@@ -1845,7 +1845,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