PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I20f2330d,Iaca5b20c into main am: 790e28c431 am: 231766c463

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

Change-Id: I66a91364d8211acf73310d55997bd5f6d08e2ae8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Eric Biggers
2024-05-06 18:09:47 +00:00
committed by Automerger Merge Worker
parent 1acb816217 231766c463
commit 9ab4bf20f7
2 changed files with 4 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/security/CredentialStorage.java
View File

@@ -34,7 +34,7 @@ import android.security.Credentials;
import android.security.IKeyChainService; import android.security.IKeyChainService;
import android.security.KeyChain; import android.security.KeyChain;
import android.security.KeyChain.KeyChainConnection; import android.security.KeyChain.KeyChainConnection;
import android.security.KeyStore; import android.security.keystore.KeyProperties;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.widget.Toast; import android.widget.Toast;
@@ -126,9 +126,9 @@ public final class CredentialStorage extends FragmentActivity {
final Bundle bundle = mInstallBundle; final Bundle bundle = mInstallBundle;
mInstallBundle = null; 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); final int dstUserId = UserHandle.getUserId(uid);
// Restrict install target to the wifi 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 // 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. // 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); service.setUserSelectable(mAlias, true);
} }

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

@@ -1,43 +0,0 @@
/*
* 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;
}
}