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

Commit c9eb398a authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Clear identity when killing media provider." into mnc-dev

parents d3f327be b3cf9533

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() {