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

Commit cc088120 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Check for permission on every @Override method." into sc-dev am: f680d8a4 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14934059

Change-Id: I46a91abaf189f38ece1c98d80f23037a84358548
parents 70cd6c4b f680d8a4

services/core/java/com/android/server/compat/PlatformCompat.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -91,15 +91,17 @@ public class PlatformCompat extends IPlatformCompat.Stub { 




    @Override

    @Override

    public void reportChange(long changeId, ApplicationInfo appInfo) {

    public void reportChange(long changeId, ApplicationInfo appInfo) {

        reportChangeByUid(changeId, appInfo.uid);

        checkCompatChangeLogPermission();

        reportChangeInternal(changeId, appInfo.uid, ChangeReporter.STATE_LOGGED);

    }

    }





    @Override

    @Override

    public void reportChangeByPackageName(long changeId, String packageName,

    public void reportChangeByPackageName(long changeId, String packageName,

            @UserIdInt int userId) {

            @UserIdInt int userId) {

        checkCompatChangeLogPermission();

        ApplicationInfo appInfo = getApplicationInfo(packageName, userId);

        ApplicationInfo appInfo = getApplicationInfo(packageName, userId);

        if (appInfo != null) {

        if (appInfo != null) {

            reportChangeByUid(changeId, appInfo.uid);

            reportChangeInternal(changeId, appInfo.uid, ChangeReporter.STATE_LOGGED);

        }

        }

    }

    }