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

Commit 3d31e0b9 authored by Kholoud Mohamed's avatar Kholoud Mohamed Committed by Android (Google) Code Review
Browse files

Merge changes from topic "resetAPIs" into tm-dev 

* changes:
  RESTRICT AUTOMERGE add requiresAPI annotation for DPM#getString
  RESTRICT AUTOMERGE Expose getString APIs as public
parents 6bdc667d d782127f

core/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -7466,6 +7466,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
@@ -1090,8 +1090,6 @@ package android.app.admin { 
    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.QUERY_ADMIN_POLICY}) public java.util.List<java.lang.String> getPermittedInputMethodsForCurrentUser();

    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();
@@ -1104,8 +1102,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.SEND_LOST_MODE_LOCATION_UPDATES) 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
@@ -15356,10 +15356,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();

            }
@@ -15659,10 +15659,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();

            }
@@ -15672,7 +15672,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.
@@ -15684,15 +15684,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,
@@ -15735,10 +15732,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();

packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java

+13 −5
Original line number Diff line number Diff line
@@ -23,12 +23,15 @@ import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; 
import android.app.admin.DevicePolicyManager;

import android.content.Context;

import android.content.res.TypedArray;

import android.os.Build;

import android.os.UserHandle;

import android.text.TextUtils;

import android.util.AttributeSet;

import android.util.TypedValue;

import android.widget.TextView;



import androidx.annotation.RequiresApi;

import androidx.core.os.BuildCompat;

import androidx.preference.Preference;

import androidx.preference.PreferenceViewHolder;
@@ -102,11 +105,9 @@ public class RestrictedPreferenceHelper { 
        if (mDisabledSummary) {

            final TextView summaryView = (TextView) holder.findViewById(android.R.id.summary);

            if (summaryView != null) {

                final CharSequence disabledText = mContext

                        .getSystemService(DevicePolicyManager.class)

                        .getString(CONTROLLED_BY_ADMIN_SUMMARY,

                                () -> summaryView.getContext().getString(

                                        R.string.disabled_by_admin_summary_text));

                final CharSequence disabledText = BuildCompat.isAtLeastT()

                        ? getDisabledByAdminUpdatableString()

                        : mContext.getString(R.string.disabled_by_admin_summary_text);

                if (mDisabledByAdmin) {

                    summaryView.setText(disabledText);

                } else if (mDisabledByAppOps) {
@@ -119,6 +120,13 @@ public class RestrictedPreferenceHelper { 
        }

    }



    @RequiresApi(Build.VERSION_CODES.TIRAMISU)

    private String getDisabledByAdminUpdatableString() {

        return mContext.getSystemService(DevicePolicyManager.class).getString(

                CONTROLLED_BY_ADMIN_SUMMARY,

                () -> mContext.getString(R.string.disabled_by_admin_summary_text));

    }



    public void useAdminDisabledSummary(boolean useSummary) {

        mDisabledSummary = useSummary;

    }