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

Commit ba074a59 authored by Christopher Tate's avatar Christopher Tate Committed by Android Git Automerger
Browse files

am 3c9376b3: am d0f19930: Merge "Make sure settings writes are permission... 

am 3c9376b3: am d0f19930: Merge "Make sure settings writes are permission checked correctly" into jb-mr1-dev

* commit '3c9376b3':
  Make sure settings writes are permission checked correctly
parents 8855d469 3c9376b3

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+45 −52
Original line number Diff line number Diff line
@@ -556,10 +556,6 @@ public class SettingsProvider extends ContentProvider { 
            }

        }



        // Okay, permission checks have cleared.  Reset to our own identity so we can

        // manipulate all users' data with impunity.

        long oldId = Binder.clearCallingIdentity();

        try {

        // Note: we assume that get/put operations for moved-to-global names have already

        // been directed to the new location on the caller side (otherwise we'd fix them

        // up here).
@@ -607,9 +603,6 @@ public class SettingsProvider extends ContentProvider { 
        } else {

            Slog.w(TAG, "call() with invalid method: " + method);

        }

        } finally {

            Binder.restoreCallingIdentity(oldId);

        }



        return null;

    }