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

Commit aaab1611 authored by Ayush Sharma's avatar Ayush Sharma Committed by Android (Google) Code Review
Browse files

Merge "Handle error connecting to KeychainService" into main

parents 9471ea5f a93b4fdf

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

+1 −1
Original line number Diff line number Diff line
@@ -6476,7 +6476,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;

            }