From c6912e125b8133c5dc6d2f350a8661a16272c718 Mon Sep 17 00:00:00 2001
From: Constantin A <10349490+C1710@users.noreply.github.com>
Date: Sun, 8 Apr 2018 13:55:31 +0200
Subject: [PATCH] Add more licensing information, update CHANGES.md

---
 CHANGES.md                              |  9 +++++----
 emojicompat/AssetEmojiCompatConfig.java | 22 +++++++++++++++++++++-
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 0bff31cf1..3d3f41030 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,9 +1,10 @@
-Changes from Google Noto Color Emoji v x.x
+Changes from Google Noto Color Emoji v2017-05-18 (approx.)
 =======
 
-These are the files which are/were not included in the original Noto Emoji.
-Due to the fact that I didn't worked with git in mind, ALL emojis have been
-reuploaded.
+These are the SVG/PNG files which are/were not included in the original Noto Emoji (or have been modified).
+Due to the fact that I didn't worked with git in mind, ALL emojis have been reuploaded although not every file has been modified.  
+Any other modifications that have been made can be seen in the Git history as these modifications have been made _after_ uploading
+this repository to Github.
 
 There are currently four types of changes:
 
diff --git a/emojicompat/AssetEmojiCompatConfig.java b/emojicompat/AssetEmojiCompatConfig.java
index b1b60b00e..f62d86aef 100644
--- a/emojicompat/AssetEmojiCompatConfig.java
+++ b/emojicompat/AssetEmojiCompatConfig.java
@@ -1,6 +1,25 @@
+/*
+ * Original file (https://android.googlesource.com/platform/frameworks/support/+/master/emoji/bundled/src/main/java/android/support/text/emoji/bundled/BundledEmojiCompatConfig.java):
+ *     Copyright (C) 2017 The Android Open Source Project
+ * Modifications Copyright (C) 2018 Constantin A.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
+import android.content.Context;
 import android.content.res.AssetManager;
 import android.support.annotation.NonNull;
+import android.support.annotation.RequiresApi;
 import android.support.text.emoji.EmojiCompat;
 import android.support.text.emoji.MetadataRepo;
 import android.util.Log;
@@ -13,6 +32,7 @@ import android.support.v4.util.Preconditions;
  * Changes are marked with comments. Formatting and other simple changes are not always marked.
  */
 public class AssetEmojiCompatConfig extends EmojiCompat.Config {
+    // The class name is obviously changed from the original file
 
     /**
      * Create a new configuration for this EmojiCompat
@@ -78,7 +98,7 @@ public class AssetEmojiCompatConfig extends EmojiCompat.Config {
         public void run() {
             try {
                 final AssetManager assetManager = context.getAssets();
-                final MetadataRepo resourceIndex = MetadataRepo.create(mgr, FONT_NAME);
+                final MetadataRepo resourceIndex = MetadataRepo.create(assetManager, FONT_NAME);
                 loaderCallback.onLoaded(resourceIndex);
             } catch (Throwable t) {
                 loaderCallback.onFailed(t);