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

Commit dd51c9f1 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [14189656, 14189657, 14189658, 14189608] into sc-release 

Change-Id: Id3f2cefcdf1cd3cd2a9b85db7055f703d55c52fd
parents 5087d108 ce8d4c17

core/java/android/content/pm/AppSearchShortcutInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ public class AppSearchShortcutInfo extends GenericDocument { 


    /** The name of the schema type for {@link ShortcutInfo} documents.*/

    public static final String SCHEMA_TYPE = "Shortcut";

    public static final int SCHEMA_VERSION = 1;

    public static final int SCHEMA_VERSION = 2;



    public static final String KEY_ACTIVITY = "activity";

    public static final String KEY_SHORT_LABEL = "shortLabel";

core/java/android/content/pm/parsing/ParsingPackageUtils.java

+6 −0
Original line number Diff line number Diff line
@@ -2800,6 +2800,12 @@ public class ParsingPackageUtils { 
    }



    private void convertSplitPermissions(ParsingPackage pkg) {

        // STOPSHIP(b/183905675): REMOVE THIS TERRIBLE, HORRIBLE, NO GOOD, VERY BAD HACK

        if ("com.android.chrome".equals(pkg.getPackageName())

                && (445500383 == pkg.getVersionCode() || 438500084 == pkg.getVersionCode())) {

            pkg.setTargetSdkVersion(Build.VERSION_CODES.R);

        }



        final int listSize = mSplitPermissionInfos.size();

        for (int is = 0; is < listSize; is++) {

            final PermissionManager.SplitPermissionInfo spi = mSplitPermissionInfos.get(is);

packages/SettingsLib/SettingsTheme/res/values/styles_preference.xml

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
  limitations under the License.

  -->

<resources>

    <!--DEPRECATED. It will remove after all of client team migrated to new style. -->

    <!--DEPRECATED. It will be removed after all of client teams migrated to new style. -->

    <style name="PreferenceTheme" parent="@style/PreferenceThemeOverlay">

        <item name="preferenceCategoryStyle">@style/SettingsCategoryPreference</item>

        <item name="preferenceStyle">@style/SettingsPreference</item>
@@ -28,7 +28,7 @@ 
        <item name="footerPreferenceStyle">@style/Preference.Material</item>

    </style>



    <style name="SettingsPreferenceTheme" parent="@style/PreferenceThemeOverlay">

    <style name="PreferenceTheme.SettingsBase" parent="@style/PreferenceThemeOverlay">

        <item name="preferenceCategoryStyle">@style/SettingsCategoryPreference</item>

        <item name="preferenceStyle">@style/SettingsPreference</item>

        <item name="checkBoxPreferenceStyle">@style/SettingsCheckBoxPreference</item>

packages/SettingsLib/SettingsTheme/res/values/themes.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
        <item name="android:textAppearanceListItem">@style/TextAppearance.PreferenceTitle</item>

        <item name="android:listPreferredItemPaddingStart">@dimen/preference_padding_start</item>

        <item name="android:listPreferredItemPaddingEnd">@dimen/preference_padding_end</item>

        <item name="preferenceTheme">@style/SettingsPreferenceTheme</item>

        <item name="preferenceTheme">@style/PreferenceTheme.SettingsBase</item>

    </style>



    <!-- Using in SubSettings page including injected settings page -->

services/core/java/com/android/server/pm/ShortcutPackage.java

+4 −3
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ class ShortcutPackage extends ShortcutPackageItem { 
    public ShortcutInfo findShortcutById(@Nullable final String id) {

        if (id == null) return null;

        final List<ShortcutInfo> ret = getShortcutById(Collections.singleton(id));

        return ret.isEmpty() ? null : ret.get(0);

        return (ret == null || ret.isEmpty()) ? null : ret.get(0);

    }



    public boolean isShortcutExistsAndInvisibleToPublisher(String id) {
@@ -2361,7 +2361,7 @@ class ShortcutPackage extends ShortcutPackageItem { 
        });

    }



    @NonNull

    @Nullable

    private List<ShortcutInfo> getShortcutById(@NonNull final Collection<String> ids) {

        final List<String> shortcutIds = new ArrayList<>(1);

        for (String id : ids) {
@@ -2525,7 +2525,8 @@ class ShortcutPackage extends ShortcutPackageItem { 
    private AndroidFuture<AppSearchSession> setupSchema(

            @NonNull final AppSearchSession session) {

        SetSchemaRequest.Builder schemaBuilder = new SetSchemaRequest.Builder()

                .addSchemas(AppSearchPerson.SCHEMA, AppSearchShortcutInfo.SCHEMA);

                .addSchemas(AppSearchPerson.SCHEMA, AppSearchShortcutInfo.SCHEMA)

                .setForceOverride(true);

        for (PackageIdentifier pi : mPackageIdentifiers.values()) {

            schemaBuilder = schemaBuilder

                    .setSchemaTypeVisibilityForPackage(