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

Commit bcac9648 authored by Felipe Leme's avatar Felipe Leme Committed by Automerger Merge Worker
Browse files

Merge "Minor improvements on DevicePolicyManagerService." into sc-dev am: 6e91d799 

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

Change-Id: Idcbe8e7b0b7e7d6b7d6cfeabe89df2f64fda318e
parents 714e4e9c 6e91d799

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

+5 −5
Original line number Diff line number Diff line
@@ -79,16 +79,16 @@ public class CertificateMonitor { 
            X509Certificate cert = parseCert(certBuffer);

            pemCert = Credentials.convertToPem(cert);

        } catch (CertificateException | IOException ce) {

            Slog.e(LOG_TAG, ce, "Problem converting cert");

            Slog.e(LOG_TAG, "Problem converting cert", ce);

            return null;

        }



        try (KeyChainConnection keyChainConnection = mInjector.keyChainBindAsUser(userHandle)) {

            return keyChainConnection.getService().installCaCertificate(pemCert);

        } catch (RemoteException e) {

            Slog.e(LOG_TAG, e, "installCaCertsToKeyChain(): ");

            Slog.e(LOG_TAG, "installCaCertsToKeyChain(): ", e);

        } catch (InterruptedException e1) {

            Slog.w(LOG_TAG, e1, "installCaCertsToKeyChain(): ");

            Slog.w(LOG_TAG, "installCaCertsToKeyChain(): ", e1);

            Thread.currentThread().interrupt();

        }

        return null;
@@ -100,9 +100,9 @@ public class CertificateMonitor { 
                keyChainConnection.getService().deleteCaCertificate(aliases[i]);

            }

        } catch (RemoteException e) {

            Slog.e(LOG_TAG, e, "from CaCertUninstaller: ");

            Slog.e(LOG_TAG, "from CaCertUninstaller: ", e);

        } catch (InterruptedException ie) {

            Slog.w(LOG_TAG, ie, "CaCertUninstaller: ");

            Slog.w(LOG_TAG, "CaCertUninstaller: ", ie);

            Thread.currentThread().interrupt();

        }

    }

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

+134 −160

File changed.

Preview size limit exceeded, changes collapsed.

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

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ public class RemoteBugreportManager { 
            return true;

        } catch (RemoteException re) {

            // should never happen

            Slog.e(LOG_TAG, re, "Failed to make remote calls to start bugreportremote service");

            Slog.e(LOG_TAG, "Failed to make remote calls to start bugreportremote service", re);

            return false;

        } finally {

            mInjector.binderRestoreCallingIdentity(callingIdentity);