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

Commit 9bee7bf1 authored by kholoud mohamed's avatar kholoud mohamed Committed by Kholoud Mohamed
Browse files

RESTRICT AUTOMERGE Expose getString APIs as public 

exposed getString APIs as public to make it consistent with the
getDrawable APIs.
Also changed resetStrings/Drawables API to take in a set instead of an
array.

Bug: 218875965
Test: atest EnterpriseResourcesTests
Change-Id: I042636233ea342af62a7e6569c90786d3ef249cb
(cherry picked from commit 1d0d9c9c)
Merged-In: I042636233ea342af62a7e6569c90786d3ef249cb
parent 22262a3c

core/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -7477,6 +7477,8 @@ package android.app.admin { 
    method public CharSequence getStartUserSessionMessage(@NonNull android.content.ComponentName);

    method @Deprecated public boolean getStorageEncryption(@Nullable android.content.ComponentName);

    method public int getStorageEncryptionStatus();

    method @Nullable public String getString(@NonNull String, @NonNull java.util.function.Supplier<java.lang.String>);

    method @Nullable public String getString(@NonNull String, @NonNull java.util.function.Supplier<java.lang.String>, @NonNull java.lang.Object...);

    method @Nullable public android.app.admin.SystemUpdatePolicy getSystemUpdatePolicy();

    method @Nullable public android.os.PersistableBundle getTransferOwnershipBundle();

    method @Nullable public java.util.List<android.os.PersistableBundle> getTrustAgentConfiguration(@Nullable android.content.ComponentName, @NonNull android.content.ComponentName);

core/api/system-current.txt

+2 −4
Original line number Diff line number Diff line
@@ -1097,8 +1097,6 @@ package android.app.admin { 
    method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public java.util.List<android.os.UserHandle> getPolicyManagedProfiles(@NonNull android.os.UserHandle);

    method @Nullable public android.content.ComponentName getProfileOwner() throws java.lang.IllegalArgumentException;

    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS}) public String getProfileOwnerNameAsUser(int) throws java.lang.IllegalArgumentException;

    method @Nullable public String getString(@NonNull String, @NonNull java.util.function.Supplier<java.lang.String>);

    method @Nullable public String getString(@NonNull String, @NonNull java.util.function.Supplier<java.lang.String>, @NonNull java.lang.Object...);

    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS}) public int getUserProvisioningState();

    method public boolean isDeviceManaged();

    method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean isDeviceProvisioned();
@@ -1111,8 +1109,8 @@ package android.app.admin { 
    method @RequiresPermission("android.permission.NOTIFY_PENDING_SYSTEM_UPDATE") public void notifyPendingSystemUpdate(long, boolean);

    method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public boolean packageHasActiveAdmins(String);

    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS, android.Manifest.permission.PROVISION_DEMO_DEVICE}) public void provisionFullyManagedDevice(@NonNull android.app.admin.FullyManagedDeviceProvisioningParams) throws android.app.admin.ProvisioningException;

    method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES) public void resetDrawables(@NonNull String[]);

    method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES) public void resetStrings(@NonNull String[]);

    method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES) public void resetDrawables(@NonNull java.util.Set<java.lang.String>);

    method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES) public void resetStrings(@NonNull java.util.Set<java.lang.String>);

    method @RequiresPermission(android.Manifest.permission.TRIGGER_LOST_MODE) public void sendLostModeLocationUpdate(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Boolean>);

    method @Deprecated @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_ADMINS) public boolean setActiveProfileOwner(@NonNull android.content.ComponentName, String) throws java.lang.IllegalArgumentException;

    method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public void setDeviceProvisioningConfigApplied();

core/java/android/app/admin/DevicePolicyManager.java

