Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'e58e59cc' into fix-merge-conflict

Browse Source 
* commit 'e58e59cc':
  ksd to lmp-sprout-dev

Conflicts:
	core/java/android/provider/CallLog.java
	telephony/java/android/telephony/SubInfoRecord.java
	telephony/java/android/telephony/SubscriptionManager.java
	telephony/java/android/telephony/TelephonyManager.java
	telephony/java/com/android/internal/telephony/ISub.aidl
	telephony/java/com/android/internal/telephony/TelephonyIntents.java

Change-Id: I2b892b692743a7ccde55185a2b90135bf28408cd
This commit is contained in:
Wink Saville
2014-09-15 12:40:02 -07:00
parent 48520a6c5a 0ebaf88934
commit 02e3979d62
14 changed files with 158 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/content/res/ResourcesKey.java
View File

@@ -62,10 +62,15 @@ public final class ResourcesKey {
return false;
}
ResourcesKey peer = (ResourcesKey) obj;
if (mResDir != peer.mResDir) {
if (mResDir == null || peer.mResDir == null) {
return false;
} else if (!mResDir.equals(peer.mResDir)) {
if ((mResDir == null) && (peer.mResDir != null)) {
return false;
}
if ((mResDir != null) && (peer.mResDir == null)) {
return false;
}
if ((mResDir != null) && (peer.mResDir != null)) {
if (!mResDir.equals(peer.mResDir)) {
return false;
}
}