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

Commit 64c57a8c authored by Todd Kennedy's avatar Todd Kennedy
Browse files

Don't consider resources < 0 as invalid 

The only invalid resource ID is '0'. All other resource IDs are
valid; even negative resource IDs.

With the introduction of namespaces in AAPT2, resource IDs start with
0x80, 0x81, ... [ie. because Java only supports signed types, they are
considered negative]. For app transition animations negative resource
IDs were incorrectly considered "invalid".

Change-Id: Ic8837975d8811826bb9b6635d44a0ac004daad36
Fixes: 70716301
Test: Manual. Run multi-split APK and see that transition animations work when defined in a split
Test: Manual. Open a textbox and see the keyboard animates correctly.
parent a93ab56e

services/core/java/com/android/server/wm/AppTransition.java

+9 −14
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ import android.app.ActivityManager; 
import android.content.ComponentName;

import android.content.Context;

import android.content.res.Configuration;

import android.content.res.ResourceId;

import android.graphics.Bitmap;

import android.graphics.Canvas;

import android.graphics.Color;
@@ -555,25 +556,25 @@ public class AppTransition implements Dump { 
    }



    Animation loadAnimationAttr(LayoutParams lp, int animAttr, int transit) {

        int anim = 0;

        int resId = ResourceId.ID_NULL;

        Context context = mContext;

        if (animAttr >= 0) {

            AttributeCache.Entry ent = getCachedAnimations(lp);

            if (ent != null) {

                context = ent.context;

                anim = ent.array.getResourceId(animAttr, 0);

                resId = ent.array.getResourceId(animAttr, 0);

            }

        }

        anim = updateToTranslucentAnimIfNeeded(anim, transit);

        if (anim != 0) {

            return AnimationUtils.loadAnimation(context, anim);

        resId = updateToTranslucentAnimIfNeeded(resId, transit);

        if (ResourceId.isValid(resId)) {

            return AnimationUtils.loadAnimation(context, resId);

        }

        return null;

    }



    Animation loadAnimationRes(LayoutParams lp, int resId) {

        Context context = mContext;

        if (resId >= 0) {

        if (ResourceId.isValid(resId)) {

            AttributeCache.Entry ent = getCachedAnimations(lp);

            if (ent != null) {

                context = ent.context;
@@ -584,17 +585,11 @@ public class AppTransition implements Dump { 
    }



    private Animation loadAnimationRes(String packageName, int resId) {

        int anim = 0;

        Context context = mContext;

        if (resId >= 0) {

        if (ResourceId.isValid(resId)) {

            AttributeCache.Entry ent = getCachedAnimations(packageName, resId);

            if (ent != null) {

                context = ent.context;

                anim = resId;

            }

                return AnimationUtils.loadAnimation(ent.context, resId);

            }

        if (anim != 0) {

            return AnimationUtils.loadAnimation(context, anim);

        }

        return null;

    }