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

Commit 658a096f authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am 40bd4ef6: am 49de87a1: am 80a3fbf4: am c9eb398a: Merge "Clear identity when... 

am 40bd4ef6: am 49de87a1: am 80a3fbf4: am c9eb398a: Merge "Clear identity when killing media provider." into mnc-dev

* commit '40bd4ef6':
  Clear identity when killing media provider.
parents 486fdeca 40bd4ef6

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

+13 −8
Original line number Diff line number Diff line
@@ -740,6 +740,8 @@ class MountService extends IMountService.Stub 
     */

    @Deprecated

    private void killMediaProvider() {

        final long token = Binder.clearCallingIdentity();

        try {

            final ProviderInfo provider = mPms.resolveContentProvider(MediaStore.AUTHORITY, 0,

                    UserHandle.USER_OWNER);

            if (provider != null) {
@@ -750,6 +752,9 @@ class MountService extends IMountService.Stub 
                } catch (RemoteException e) {

                }

            }

        } finally {

            Binder.restoreCallingIdentity(token);

        }

    }



    private void resetIfReadyAndConnectedLocked() {