From 94d369a87c73fb55fd2341191bfafc56ea0879aa Mon Sep 17 00:00:00 2001 From: Brandon Maxwell Date: Wed, 20 Jan 2016 12:32:58 -0800 Subject: Added UserManagerCompat#isUserUnlocked method + Needed to ensure that N sdk method calls aren't compiled into the apk prior to the sdk launch Bug=26542221 Change-Id: Iefc54caa5cb15758f011fc38c50c2ff1efa8c5c2 --- .../dialer/compat/UserManagerSdkCompat.java | 39 +++++++++++++++++++ .../dialer/compat/UserManagerSdkCompat.java | 34 +++++++++++++++++ .../android/dialer/compat/UserManagerCompat.java | 34 +++++++++++++++++ .../dialer/compat/UserManagerCompatTest.java | 44 ++++++++++++++++++++++ 4 files changed, 151 insertions(+) create mode 100644 src-N/com/android/dialer/compat/UserManagerSdkCompat.java create mode 100644 src-pre-N/com/android/dialer/compat/UserManagerSdkCompat.java create mode 100644 tests/src/com/android/dialer/compat/UserManagerCompatTest.java diff --git a/src-N/com/android/dialer/compat/UserManagerSdkCompat.java b/src-N/com/android/dialer/compat/UserManagerSdkCompat.java new file mode 100644 index 000000000..9a08d4e71 --- /dev/null +++ b/src-N/com/android/dialer/compat/UserManagerSdkCompat.java @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * 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 + */ +package com.android.dialer.compat; + +import android.content.Context; + +/** + * UserManagerCompat respecting Sdk requirements + */ +public class UserManagerSdkCompat { + + /** + * Return whether the calling user is running in an "unlocked" state. A user + * is unlocked only after they've entered their credentials (such as a lock + * pattern or PIN), and credential-encrypted private app data storage is + * available. + * + * @param context the current context + * @return {@code true} if the user is unlocked or context is null, {@code false} otherwise + * @throws NullPointerException if context is null + */ + public static boolean isUserUnlocked(Context context) { + return android.support.v4.os.UserManagerCompat.isUserUnlocked(context); + } + +} diff --git a/src-pre-N/com/android/dialer/compat/UserManagerSdkCompat.java b/src-pre-N/com/android/dialer/compat/UserManagerSdkCompat.java new file mode 100644 index 000000000..c79ac2f91 --- /dev/null +++ b/src-pre-N/com/android/dialer/compat/UserManagerSdkCompat.java @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * 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 + */ +package com.android.dialer.compat; + +import android.content.Context; +import android.util.Log; + +/** + * UserManagerCompat respecting Sdk requirements + */ +public class UserManagerSdkCompat { + + /** + * @return {@code true} + */ + public static boolean isUserUnlocked(Context context) { + Log.wtf("UserManagerSdkCompat", "Not implemented"); + return true; + } + +} diff --git a/src/com/android/dialer/compat/UserManagerCompat.java b/src/com/android/dialer/compat/UserManagerCompat.java index a1fdcc68e..576703364 100644 --- a/src/com/android/dialer/compat/UserManagerCompat.java +++ b/src/com/android/dialer/compat/UserManagerCompat.java @@ -1,3 +1,18 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * 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. + */ package com.android.dialer.compat; import android.content.Context; @@ -34,4 +49,23 @@ public class UserManagerCompat { // Adapted from {@link UserManager} and {@link UserHandle}. return (Process.myUid() / PER_USER_RANGE) == USER_SYSTEM; } + + /** + * Return whether the calling user is running in an "unlocked" state. A user + * is unlocked only after they've entered their credentials (such as a lock + * pattern or PIN), and credential-encrypted private app data storage is + * available. + * + * TODO b/26688153 + * + * @param context the current context + * @return {@code true} if the user is unlocked, {@code false} otherwise + * @throws NullPointerException if context is null + */ + public static boolean isUserUnlocked(Context context) { + if (CompatUtils.isNCompatible()) { + return UserManagerSdkCompat.isUserUnlocked(context); + } + return true; + } } diff --git a/tests/src/com/android/dialer/compat/UserManagerCompatTest.java b/tests/src/com/android/dialer/compat/UserManagerCompatTest.java new file mode 100644 index 000000000..ff734a19d --- /dev/null +++ b/tests/src/com/android/dialer/compat/UserManagerCompatTest.java @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * 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. + */ +package com.android.dialer.compat; + +import android.test.AndroidTestCase; + +import com.android.contacts.common.compat.CompatUtils; + +public class UserManagerCompatTest extends AndroidTestCase { + + public void testIsUserUnlocked_N_NullContext() { + if (!CompatUtils.isNCompatible()) { + return; + } + try { + UserManagerCompat.isUserUnlocked(null); + fail("Expected NullPointerException but none was thrown"); + } catch (NullPointerException e) {} + } + + public void testIsUserUnlocked_M_NullContext() { + if (CompatUtils.isNCompatible()) { + return; + } + assertTrue(UserManagerCompat.isUserUnlocked(null)); + } + + public void testIsUserUnlocked() { + assertTrue(UserManagerCompat.isUserUnlocked(getContext())); + } +} -- cgit v1.2.3