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

Commit 637a8d84 authored by Kenny Root's avatar Kenny Root Committed by Android Git Automerger
Browse files

am 29423918: Fix regression in OBB key handling 

Merge commit '29423918' into gingerbread-plus-aosp

* commit '29423918':
  Fix regression in OBB key handling
parents 6a3eddb4 29423918

services/java/com/android/server/MountService.java

+14 −15
Original line number Diff line number Diff line
@@ -1599,6 +1599,8 @@ class MountService extends IMountService.Stub 
            addObbState(obbState);

        }



        String hashedKey = null;

        if (key != null) {

            final MessageDigest md;

            try {

                md = MessageDigest.getInstance("MD5");
@@ -1612,7 +1614,8 @@ class MountService extends IMountService.Stub 
                return;

            }



        String hashedKey = HexDump.toHexString(md.digest(key.getBytes()));

            hashedKey = HexDump.toHexString(md.digest(key.getBytes()));

        }



        ObbAction action = new MountObbAction(obbState, hashedKey);

        mObbActionHandler.sendMessage(mObbActionHandler.obtainMessage(OBB_RUN_ACTION, action));
@@ -1956,10 +1959,6 @@ class MountService extends IMountService.Stub 
                throw new IllegalArgumentException("Caller package does not match OBB file");

            }



            if (mKey == null) {

                mKey = "none";

            }



            boolean mounted = false;

            int rc;

            synchronized (mObbState) {