+7 −13
Original line number Diff line number Diff line
@@ -15366,10 +15366,10 @@ public class DevicePolicyManager { 
     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES)

    public void resetDrawables(@NonNull String[] drawableIds) {

    public void resetDrawables(@NonNull Set<String> drawableIds) {

        if (mService != null) {

            try {

                mService.resetDrawables(drawableIds);

                mService.resetDrawables(new ArrayList<>(drawableIds));

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

            }
@@ -15669,10 +15669,10 @@ public class DevicePolicyManager { 
     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES)

    public void resetStrings(@NonNull String[] stringIds) {

    public void resetStrings(@NonNull Set<String> stringIds) {

        if (mService != null) {

            try {

                mService.resetStrings(stringIds);

                mService.resetStrings(new ArrayList<>(stringIds));

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

            }
@@ -15682,7 +15682,7 @@ public class DevicePolicyManager { 
    /**

     * Returns the appropriate updated string for the {@code stringId} (see

     * {@link DevicePolicyResources.Strings}) if one was set using

     * {@link #setStrings}, otherwise returns the string from {@code defaultStringLoader}.

     * {@code setStrings}, otherwise returns the string from {@code defaultStringLoader}.

     *

     * <p>Also returns the string from {@code defaultStringLoader} if

     * {@link DevicePolicyResources.Strings#UNDEFINED} was passed.
@@ -15694,15 +15694,12 @@ public class DevicePolicyManager { 
     * notified when a resource has been updated.

     *

     * <p>Note that each call to this API loads the resource from the package that called

     * {@link #setStrings} to set the updated resource.

     * {@code setStrings} to set the updated resource.

     *

     * @param stringId The IDs to get the updated resource for.

     * @param defaultStringLoader To get the default string if no updated string was set for

     *         {@code stringId}.

     *

     * @hide

     */

    @SystemApi

    @Nullable

    public String getString(

            @NonNull @DevicePolicyResources.UpdatableStringId String stringId,
@@ -15745,10 +15742,7 @@ public class DevicePolicyManager { 
     * @param defaultStringLoader To get the default string if no updated string was set for

     *         {@code stringId}.

     * @param formatArgs The format arguments that will be used for substitution.

     *

     * @hide

     */

    @SystemApi

    @Nullable

    @SuppressLint("SamShouldBeLast")

    public String getString(

core/java/android/app/admin/IDevicePolicyManager.aidl

+2 −2
Original line number Diff line number Diff line
@@ -552,14 +552,14 @@ interface IDevicePolicyManager { 


    List<UserHandle> listForegroundAffiliatedUsers();

    void setDrawables(in List<DevicePolicyDrawableResource> drawables);

    void resetDrawables(in String[] drawableIds);

    void resetDrawables(in List<String> drawableIds);

    ParcelableResource getDrawable(String drawableId, String drawableStyle, String drawableSource);



    boolean isDpcDownloaded();

    void setDpcDownloaded(boolean downloaded);



    void setStrings(in List<DevicePolicyStringResource> strings);

    void resetStrings(in String[] stringIds);

    void resetStrings(in List<String> stringIds);

    ParcelableResource getString(String stringId);



    boolean shouldAllowBypassingDevicePolicyManagementRoleQualification();

services/devicepolicy/java/com/android/server/devicepolicy/BaseIDevicePolicyManager.java

+2 −2
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ abstract class BaseIDevicePolicyManager extends IDevicePolicyManager.Stub { 
    public void setDrawables(@NonNull List<DevicePolicyDrawableResource> drawables){}



    @Override

    public void resetDrawables(@NonNull String[] drawableIds){}

    public void resetDrawables(@NonNull List<String> drawableIds){}



    @Override

    public ParcelableResource getDrawable(
@@ -190,7 +190,7 @@ abstract class BaseIDevicePolicyManager extends IDevicePolicyManager.Stub { 
    public void setStrings(@NonNull List<DevicePolicyStringResource> strings){}



    @Override

    public void resetStrings(String[] stringIds){}

    public void resetStrings(@NonNull List<String> stringIds){}



    @Override

    public ParcelableResource getString(String stringId) {