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

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

Merge "Use S api in SettingsShim api 31" into sc-dev am: c7e24440 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/14493541

Change-Id: I847cca033d698b75b5f508a6d958f5e4823d5296
parents 255ae3e1 c7e24440

apishim/31/com/android/networkstack/apishim/SettingsShimImpl.java

+1 −3
Original line number Original line Diff line number Diff line
@@ -48,9 +48,7 @@ public class SettingsShimImpl 
    public boolean checkAndNoteWriteSettingsOperation(@NonNull Context context, int uid,

    public boolean checkAndNoteWriteSettingsOperation(@NonNull Context context, int uid,

            @NonNull String callingPackage, @Nullable String callingAttributionTag,

            @NonNull String callingPackage, @Nullable String callingAttributionTag,

            boolean throwException) {

            boolean throwException) {

        // Since checkAndNoteWriteSettingsOperation with callingAttributionTag (S method) is not

        // available in AOSP, calling R method (same as API 30 shim) temporary.

        return Settings.checkAndNoteWriteSettingsOperation(context, uid, callingPackage,

        return Settings.checkAndNoteWriteSettingsOperation(context, uid, callingPackage,

                throwException);

                callingAttributionTag, throwException);

    }

    }

}
 
}