OSDN Git Service

Make ResourceKey always use non-null configuration override.
authorFilip Gruszczynski <gruszczy@google.com>
Tue, 4 Aug 2015 21:46:33 +0000 (14:46 -0700)
committerFilip Gruszczynski <gruszczy@google.com>
Tue, 4 Aug 2015 22:26:14 +0000 (15:26 -0700)
commita01f48681cdaf34e0943609683d0bbb26e761a58
treee225a3066917f2ad51dc2ec68014a01a67b66101
parent845d14db9066c3262f270237b52e315aa71508b2
Make ResourceKey always use non-null configuration override.

We don't differentiate between null conifguration and
Configuration.EMPTY, but if ResourceKey uses both, it will produce
different hashes and won't be equal. This CL makes ResourceKey always
hold a non null reference to the Configuration object.

We started delivering the configuration overrides in
Ib2c7be0b427f5ce05e7a362bcdd496ddbc9164f0, which changed behavior from
using always null, to using both null and Conifguration.EMPTY for empty
confgiuration. Now we will switch to using only one value, which is
Configuration.EMPTY.

Bug: 22620824
Change-Id: I090fd90ac21a6b3ebc7f2974a91dd7c861af10d7
core/java/android/content/res/ResourcesKey.java