am 8a6a15e0: Merge "Clean up IntentCompatUtils a bit"

* commit '8a6a15e052f2df9e8d71bed21b1936ce37a6c8a2':
  Clean up IntentCompatUtils a bit
main
Tadashi G. Takaoka 2013-05-21 15:19:46 -07:00 committed by Android Git Automerger
commit 418f8753c9
2 changed files with 5 additions and 6 deletions

View File

@ -21,16 +21,15 @@ import android.content.Intent;
public final class IntentCompatUtils {
// Note that Intent.ACTION_USER_INITIALIZE have been introduced in API level 17
// (Build.VERSION_CODE.JELLY_BEAN_MR1).
public static final String ACTION_USER_INITIALIZE =
(String)CompatUtils.getFieldValue(null, null,
private static final String ACTION_USER_INITIALIZE =
(String)CompatUtils.getFieldValue(null /* receiver */, null /* defaultValue */,
CompatUtils.getField(Intent.class, "ACTION_USER_INITIALIZE"));
private IntentCompatUtils() {
// This utility class is not publicly instantiable.
}
public static boolean has_ACTION_USER_INITIALIZE(final Intent intent) {
return ACTION_USER_INITIALIZE != null && intent != null
&& ACTION_USER_INITIALIZE.equals(intent.getAction());
public static boolean is_ACTION_USER_INITIALIZE(final String action) {
return ACTION_USER_INITIALIZE != null && ACTION_USER_INITIALIZE.equals(action);
}
}

View File

@ -91,7 +91,7 @@ public final class LauncherIconVisibilityManager extends BroadcastReceiver {
} else if (Intent.ACTION_BOOT_COMPLETED.equals(action)) {
Log.i(TAG, "Boot has been completed");
return true;
} else if (IntentCompatUtils.has_ACTION_USER_INITIALIZE(intent)) {
} else if (IntentCompatUtils.is_ACTION_USER_INITIALIZE(action)) {
Log.i(TAG, "User initialize");
return true;
}