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

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

Merge "[Telephony Mainline] Hide TelephonyServiceManager and... 

Merge "[Telephony Mainline] Hide TelephonyServiceManager and TelephonyFrameworkInitializer" into rvc-dev am: 4e4fa985

Change-Id: Ie11317ba8672ebf965352d07bdad0d32f97d6c16
parents c84181cd 4e4fa985

api/system-current.txt

+0 −30
Original line number Diff line number Diff line
@@ -8546,31 +8546,6 @@ package android.os { 
    field public static final int STATUS_WAITING_REBOOT = 5; // 0x5

  }













  public class TelephonyServiceManager {













    method @NonNull public android.os.TelephonyServiceManager.ServiceRegisterer getCarrierConfigServiceRegisterer();













    method @NonNull public android.os.TelephonyServiceManager.ServiceRegisterer getEuiccCardControllerServiceRegisterer();













    method @NonNull public android.os.TelephonyServiceManager.ServiceRegisterer getEuiccControllerService();













    method @NonNull public android.os.TelephonyServiceManager.ServiceRegisterer getIccPhoneBookServiceRegisterer();













    method @NonNull public android.os.TelephonyServiceManager.ServiceRegisterer getOpportunisticNetworkServiceRegisterer();













    method @NonNull public android.os.TelephonyServiceManager.ServiceRegisterer getPhoneSubServiceRegisterer();













    method @NonNull public android.os.TelephonyServiceManager.ServiceRegisterer getSmsServiceRegisterer();













    method @NonNull public android.os.TelephonyServiceManager.ServiceRegisterer getSubscriptionServiceRegisterer();













    method @NonNull public android.os.TelephonyServiceManager.ServiceRegisterer getTelephonyImsServiceRegisterer();













    method @NonNull public android.os.TelephonyServiceManager.ServiceRegisterer getTelephonyRcsMessageServiceRegisterer();













    method @NonNull public android.os.TelephonyServiceManager.ServiceRegisterer getTelephonyServiceRegisterer();













  }

























  public static class TelephonyServiceManager.ServiceNotFoundException extends java.lang.Exception {













    ctor public TelephonyServiceManager.ServiceNotFoundException(@NonNull String);













  }

























  public static final class TelephonyServiceManager.ServiceRegisterer {













    method @Nullable public android.os.IBinder get();













    method @NonNull public android.os.IBinder getOrThrow() throws android.os.TelephonyServiceManager.ServiceNotFoundException;













    method public void register(@NonNull android.os.IBinder);













    method @Nullable public android.os.IBinder tryGet();













  }



























  public class UpdateEngine {















    ctor public UpdateEngine();















    method @NonNull @WorkerThread public android.os.UpdateEngine.AllocateSpaceResult allocateSpace(@NonNull String, @NonNull String[]);










@@ -11338,11 +11313,6 @@ package android.telephony {













    method @Deprecated public static android.telephony.SubscriptionPlan.Builder createRecurringWeekly(java.time.ZonedDateTime);















  }



























  public class TelephonyFrameworkInitializer {













    method public static void registerServiceWrappers();













    method public static void setTelephonyServiceManager(@NonNull android.os.TelephonyServiceManager);













  }



























  public final class TelephonyHistogram implements android.os.Parcelable {















    ctor public TelephonyHistogram(int, int, int);















    ctor public TelephonyHistogram(android.telephony.TelephonyHistogram);

























core/java/android/os/TelephonyServiceManager.java



+0
−3




























Original line number
Diff line number
Diff line








@@ -17,7 +17,6 @@ package android.os;





























import android.annotation.NonNull;















import android.annotation.Nullable;













import android.annotation.SystemApi;















import android.content.Context;































/**









@@ -28,7 +27,6 @@ import android.content.Context;













 *















 * @hide















 */













@SystemApi















public class TelephonyServiceManager {















    /**















     * @hide










@@ -97,7 +95,6 @@ public class TelephonyServiceManager {













     *















     * @hide















     */













    @SystemApi















    public static class ServiceNotFoundException extends ServiceManager.ServiceNotFoundException {















        /**















         * Constructor.

































telephony/api/system-current.txt



+0
−5




























Original line number
Diff line number
Diff line








@@ -717,11 +717,6 @@ package android.telephony {













    field @NonNull public static final android.net.Uri WFC_ROAMING_MODE_CONTENT_URI;















  }





























  public class TelephonyFrameworkInitializer {













    method public static void registerServiceWrappers();













    method public static void setTelephonyServiceManager(@NonNull android.os.TelephonyServiceManager);













  }





























  public final class TelephonyHistogram implements android.os.Parcelable {















    ctor public TelephonyHistogram(int, int, int);















    ctor public TelephonyHistogram(android.telephony.TelephonyHistogram);

































telephony/java/android/telephony/TelephonyFrameworkInitializer.java



+0
−2




























Original line number
Diff line number
Diff line








@@ -17,7 +17,6 @@













package android.telephony;































import android.annotation.NonNull;













import android.annotation.SystemApi;















import android.app.SystemServiceRegistry;















import android.content.Context;















import android.os.TelephonyServiceManager;









@@ -33,7 +32,6 @@ import com.android.internal.util.Preconditions;













 *















 * @hide















 */













@SystemApi















public class TelephonyFrameworkInitializer {































    private TelephonyFrameworkInitializer() {