Merge "Remove warning-level trace" (62ddf061) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/policy/ModifierShortcutManager.java

+6 −8

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ import java.io.IOException;
		* <li> Returning particular kind of application intent by special key.
		*/
		class ModifierShortcutManager {
		private static final String TAG = "ShortcutManager";
		private static final String TAG = "WindowManager";

		private static final String TAG_BOOKMARKS = "bookmarks";
		private static final String TAG_BOOKMARK = "bookmark";
		@@ -188,7 +188,7 @@ class ModifierShortcutManager {
		\| PackageManager.MATCH_UNINSTALLED_PACKAGES);
		} catch (PackageManager.NameNotFoundException e1) {
		Log.w(TAG, "Unable to add bookmark: " + packageName
		+ "/" + className, e);
		+ "/" + className + " not found.");
		continue;
		}
		}
		@@ -213,10 +213,8 @@ class ModifierShortcutManager {
		mIntentShortcuts.put(shortcutChar, shortcut);
		}
		}
		} catch (XmlPullParserException e) {
		Log.w(TAG, "Got exception parsing bookmarks.", e);
		} catch (IOException e) {
		Log.w(TAG, "Got exception parsing bookmarks.", e);
		} catch (XmlPullParserException \| IOException e) {
		Log.e(TAG, "Got exception parsing bookmarks.", e);
		}
		}

		@@ -302,7 +300,7 @@ class ModifierShortcutManager {
		Slog.w(TAG, "Dropping application launch key because "
		+ "the activity to which it is registered was not found: "
		+ "keyCode=" + KeyEvent.keyCodeToString(keyCode) + ","
		+ " category=" + category, ex);
		+ " category=" + category);
		}
		return true;
		} else {
		@@ -318,7 +316,7 @@ class ModifierShortcutManager {
		} catch (ActivityNotFoundException ex) {
		Slog.w(TAG, "Dropping shortcut key combination because "
		+ "the activity to which it is registered was not found: "
		+ "META+ or SEARCH" + KeyEvent.keyCodeToString(keyCode), ex);
		+ "META+ or SEARCH" + KeyEvent.keyCodeToString(keyCode));
		}
		return true;
		}