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

Commit 12d00a7e authored by Svet Ganov's avatar Svet Ganov Committed by android-build-merger
Browse files

Merge "Use proper package name and UID when checking write settings access" into nyc-dev 

am: b707db0f

* commit 'b707db0f':
  Use proper package name and UID when checking write settings access

Change-Id: I5e065198393ada578931189a60ae54a3eb535171
parents be8e7f9f b707db0f

core/java/android/provider/Settings.java

+4 −6
Original line number Original line Diff line number Diff line
@@ -1569,9 +1569,8 @@ public final class Settings { 
     * @return true if the calling app can draw on top of other apps, false otherwise.

     * @return true if the calling app can draw on top of other apps, false otherwise.

     */

     */

    public static boolean canDrawOverlays(Context context) {

    public static boolean canDrawOverlays(Context context) {

        int uid = Binder.getCallingUid();

        return Settings.isCallingPackageAllowedToDrawOverlays(context, Process.myUid(),

        return Settings.isCallingPackageAllowedToDrawOverlays(context, uid, Settings

                context.getOpPackageName(), false);

                .getPackageNameForUid(context, uid), false);

    }

    }





    /**

    /**
@@ -3885,9 +3884,8 @@ public final class Settings { 
         * @return true if the calling app can write to system settings, false otherwise

         * @return true if the calling app can write to system settings, false otherwise

         */

         */

        public static boolean canWrite(Context context) {

        public static boolean canWrite(Context context) {

            int uid = Binder.getCallingUid();

            return isCallingPackageAllowedToWriteSettings(context, Process.myUid(),

            return isCallingPackageAllowedToWriteSettings(context, uid, getPackageNameForUid(

                    context.getOpPackageName(), false);

                    context, uid), false);

        }

        }

    }

    }