commit d3ee3ca90cc5ca073dfc6aa401f5dcaa6e4e34fd
author Sungsoo Lim <sungsoo@google.com> Wed May 28 09:37:27 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 28 09:37:29 2014 +0000
tree 75063cd8335b7967feedf664a0c8fc5283f0502b
parent 197123db245abf6203332e8eff44a18fe6d2144f
parent a2c901d4302b1a0c2c833c9c7bc8187cfe1a434c

Merge "Fix a typo" into lmp-preview-dev

core/java/android/tv/TvInputInfo.java

diff --git a/core/java/android/tv/TvInputInfo.java b/core/java/android/tv/TvInputInfo.java
index 50462cc..217e4b7 100644
--- a/core/java/android/tv/TvInputInfo.java
+++ b/core/java/android/tv/TvInputInfo.java
@@ -39,7 +39,7 @@
     public TvInputInfo(ResolveInfo service) {
         mService = service;
         ServiceInfo si = service.serviceInfo;
-        mId = generateInputIdForComponenetName(new ComponentName(si.packageName, si.name));
+        mId = generateInputIdForComponentName(new ComponentName(si.packageName, si.name));
     }
 
     /**
@@ -134,7 +134,7 @@
      * @return the generated input id for the given {@code name}.
      * @hide
      */
-    public static final String generateInputIdForComponenetName(ComponentName name) {
+    public static final String generateInputIdForComponentName(ComponentName name) {
         return name.flattenToShortString();
     }
 

core/java/android/tv/TvInputService.java

diff --git a/core/java/android/tv/TvInputService.java b/core/java/android/tv/TvInputService.java
index eeb738d..cb0142f 100644
--- a/core/java/android/tv/TvInputService.java
+++ b/core/java/android/tv/TvInputService.java
@@ -69,7 +69,7 @@
     @Override
     public void onCreate() {
         super.onCreate();
-        mId = TvInputInfo.generateInputIdForComponenetName(
+        mId = TvInputInfo.generateInputIdForComponentName(
                 new ComponentName(getPackageName(), getClass().getName()));
     }