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

Commit 4e908c24 authored by Po-Chien Hsueh's avatar Po-Chien Hsueh
Browse files

API review followup: DynamicAndroidClient 

Some API changes per API reivew:
- Move DynamicAndroidClient and ~Manager to android.os.image.
- Rename them to DynamicSystemClient and ~Manager.
- Rename permission MANAGE_DYNAMIC_ANDROID to MANAGE_DYNAMIC_SYSTEM
- Corresponding changes in the installation service.
- Corresponding changes in privapp-permissions-platform.xml.
- Add missing annotations.
- Change setOnStatusChangedListener's parameters order.
- Improve documentations.
- Re-generate api/system-current.txt.

Bug: 126613281
Test: adb shell am
Change-Id: Ia920e9ccf6de1dbbd38c52910cb72cb81b9b5b32
parent 16da0e59

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,6 @@ java_defaults { 
        "core/java/android/os/ICancellationSignal.aidl",

        "core/java/android/os/IDeviceIdentifiersPolicyService.aidl",

        "core/java/android/os/IDeviceIdleController.aidl",

        "core/java/android/os/IDynamicAndroidService.aidl",

        "core/java/android/os/IHardwarePropertiesManager.aidl",

        ":libincident_aidl",

        "core/java/android/os/IMaintenanceActivityListener.aidl",
@@ -272,6 +271,7 @@ java_defaults { 
        "core/java/android/os/IUserManager.aidl",

        ":libvibrator_aidl",

        "core/java/android/os/IVibratorService.aidl",

        "core/java/android/os/image/IDynamicSystemService.aidl",

        "core/java/android/os/storage/IStorageManager.aidl",

        "core/java/android/os/storage/IStorageEventListener.aidl",

        "core/java/android/os/storage/IStorageShutdownObserver.aidl",

api/system-current.txt

+30 −27
Original line number Diff line number Diff line
@@ -1349,7 +1349,6 @@ package android.content { 
    field public static final String BACKUP_SERVICE = "backup";

    field public static final String CONTENT_SUGGESTIONS_SERVICE = "content_suggestions";

    field public static final String CONTEXTHUB_SERVICE = "contexthub";

    field public static final String DYNAMIC_ANDROID_SERVICE = "dynamic_android";

    field public static final String EUICC_CARD_SERVICE = "euicc_card";

    field public static final String HDMI_CONTROL_SERVICE = "hdmi_control";

    field public static final String NETD_SERVICE = "netd";
@@ -1376,32 +1375,6 @@ package android.content { 
    method public void sendOrderedBroadcast(android.content.Intent, String, android.os.Bundle, android.content.BroadcastReceiver, android.os.Handler, int, String, android.os.Bundle);

  }













  public class DynamicAndroidClient {













    ctor public DynamicAndroidClient(@NonNull android.content.Context);













    method public void bind();













    method public void setOnStatusChangedListener(@NonNull android.content.DynamicAndroidClient.OnStatusChangedListener, @NonNull java.util.concurrent.Executor);













    method public void setOnStatusChangedListener(@NonNull android.content.DynamicAndroidClient.OnStatusChangedListener);













    method public void start(String, long);













    method public void start(String, long, long);













    method public void unbind();













    field public static final int CAUSE_ERROR_EXCEPTION = 6; // 0x6













    field public static final int CAUSE_ERROR_INVALID_URL = 4; // 0x4













    field public static final int CAUSE_ERROR_IO = 3; // 0x3













    field public static final int CAUSE_ERROR_IPC = 5; // 0x5













    field public static final int CAUSE_INSTALL_CANCELLED = 2; // 0x2













    field public static final int CAUSE_INSTALL_COMPLETED = 1; // 0x1













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













    field public static final int STATUS_IN_PROGRESS = 2; // 0x2













    field public static final int STATUS_IN_USE = 4; // 0x4













    field public static final int STATUS_NOT_STARTED = 1; // 0x1













    field public static final int STATUS_READY = 3; // 0x3













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













  }

























  public static interface DynamicAndroidClient.OnStatusChangedListener {













    method public void onStatusChanged(int, int, long);













  }



























  public class Intent implements java.lang.Cloneable android.os.Parcelable {















    field public static final String ACTION_BATTERY_LEVEL_CHANGED = "android.intent.action.BATTERY_LEVEL_CHANGED";















    field public static final String ACTION_CALL_EMERGENCY = "android.intent.action.CALL_EMERGENCY";










@@ -5662,6 +5635,36 @@ package android.os {



























}



























package android.os.image {

























  public class DynamicSystemClient {













    ctor public DynamicSystemClient(@NonNull android.content.Context);













    method @RequiresPermission("android.permission.MANAGE_DYNAMIC_SYSTEM") public void bind();













    method public void setOnStatusChangedListener(@NonNull java.util.concurrent.Executor, @NonNull android.os.image.DynamicSystemClient.OnStatusChangedListener);













    method public void setOnStatusChangedListener(@NonNull android.os.image.DynamicSystemClient.OnStatusChangedListener);













    method @RequiresPermission("android.permission.MANAGE_DYNAMIC_SYSTEM") public void start(@NonNull String, long);













    method @RequiresPermission("android.permission.MANAGE_DYNAMIC_SYSTEM") public void start(@NonNull String, long, long);













    method @RequiresPermission("android.permission.MANAGE_DYNAMIC_SYSTEM") public void unbind();













    field public static final int CAUSE_ERROR_EXCEPTION = 6; // 0x6













    field public static final int CAUSE_ERROR_INVALID_URL = 4; // 0x4













    field public static final int CAUSE_ERROR_IO = 3; // 0x3













    field public static final int CAUSE_ERROR_IPC = 5; // 0x5













    field public static final int CAUSE_INSTALL_CANCELLED = 2; // 0x2













    field public static final int CAUSE_INSTALL_COMPLETED = 1; // 0x1













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













    field public static final int STATUS_IN_PROGRESS = 2; // 0x2













    field public static final int STATUS_IN_USE = 4; // 0x4













    field public static final int STATUS_NOT_STARTED = 1; // 0x1













    field public static final int STATUS_READY = 3; // 0x3













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













  }

























  public static interface DynamicSystemClient.OnStatusChangedListener {













    method public void onStatusChanged(int, int, long);













  }

























}



























package android.os.storage {





























  public class StorageManager {

































config/boot-image-profile.txt



+6
−5




























Original line number
Diff line number
Diff line








@@ -4759,7 +4759,6 @@ HPLandroid/os/IDeviceIdleController$Stub$Proxy;->addPowerSaveTempWhitelistAppFor













HPLandroid/os/IDeviceIdleController$Stub$Proxy;->addPowerSaveTempWhitelistAppForSms(Ljava/lang/String;ILjava/lang/String;)J















HPLandroid/os/IDeviceIdleController$Stub;->getDefaultTransactionName(I)Ljava/lang/String;















HPLandroid/os/IDeviceIdleController$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z













HPLandroid/os/IDynamicAndroidService$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z















HPLandroid/os/IHardwarePropertiesManager$Stub;->getDefaultTransactionName(I)Ljava/lang/String;















HPLandroid/os/IHardwarePropertiesManager$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z















HPLandroid/os/IInstalld$Stub$Proxy;->clearAppData(Ljava/lang/String;Ljava/lang/String;IIJ)V










@@ -5081,6 +5080,7 @@ HPLandroid/os/health/HealthStatsWriter;->writeLongsMap(Landroid/os/Parcel;Landro













HPLandroid/os/health/HealthStatsWriter;->writeParcelableMap(Landroid/os/Parcel;Landroid/util/ArrayMap;)V















HPLandroid/os/health/TimerStat;-><init>(IJ)V















HPLandroid/os/health/TimerStat;->writeToParcel(Landroid/os/Parcel;I)V













HPLandroid/os/image/IDynamicSystemService$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z















HPLandroid/os/storage/IStorageEventListener$Stub$Proxy;->onStorageStateChanged(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V















HPLandroid/os/storage/IStorageManager$Stub$Proxy;->allocateBytes(Ljava/lang/String;JILjava/lang/String;)V















HPLandroid/os/storage/IStorageManager$Stub$Proxy;->changeEncryptionPassword(ILjava/lang/String;)I










@@ -24027,7 +24027,6 @@ HSPLandroid/os/IDeviceIdleController$Stub$Proxy;->isPowerSaveWhitelistApp(Ljava/













HSPLandroid/os/IDeviceIdleController$Stub;-><init>()V















HSPLandroid/os/IDeviceIdleController$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/IDeviceIdleController;















HSPLandroid/os/IDumpstate$Stub;-><init>()V













HSPLandroid/os/IDynamicAndroidService$Stub;-><init>()V















HSPLandroid/os/IExternalVibratorService$Stub;-><init>()V















HSPLandroid/os/IHardwarePropertiesManager$Stub;-><init>()V















HSPLandroid/os/IIncidentCompanion$Stub;-><init>()V










@@ -24837,6 +24836,7 @@ HSPLandroid/os/ZygoteProcess;->waitForConnectionToZygote(Ljava/lang/String;)V













HSPLandroid/os/ZygoteProcess;->zygoteSendArgsAndGetResult(Landroid/os/ZygoteProcess$ZygoteState;ZLjava/util/ArrayList;)Landroid/os/Process$ProcessStartResult;















HSPLandroid/os/health/HealthStatsParceler$1;-><init>()V















HSPLandroid/os/health/TimerStat$1;-><init>()V













HSPLandroid/os/image/IDynamicSystemService$Stub;-><init>()V















HSPLandroid/os/storage/IStorageEventListener$Stub$Proxy;->asBinder()Landroid/os/IBinder;















HSPLandroid/os/storage/IStorageEventListener$Stub;->asBinder()Landroid/os/IBinder;















HSPLandroid/os/storage/IStorageManager$Stub$Proxy;->getVolumeList(ILjava/lang/String;I)[Landroid/os/storage/StorageVolume;










@@ -47386,7 +47386,6 @@ Landroid/os/DeviceIdleManager;













Landroid/os/DropBoxManager$Entry$1;















Landroid/os/DropBoxManager$Entry;















Landroid/os/DropBoxManager;













Landroid/os/DynamicAndroidManager;















Landroid/os/Environment$UserEnvironment;















Landroid/os/Environment;















Landroid/os/EventLogTags;










@@ -47428,8 +47427,6 @@ Landroid/os/IDeviceIdleController$Stub;













Landroid/os/IDeviceIdleController;















Landroid/os/IDumpstate$Stub;















Landroid/os/IDumpstate;













Landroid/os/IDynamicAndroidService$Stub;













Landroid/os/IDynamicAndroidService;















Landroid/os/IExternalVibratorService$Stub;















Landroid/os/IExternalVibratorService;















Landroid/os/IHardwarePropertiesManager$Stub;










@@ -47689,6 +47686,10 @@ Landroid/os/health/HealthStatsWriter;













Landroid/os/health/SystemHealthManager;















Landroid/os/health/TimerStat$1;















Landroid/os/health/TimerStat;













Landroid/os/image/DynamicSystemClient;













Landroid/os/image/DynamicSystemManager;













Landroid/os/image/IDynamicSystemService$Stub;













Landroid/os/image/IDynamicSystemService;















Landroid/os/storage/DiskInfo;















Landroid/os/storage/IObbActionListener$Stub;















Landroid/os/storage/IObbActionListener;

























config/preloaded-classes



+2
−1




























Original line number
Diff line number
Diff line








@@ -2724,7 +2724,6 @@ android.os.DeviceIdleManager













android.os.DropBoxManager$Entry$1















android.os.DropBoxManager$Entry















android.os.DropBoxManager













android.os.DynamicAndroidManager















android.os.Environment$UserEnvironment















android.os.Environment















android.os.EventLogTags










@@ -2909,6 +2908,8 @@ android.os.health.HealthStatsParceler













android.os.health.SystemHealthManager















android.os.health.TimerStat$1















android.os.health.TimerStat













android.os.image.DynamicSystemClient













android.os.image.DynamicSystemManager















android.os.storage.IObbActionListener$Stub















android.os.storage.IObbActionListener















android.os.storage.IStorageManager$Stub$Proxy

































core/java/android/app/SystemServiceRegistry.java



+8
−8




























Original line number
Diff line number
Diff line








@@ -131,13 +131,11 @@ import android.os.BugreportManager;













import android.os.Build;















import android.os.DeviceIdleManager;















import android.os.DropBoxManager;













import android.os.DynamicAndroidManager;















import android.os.HardwarePropertiesManager;















import android.os.IBatteryPropertiesRegistrar;















import android.os.IBinder;















import android.os.IDeviceIdleController;















import android.os.IDumpstate;













import android.os.IDynamicAndroidService;















import android.os.IHardwarePropertiesManager;















import android.os.IPowerManager;















import android.os.IRecoverySystem;









@@ -155,6 +153,8 @@ import android.os.UserHandle;













import android.os.UserManager;















import android.os.Vibrator;















import android.os.health.SystemHealthManager;













import android.os.image.DynamicSystemManager;













import android.os.image.IDynamicSystemService;















import android.os.storage.StorageManager;















import android.permission.PermissionControllerManager;















import android.permission.PermissionManager;










@@ -1275,15 +1275,15 @@ final class SystemServiceRegistry {













                                IRollbackManager.Stub.asInterface(b));















                    }});





























        registerService(Context.DYNAMIC_ANDROID_SERVICE, DynamicAndroidManager.class,













                new CachedServiceFetcher<DynamicAndroidManager>() {













        registerService(Context.DYNAMIC_SYSTEM_SERVICE, DynamicSystemManager.class,













                new CachedServiceFetcher<DynamicSystemManager>() {















                    @Override













                    public DynamicAndroidManager createService(ContextImpl ctx)













                    public DynamicSystemManager createService(ContextImpl ctx)















                            throws ServiceNotFoundException {















                        IBinder b = ServiceManager.getServiceOrThrow(













                                Context.DYNAMIC_ANDROID_SERVICE);













                        return new DynamicAndroidManager(













                                IDynamicAndroidService.Stub.asInterface(b));













                                Context.DYNAMIC_SYSTEM_SERVICE);













                        return new DynamicSystemManager(













                                IDynamicSystemService.Stub.asInterface(b));















                    }});















        //CHECKSTYLE:ON IndentationCheck















    }