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

Commit 8a0a4e6d authored by Hui Wu's avatar Hui Wu Committed by Android (Google) Code Review
Browse files

Merge "Changes the name from cloudsearch_service to cloudsearch"

parents 239a01d0 41f68c7d

core/api/system-current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -2692,7 +2692,7 @@ package android.content { 
    field public static final String BATTERY_STATS_SERVICE = "batterystats";

    field public static final String BATTERY_STATS_SERVICE = "batterystats";

    field @Deprecated public static final int BIND_ALLOW_BACKGROUND_ACTIVITY_STARTS = 1048576; // 0x100000

    field @Deprecated public static final int BIND_ALLOW_BACKGROUND_ACTIVITY_STARTS = 1048576; // 0x100000

    field public static final int BIND_ALLOW_FOREGROUND_SERVICE_STARTS_FROM_BACKGROUND = 262144; // 0x40000

    field public static final int BIND_ALLOW_FOREGROUND_SERVICE_STARTS_FROM_BACKGROUND = 262144; // 0x40000

    field public static final String CLOUDSEARCH_SERVICE = "cloudsearch_service";

    field public static final String CLOUDSEARCH_SERVICE = "cloudsearch";

    field public static final String CONTENT_SUGGESTIONS_SERVICE = "content_suggestions";

    field public static final String CONTENT_SUGGESTIONS_SERVICE = "content_suggestions";

    field public static final String CONTEXTHUB_SERVICE = "contexthub";

    field public static final String CONTEXTHUB_SERVICE = "contexthub";

    field public static final String ETHERNET_SERVICE = "ethernet";

    field public static final String ETHERNET_SERVICE = "ethernet";

core/api/system-lint-baseline.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -294,7 +294,6 @@ SamShouldBeLast: android.webkit.WebChromeClient#onShowFileChooser(android.webkit 








ServiceName: android.content.Context#CLOUDSEARCH_SERVICE:

ServiceName: android.content.Context#CLOUDSEARCH_SERVICE:

    Inconsistent service value; expected `cloudsearch`, was `cloudsearch_service` (Note: Do not change the name of already released services, which will break tools using `adb shell dumpsys`. Instead add `@SuppressLint("ServiceName"))`









UserHandleName: android.app.search.SearchAction.Builder#setUserHandle(android.os.UserHandle):

UserHandleName: android.app.search.SearchAction.Builder#setUserHandle(android.os.UserHandle):

core/java/android/content/Context.java

+1 −3
Original line number Original line Diff line number Diff line
@@ -4987,10 +4987,8 @@ public abstract class Context { 
     * @hide

     * @hide

     * @see #getSystemService(String)

     * @see #getSystemService(String)

     */

     */

    // TODO(216507592): Change cloudsearch_service to cloudsearch.

    @SystemApi

    @SystemApi

    @SuppressLint("ServiceName")

    public static final String CLOUDSEARCH_SERVICE = "cloudsearch";

    public static final String CLOUDSEARCH_SERVICE = "cloudsearch_service";





    /**

    /**

     * Use with {@link #getSystemService(String)} to access the

     * Use with {@link #getSystemService(String)} to access the