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

Commit c961014e authored by markchien's avatar markchien Committed by Mark Chien
Browse files

Use S api in SettingsShim api 31 

This is the follow up change of aosp/1700808. In that change, it still
use R api in shim 30 because S api is not available in AOSP at the
moment.

Bug: 182211575
Test: install S module to R device and both run mts tests build with S
and R.

Ignore-AOSP-First: aosp don't have S api
Change-Id: Iaa5d8d0c5de439da139cae954196f0378e88c372
parent a30388b8

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

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

            @NonNull String callingPackage, @Nullable String callingAttributionTag,

            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,

                throwException);

                callingAttributionTag, throwException);

    }

}