Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94d369a8 authored by Brandon Maxwell's avatar Brandon Maxwell
Browse files

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
parent e9fd1cf0
Loading
Loading
Loading
Loading
+39 −0
Original line number Diff line number Diff line
/*
 * 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);
    }

}
+34 −0
Original line number Diff line number Diff line
/*
 * 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;
    }

}
+34 −0
Original line number Diff line number Diff line
/*
 * 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;
    }
}
+44 −0
Original line number Diff line number Diff line
/*
 * 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()));
    }
}