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

Commit fd9e6e3e authored by Chan Kim's avatar Chan Kim Committed by Automerger Merge Worker
Browse files

Merge "Update language to comply with Android's inclusive language guidance"... 

Merge "Update language to comply with Android's inclusive language guidance" into main am: 0698cb8b am: fc3617d1 am: f5078ee6

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



Change-Id: I5d8200f8ee1cc6b2106e98b74045bbc173dc6299
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 162f4f23 f5078ee6

tests/PlatformCompatGating/src/com/android/compat/testing/DummyApi.java

+4 −4
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import android.os.ServiceManager; 
import com.android.internal.compat.IPlatformCompat;



/**

 * This is a dummy API to test gating

 * This is a placeholder API to test gating

 *

 * @hide

 */
@@ -36,7 +36,7 @@ public class DummyApi { 
    public static final long CHANGE_SYSTEM_SERVER = 666016;



    /**

     * Dummy method

     * Placeholder method

     * @return "A" if change is enabled, "B" otherwise.

     */

    public static String dummyFunc() {
@@ -47,7 +47,7 @@ public class DummyApi { 
    }



    /**

     * Dummy combined method

     * Placeholder combined method

     * @return "0" if {@link CHANGE_ID_1} is disabled and {@link CHANGE_ID_2} is disabled,

               "1" if {@link CHANGE_ID_1} is disabled and {@link CHANGE_ID_2} is enabled,

               "2" if {@link CHANGE_ID_1} is enabled and {@link CHANGE_ID_2} is disabled,
@@ -68,7 +68,7 @@ public class DummyApi { 
    }



    /**

     * Dummy api using system server API.

     * Placeholder api using system server API.

     */

    public static boolean dummySystemServer(Context context) {

        IPlatformCompat platformCompat = IPlatformCompat.Stub