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

Commit 7a79194f authored by Chen Xu's avatar Chen Xu Committed by Gerrit Code Review
Browse files

Merge "new TelephonyRegistryManager"

parents 987d1d04 1f1c25e8
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -1373,6 +1373,7 @@ package android.content {
    field public static final String STATS_MANAGER = "stats";
    field public static final String STATUS_BAR_SERVICE = "statusbar";
    field public static final String SYSTEM_UPDATE_SERVICE = "system_update";
    field public static final String TELEPHONY_REGISTRY_SERVICE = "telephony_registry";
    field public static final String VR_SERVICE = "vrmanager";
    field @Deprecated public static final String WIFI_RTT_SERVICE = "rttmanager";
    field public static final String WIFI_SCANNING_SERVICE = "wifiscanner";
@@ -5640,6 +5641,14 @@ package android.os.storage {
}
package android.os.telephony {
  public class TelephonyRegistryManager {
    method public void notifyCarrierNetworkChange(boolean);
  }
}
package android.permission {
  public final class PermissionControllerManager {
+0 −1
Original line number Diff line number Diff line
@@ -4835,7 +4835,6 @@ com.android.internal.telephony.PhoneConstantConversions
com.android.internal.telephony.PhoneConstants$DataState
com.android.internal.telephony.PhoneConstants$State
com.android.internal.telephony.PhoneFactory
com.android.internal.telephony.PhoneInternalInterface$DataActivityState
com.android.internal.telephony.PhoneInternalInterface
com.android.internal.telephony.PhoneNotifier
com.android.internal.telephony.PhoneStateIntentReceiver
+8 −0
Original line number Diff line number Diff line
@@ -157,6 +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.permission.PermissionControllerManager;
import android.permission.PermissionManager;
import android.print.IPrintManager;
@@ -607,6 +608,13 @@ final class SystemServiceRegistry {
                return new TelephonyManager(ctx.getOuterContext());
            }});

        registerService(Context.TELEPHONY_REGISTRY_SERVICE, TelephonyRegistryManager.class,
            new CachedServiceFetcher<TelephonyRegistryManager>() {
                @Override
                public TelephonyRegistryManager createService(ContextImpl ctx) {
                    return new TelephonyRegistryManager();
                }});

        registerService(Context.TELEPHONY_SUBSCRIPTION_SERVICE, SubscriptionManager.class,
                new CachedServiceFetcher<SubscriptionManager>() {
            @Override
+8 −0
Original line number Diff line number Diff line
@@ -4700,6 +4700,14 @@ public abstract class Context {
     */
    public static final String DYNAMIC_SYSTEM_SERVICE = "dynamic_system";

    /**
     * Use with {@link #getSystemService(String)} to retrieve an
     * {@link android.os.telephony.TelephonyRegistryManager}.
     * @hide
     */
    @SystemApi
    public static final String TELEPHONY_REGISTRY_SERVICE = "telephony_registry";

    /**
     * Determine whether the given permission is allowed for a particular
     * process and user ID running in the system.
+546 −0

File added.

Preview size limit exceeded, changes collapsed.

Loading