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

Commit 1d7a53da authored by Hall Liu's avatar Hall Liu Committed by Gerrit Code Review
Browse files

Merge changes from topic "mainline4" 

* changes:
  Add new API for Telecom to send phone state
  Minor style correction to avoid merge conflict
  non-mainline telephony related AIDL refactor/decoupling
parents 3a4addba 7ffa1d11

api/system-current.txt

+9 −8
Original line number Diff line number Diff line
@@ -5669,14 +5669,6 @@ package android.os.storage { 














}



























package android.os.telephony {

























  public class TelephonyRegistryManager {













    method public void notifyCarrierNetworkChange(boolean);













  }

























}



























package android.permission {





























  public final class PermissionControllerManager {










@@ -8367,6 +8359,15 @@ package android.telephony {













    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 removeOnOpportunisticSubscriptionsChangedListener(@NonNull android.telephony.SubscriptionManager.OnOpportunisticSubscriptionsChangedListener);













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













  }



























  public final class UiccAccessRule implements android.os.Parcelable {















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















    method public int describeContents();

























core/java/android/app/SystemServiceRegistry.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -157,7 +157,7 @@ import android.os.health.SystemHealthManager;













import android.os.image.DynamicSystemManager;















import android.os.image.IDynamicSystemService;















import android.os.storage.StorageManager;













import android.os.telephony.TelephonyRegistryManager;













import android.telephony.TelephonyRegistryManager;















import android.permission.PermissionControllerManager;















import android.permission.PermissionManager;















import android.print.IPrintManager;










@@ -611,7 +611,7 @@ final class SystemServiceRegistry {













            new CachedServiceFetcher<TelephonyRegistryManager>() {















                @Override















                public TelephonyRegistryManager createService(ContextImpl ctx) {













                    return new TelephonyRegistryManager();













                    return new TelephonyRegistryManager(ctx);















                }});































        registerService(Context.TELEPHONY_SUBSCRIPTION_SERVICE, SubscriptionManager.class,

































core/java/android/content/Context.java



+2
−1




























Original line number
Diff line number
Diff line








@@ -63,6 +63,7 @@ import android.os.UserHandle;













import android.os.UserManager;















import android.os.storage.StorageManager;















import android.provider.MediaStore;













import android.telephony.TelephonyRegistryManager;















import android.util.AttributeSet;















import android.view.Display;















import android.view.DisplayAdjustments;










@@ -4747,7 +4748,7 @@ public abstract class Context {





























    /**















     * Use with {@link #getSystemService(String)} to retrieve an













     * {@link android.os.telephony.TelephonyRegistryManager}.













     * {@link TelephonyRegistryManager}.















     * @hide















     */















    @SystemApi

































core/java/android/service/carrier/CarrierService.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -22,7 +22,7 @@ import android.os.Bundle;













import android.os.IBinder;















import android.os.PersistableBundle;















import android.os.ResultReceiver;













import android.os.telephony.TelephonyRegistryManager;













import android.telephony.TelephonyRegistryManager;















import android.util.Log;































/**

































telephony/java/android/telephony/PhoneStateListener.java→core/java/android/telephony/PhoneStateListener.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -35,8 +35,8 @@ import android.telephony.Annotation.SrvccState;













import android.telephony.emergency.EmergencyNumber;















import android.telephony.ims.ImsReasonInfo;





























import com.android.internal.annotations.VisibleForTesting;















import com.android.internal.telephony.IPhoneStateListener;













import com.android.internal.annotations.VisibleForTesting;































import dalvik.system.VMRuntime;