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

Commit 7bb05922 authored by Arc Wang's avatar Arc Wang Committed by Automerger Merge Worker
Browse files

Merge "Remove Settings#EXTRA_SETTINGS_LARGE_SCREEN_DEEP_LINK_PENDING_INTENT"... 

Merge "Remove Settings#EXTRA_SETTINGS_LARGE_SCREEN_DEEP_LINK_PENDING_INTENT" into sc-v2-dev am: 4a00a052 am: eff2796f

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

Change-Id: Icae3e8eabcb5e111f3450d5ad948a33ce94033d8
parents 5b39a511 eff2796f

core/api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -35376,7 +35376,6 @@ package android.provider { 
    field public static final String EXTRA_INPUT_METHOD_ID = "input_method_id";

    field public static final String EXTRA_NOTIFICATION_LISTENER_COMPONENT_NAME = "android.provider.extra.NOTIFICATION_LISTENER_COMPONENT_NAME";

    field public static final String EXTRA_SETTINGS_LARGE_SCREEN_DEEP_LINK_INTENT_URI = "android.provider.extra.SETTINGS_LARGE_SCREEN_DEEP_LINK_INTENT_URI";

    field public static final String EXTRA_SETTINGS_LARGE_SCREEN_DEEP_LINK_PENDING_INTENT = "android.provider.extra.SETTINGS_LARGE_SCREEN_DEEP_LINK_PENDING_INTENT";

    field public static final String EXTRA_SETTINGS_LARGE_SCREEN_HIGHLIGHT_MENU_KEY = "android.provider.extra.SETTINGS_LARGE_SCREEN_HIGHLIGHT_MENU_KEY";

    field public static final String EXTRA_SUB_ID = "android.provider.extra.SUB_ID";

    field public static final String EXTRA_WIFI_NETWORK_LIST = "android.provider.extra.WIFI_NETWORK_LIST";

core/java/android/provider/Settings.java

+0 −13
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import android.app.Application; 
import android.app.AutomaticZenRule;

import android.app.NotificationChannel;

import android.app.NotificationManager;

import android.app.PendingIntent;

import android.app.SearchManager;

import android.app.WallpaperManager;

import android.compat.annotation.UnsupportedAppUsage;
@@ -17771,9 +17770,6 @@ public final class Settings { 
     *

     *     Input: {@link #EXTRA_SETTINGS_LARGE_SCREEN_HIGHLIGHT_MENU_KEY} must be included to

     * specify a key that indicates the menu item which will be highlighted on settings home menu.

     *

     *     Input: {@link #EXTRA_SETTINGS_LARGE_SCREEN_DEEP_LINK_PENDING_INTENT} is optional. Apps

     * can use the {@link PendingIntent} extra to launch into its private {@link Activity}.

     * <p>

     * Output: Nothing.

     */
@@ -17800,15 +17796,6 @@ public final class Settings { 
    public static final String EXTRA_SETTINGS_LARGE_SCREEN_HIGHLIGHT_MENU_KEY =

            "android.provider.extra.SETTINGS_LARGE_SCREEN_HIGHLIGHT_MENU_KEY";













    /**













     * Activity Extra: Apps can use the {@link PendingIntent} extra to launch into its private













     * {@link Activity}.













     * <p>













     * This is an optional extra field to {@link #ACTION_SETTINGS_LARGE_SCREEN_DEEP_LINK}.













     */













    public static final String EXTRA_SETTINGS_LARGE_SCREEN_DEEP_LINK_PENDING_INTENT =













            "android.provider.extra.SETTINGS_LARGE_SCREEN_DEEP_LINK_PENDING_INTENT";



























    /**















     * Performs a strict and comprehensive check of whether a calling package is allowed to















     * write/modify system settings, as the condition differs for pre-M, M+, and