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

Commit c7243a6d authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Hide TelephonyRegistryManager." am: 3300730d 

Change-Id: I1a15036924ea11e6fa1a95d29ff342f0b39fcd27
parents 6ae34166 3300730d

api/system-current.txt

+0 −10
Original line number Original line Diff line number Diff line
@@ -9530,16 +9530,6 @@ package android.telephony { 
    field public static final int SRVCC_STATE_HANDOVER_STARTED = 0; // 0x0

    field public static final int SRVCC_STATE_HANDOVER_STARTED = 0; // 0x0

  }

  }

















  public class TelephonyRegistryManager {














    method public void addOnOpportunisticSubscriptionsChangedListener(@NonNull android.telephony.SubscriptionManager.OnOpportunisticSubscriptionsChangedListener, @NonNull java.util.concurrent.Executor);














    method public void addOnSubscriptionsChangedListener(@NonNull android.telephony.SubscriptionManager.OnSubscriptionsChangedListener, @NonNull java.util.concurrent.Executor);














    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void notifyCallStateChangedForAllSubscriptions(int, @Nullable String);














    method public void notifyCarrierNetworkChange(boolean);














    method public void notifyRegistrationFailed(int, int, @NonNull android.telephony.CellIdentity, @NonNull String, int, int, int);














    method public void removeOnOpportunisticSubscriptionsChangedListener(@NonNull android.telephony.SubscriptionManager.OnOpportunisticSubscriptionsChangedListener);














    method public void removeOnSubscriptionsChangedListener(@NonNull android.telephony.SubscriptionManager.OnSubscriptionsChangedListener);














  }



























  public final class UiccAccessRule implements android.os.Parcelable {







  public final class UiccAccessRule implements android.os.Parcelable {











    ctor public UiccAccessRule(byte[], @Nullable String, long);







    ctor public UiccAccessRule(byte[], @Nullable String, long);











    method public int describeContents();







    method public int describeContents();

























core/java/android/telephony/TelephonyRegistryManager.java



+0
−3




























Original line number
Original line
Diff line number
Diff line








@@ -18,7 +18,6 @@ package android.telephony;









import android.annotation.NonNull;







import android.annotation.NonNull;











import android.annotation.Nullable;







import android.annotation.Nullable;











import android.annotation.RequiresPermission;







import android.annotation.RequiresPermission;











import android.annotation.SystemApi;














import android.annotation.TestApi;







import android.annotation.TestApi;











import android.content.Context;







import android.content.Context;











import android.os.Binder;







import android.os.Binder;










@@ -61,7 +60,6 @@ import java.util.concurrent.Executor;









 *







 *











 * @hide







 * @hide











 */







 */











@SystemApi














public class TelephonyRegistryManager {







public class TelephonyRegistryManager {































    private static final String TAG = "TelephonyRegistryManager";







    private static final String TAG = "TelephonyRegistryManager";










@@ -250,7 +248,6 @@ public class TelephonyRegistryManager {









     * @param incomingNumber incoming phone number.







     * @param incomingNumber incoming phone number.











     * @hide







     * @hide











     */







     */











    @SystemApi














    @TestApi







    @TestApi











    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)







    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)











    public void notifyCallStateChangedForAllSubscriptions(@CallState int state,







    public void notifyCallStateChangedForAllSubscriptions(@CallState int state,