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

Commit e02785ee authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Migrate CALLBACK_ON_CLEAR_CHANGE" am: 6f7c5e09 am: 62d7bd95 am:... 

Merge "Migrate CALLBACK_ON_CLEAR_CHANGE" am: 6f7c5e09 am: 62d7bd95 am: f669aaa6 am: 4c7226a1

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

Change-Id: I1e9e845e11dcfd764739dd7f6aa1211155326545
parents be18b92c 4c7226a1

core/java/android/app/SharedPreferencesImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package android.app; 
import android.annotation.Nullable;

import android.compat.Compatibility;

import android.compat.annotation.ChangeId;

import android.compat.annotation.EnabledAfter;

import android.compat.annotation.EnabledSince;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.SharedPreferences;

import android.os.Build;
@@ -71,7 +71,7 @@ final class SharedPreferencesImpl implements SharedPreferences { 
     * {@link android.content.SharedPreferences.Editor#clear Editor.clear}.

     */

    @ChangeId

    @EnabledAfter(targetSdkVersion = Build.VERSION_CODES.Q)

    @EnabledSince(targetSdkVersion = Build.VERSION_CODES.R)

    private static final long CALLBACK_ON_CLEAR_CHANGE = 119147584L;



    // Lock ordering rules: