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

Commit 409319a4 authored by Ayush Sharma's avatar Ayush Sharma Committed by Automerger Merge Worker
Browse files

Merge "Handle error connecting to KeychainService" into udc-qpr-dev am: 64a1987b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25058689



Change-Id: If4cfac19377ee96834cdb82d502a42a244484bab
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 683e85bb 64a1987b

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -6509,7 +6509,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                         KeyChain.bindAsUser(mContext, userHandle)) {

                IKeyChainService keyChain = keyChainConnection.getService();

                return keyChain.setGrant(granteeUid, alias, hasGrant);

            } catch (RemoteException e) {

            } catch (RemoteException | AssertionError e) {

                Slogf.e(LOG_TAG, "Setting grant for package.", e);

                return false;

            }