commit 1365602813ce10440832cf6ebfe8297eb2b58fcd
author Jae Seo <jaeseo@google.com> Wed Jan 13 17:50:19 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 13 17:50:19 2016 +0000
tree 779bb268aee0ee8b1732bbe9edee1391c4e01c6a
parent 81d867f5db7fc97d4a1b775c9089e43fea9f826b
parent 2a2b299dca20b151d5dc5bda3d068d70e6f15f6c

Merge "TIF: Fix typos"

services/core/java/com/android/server/tv/TvInputHal.java

diff --git a/services/core/java/com/android/server/tv/TvInputHal.java b/services/core/java/com/android/server/tv/TvInputHal.java
index a035826..ebbb8b3 100644
--- a/services/core/java/com/android/server/tv/TvInputHal.java
+++ b/services/core/java/com/android/server/tv/TvInputHal.java
@@ -116,7 +116,7 @@
 
     public void close() {
         synchronized (mLock) {
-            if (mPtr != 0l) {
+            if (mPtr != 0L) {
                 nativeClose(mPtr);
             }
         }

services/core/java/com/android/server/tv/TvInputManagerService.java

diff --git a/services/core/java/com/android/server/tv/TvInputManagerService.java b/services/core/java/com/android/server/tv/TvInputManagerService.java
index d814ebf..3193ff8 100644
--- a/services/core/java/com/android/server/tv/TvInputManagerService.java
+++ b/services/core/java/com/android/server/tv/TvInputManagerService.java
@@ -465,7 +465,7 @@
         try {
             context = mContext.createPackageContextAsUser("android", 0, user);
         } catch (NameNotFoundException e) {
-            Slog.e(TAG, "failed to create package contenxt as user " + user);
+            Slog.e(TAG, "failed to create package context as user " + user);
             context = mContext;
         }
         return context.getContentResolver();