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

Commit b706f2d2 authored by Rubin Xu's avatar Rubin Xu Committed by Android (Google) Code Review
Browse files

Merge changes I0c629c13,I376a8652 into main 

* changes:
  Check DPC package validity during package updates
  Revert "Check DPC package validity during package updates"
parents 0182b5cf 529153ed

core/java/android/app/admin/DeviceAdminInfo.java

+2 −0
Original line number Diff line number Diff line
@@ -409,6 +409,8 @@ public final class DeviceAdminInfo implements Parcelable { 
        } catch (NameNotFoundException e) {

            throw new XmlPullParserException(

                    "Unable to create context for: " + mActivityInfo.packageName);

        } catch (OutOfMemoryError e) {

            throw new XmlPullParserException("Out of memory when parsing", null, e);

        } finally {

            if (parser != null) parser.close();

        }