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

Commit 477d208d authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of [15539627, 15541570, 15541571, 15541572, 15541573,... 

Merge cherrypicks of [15539627, 15541570, 15541571, 15541572, 15541573, 15541574] into security-aosp-pi-release

Change-Id: Ifcbfac5bd7afd1e1cf7f51b68c807062e11e55e0
parents 927dc5f7 aaf9698e

core/java/android/content/pm/PackageItemInfo.java

+4 −2
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ public class PackageItemInfo { 


    private static final float MAX_LABEL_SIZE_PX = 500f;

    /** The maximum length of a safe label, in characters */

    private static final int MAX_SAFE_LABEL_LENGTH = 50000;

    private static final int MAX_SAFE_LABEL_LENGTH = 1000;



    private static volatile boolean sForceSafeLabels = false;
@@ -191,7 +191,9 @@ public class PackageItemInfo { 
        if (sForceSafeLabels) {

            return loadSafeLabel(pm);

        } else {

            return loadUnsafeLabel(pm);

            // Trims the label string to the MAX_SAFE_LABEL_LENGTH. This is to prevent that the

            // system is overwhelmed by an enormous string returned by the application.

            return TextUtils.trimToSize(loadUnsafeLabel(pm), MAX_SAFE_LABEL_LENGTH);

        }

    }

core/res/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -3571,6 +3571,8 @@ 
    <string name="deny">Deny</string>

    <string name="permission_request_notification_title">Permission requested</string>

    <string name="permission_request_notification_with_subtitle">Permission requested\nfor account <xliff:g id="account" example="foo@gmail.com">%s</xliff:g>.</string>

     <!-- Title and subtitle for notification shown when app request account access (two lines) [CHAR LIMIT=NONE] -->

    <string name="permission_request_notification_for_app_with_subtitle">Permission requested by <xliff:g id="app" example="Gmail">%1$s</xliff:g>\nfor account <xliff:g id="account" example="foo@gmail.com">%2$s</xliff:g>.</string>



    <!-- Message to show when an intent automatically switches users into the personal profile. -->

    <string name="forward_intent_to_owner">You\'re using this app outside of your work profile</string>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -543,6 +543,7 @@ 
  <java-symbol type="string" name="menu_sym_shortcut_label" />

  <java-symbol type="string" name="notification_title" />

  <java-symbol type="string" name="permission_request_notification_with_subtitle" />

  <java-symbol type="string" name="permission_request_notification_for_app_with_subtitle" />

  <java-symbol type="string" name="prepend_shortcut_label" />

  <java-symbol type="string" name="paste_as_plain_text" />

  <java-symbol type="string" name="replace" />

graphics/java/android/graphics/drawable/VectorDrawable.java

+7 −3
Original line number Diff line number Diff line
@@ -342,15 +342,19 @@ public class VectorDrawable extends Drawable { 
    private final Rect mTmpBounds = new Rect();



    public VectorDrawable() {

        this(new VectorDrawableState(null), null);

        this(null, null);

    }



    /**

     * The one constructor to rule them all. This is called by all public

     * constructors to set the state and initialize local properties.

     */

    private VectorDrawable(@NonNull VectorDrawableState state, @Nullable Resources res) {

        mVectorState = state;

    private VectorDrawable(@Nullable VectorDrawableState state, @Nullable Resources res) {

        // As the mutable, not-thread-safe native instance is stored in VectorDrawableState, we

        // need to always do a defensive copy even if mutate() isn't called. Otherwise

        // draw() being called on 2 different VectorDrawable instances could still hit the same

        // underlying native object.

        mVectorState = new VectorDrawableState(state);

        updateLocalState(res);

    }

packages/SystemUI/src/com/android/systemui/plugins/PluginManagerImpl.java

+3 −1
Original line number Diff line number Diff line
@@ -183,10 +183,12 @@ public class PluginManagerImpl extends BroadcastReceiver implements PluginManage 
        IntentFilter filter = new IntentFilter(Intent.ACTION_PACKAGE_ADDED);

        filter.addAction(Intent.ACTION_PACKAGE_CHANGED);

        filter.addAction(Intent.ACTION_PACKAGE_REMOVED);

        filter.addDataScheme("package");

        mContext.registerReceiver(this, filter);

        filter.addAction(PLUGIN_CHANGED);

        filter.addAction(DISABLE_PLUGIN);

        filter.addDataScheme("package");

        mContext.registerReceiver(this, filter);

        mContext.registerReceiver(this, filter, PluginInstanceManager.PLUGIN_PERMISSION, null);

        filter = new IntentFilter(Intent.ACTION_USER_UNLOCKED);

        mContext.registerReceiver(this, filter);

    }