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

Commit 9ab4bf20 authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Merge changes I20f2330d,Iaca5b20c into main am: 790e28c4 am: 231766c4 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3061866



Change-Id: I66a91364d8211acf73310d55997bd5f6d08e2ae8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1acb8162 231766c4

src/com/android/settings/security/CredentialStorage.java

+4 −4
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ import android.security.Credentials; 
import android.security.IKeyChainService;

import android.security.KeyChain;

import android.security.KeyChain.KeyChainConnection;

import android.security.KeyStore;

import android.security.keystore.KeyProperties;

import android.text.TextUtils;

import android.util.Log;

import android.widget.Toast;
@@ -126,9 +126,9 @@ public final class CredentialStorage extends FragmentActivity { 
        final Bundle bundle = mInstallBundle;

        mInstallBundle = null;



        final int uid = bundle.getInt(Credentials.EXTRA_INSTALL_AS_UID, KeyStore.UID_SELF);

        final int uid = bundle.getInt(Credentials.EXTRA_INSTALL_AS_UID, KeyProperties.UID_SELF);



        if (uid != KeyStore.UID_SELF && !UserHandle.isSameUser(uid, Process.myUid())) {

        if (uid != KeyProperties.UID_SELF && !UserHandle.isSameUser(uid, Process.myUid())) {

            final int dstUserId = UserHandle.getUserId(uid);



            // Restrict install target to the wifi uid.
@@ -280,7 +280,7 @@ public final class CredentialStorage extends FragmentActivity { 


                // If this is not a WiFi key, mark  it as user-selectable, so that it can be

                // selected by users from the Certificate Selection prompt.

                if (mUid == Process.SYSTEM_UID || mUid == KeyStore.UID_SELF) {

                if (mUid == Process.SYSTEM_UID || mUid == KeyProperties.UID_SELF) {

                    service.setUserSelectable(mAlias, true);

                }

tests/robotests/src/com/android/settings/testutils/shadow/ShadowKeyStore.java

deleted100644 → 0
+0 −43
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 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.settings.testutils.shadow;



import android.security.KeyStore;



import org.robolectric.annotation.Implementation;

import org.robolectric.annotation.Implements;

import org.robolectric.annotation.Resetter;



@Implements(KeyStore.class)

public class ShadowKeyStore {



    private static boolean sIsHardwareBacked;



    @Resetter

    public static void reset() {

        sIsHardwareBacked = false;

    }



    @Implementation

    protected boolean isHardwareBacked() {

        return sIsHardwareBacked;

    }



    public static void setHardwareBacked(boolean hardwareBacked) {

        sIsHardwareBacked = hardwareBacked;

    }

}