Snap for 5316819 from cbb05a317b39ef314c5fb2e2a017f70c50ee68f5 to qt-release (80aebf07) · Commits · e / os / android_frameworks_base

.gitignore

+1 −0

Original line number	Diff line number	Diff line
		/.idea
		*.iml
		.sw

Android.bp

+22 −4

Original line number	Diff line number	Diff line
		@@ -209,6 +209,7 @@ java_defaults {
		"core/java/android/hardware/soundtrigger/IRecognitionStatusCallback.aidl",
		"core/java/android/hardware/usb/IUsbManager.aidl",
		"core/java/android/hardware/usb/IUsbSerialReader.aidl",
		"core/java/android/net/ICaptivePortal.aidl",
		"core/java/android/net/IConnectivityManager.aidl",
		"core/java/android/hardware/ISensorPrivacyListener.aidl",
		"core/java/android/hardware/ISensorPrivacyManager.aidl",
		@@ -772,8 +773,8 @@ java_defaults {
		"android.hardware.vibrator-V1.2-java",
		"android.hardware.vibrator-V1.3-java",
		"android.hardware.wifi-V1.0-java-constants",
		"networkstack-aidl-interfaces-java",
		"netd_aidl_interface-java",
		"networkstack-aidl-framework-java",
		"netd_aidl_parcelables-java",
		"devicepolicyprotosnano",
		],

		@@ -893,10 +894,8 @@ aidl_interface {
		srcs: [
		"core/java/android/net/ApfCapabilitiesParcelable.aidl",
		"core/java/android/net/DhcpResultsParcelable.aidl",
		"core/java/android/net/ICaptivePortal.aidl",
		"core/java/android/net/INetworkMonitor.aidl",
		"core/java/android/net/INetworkMonitorCallbacks.aidl",
		"core/java/android/net/IIpMemoryStore.aidl",
		"core/java/android/net/INetworkStackConnector.aidl",
		"core/java/android/net/INetworkStackStatusCallback.aidl",
		"core/java/android/net/InitialConfigurationParcelable.aidl",
		@@ -915,6 +914,16 @@ aidl_interface {
		"core/java/android/net/dhcp/IDhcpServerCallbacks.aidl",
		"core/java/android/net/ip/IIpClient.aidl",
		"core/java/android/net/ip/IIpClientCallbacks.aidl",
		],
		api_dir: "aidl/networkstack",
		}

		aidl_interface {
		name: "networkstack-aidl-framework",
		local_include_dir: "core/java",
		srcs: [
		"core/java/android/net/TcpKeepalivePacketDataParcelable.aidl",
		"core/java/android/net/IIpMemoryStore.aidl",
		"core/java/android/net/ipmemorystore/*/.aidl",
		],
		api_dir: "aidl/networkstack",
		@@ -1187,6 +1196,15 @@ packages_to_document = [
		"org/apache/http/params",
		]

		// Make the api/current.txt file available for use by modules in other
		// directories.
		filegroup {
		name: "frameworks-base-api-current.txt",
		srcs: [
		"api/current.txt",
		],
		}

		framework_docs_only_args = " -android -manifest $(location core/res/AndroidManifest.xml) " +
		"-werror -lerror -hide 111 -hide 113 -hide 125 -hide 126 -hide 127 -hide 128 " +
		"-overview $(location core/java/overview.html) " +

Android.mk

+0 −2

Original line number	Diff line number	Diff line
		@@ -77,8 +77,6 @@ docs offline-sdk-docs: $(OUT_DOCS)/offline-sdk-timestamp

		# Run this for checkbuild
		checkbuild: doc-comment-check-docs
		# Check comment when you are updating the API
		update-api: doc-comment-check-docs

		# ==== hiddenapi lists =======================================
		ifneq ($(UNSAFE_DISABLE_HIDDENAPI_FLAGS),true)

api/current.txt

+65 −11

Original line number	Diff line number	Diff line
		@@ -2222,6 +2222,7 @@ package android {
		field public static final int TextAppearance_WindowTitle = 16973907; // 0x1030053
		field public static final int Theme = 16973829; // 0x1030005
		field public static final int ThemeOverlay = 16974407; // 0x1030247
		field public static final int ThemeOverlay_DeviceDefault_Accent_DayNight = 16974564; // 0x10302e4
		field public static final int ThemeOverlay_Material = 16974408; // 0x1030248
		field public static final int ThemeOverlay_Material_ActionBar = 16974409; // 0x1030249
		field public static final int ThemeOverlay_Material_Dark = 16974411; // 0x103024b
		@@ -2233,6 +2234,7 @@ package android {
		field public static final int Theme_Black_NoTitleBar = 16973833; // 0x1030009
		field public static final int Theme_Black_NoTitleBar_Fullscreen = 16973834; // 0x103000a
		field public static final int Theme_DeviceDefault = 16974120; // 0x1030128
		field public static final int Theme_DeviceDefault_DayNight = 16974563; // 0x10302e3
		field public static final int Theme_DeviceDefault_Dialog = 16974126; // 0x103012e
		field public static final int Theme_DeviceDefault_DialogWhenLarge = 16974134; // 0x1030136
		field public static final int Theme_DeviceDefault_DialogWhenLarge_NoActionBar = 16974135; // 0x1030137
		@@ -13064,6 +13066,10 @@ package android.database.sqlite {
		method public String buildUnionSubQuery(String, String[], java.util.Set<java.lang.String>, int, String, String, String, String);
		method @Deprecated public String buildUnionSubQuery(String, String[], java.util.Set<java.lang.String>, int, String, String, String[], String, String);
		method public int delete(@NonNull android.database.sqlite.SQLiteDatabase, @Nullable String, @Nullable String[]);
		method public android.database.sqlite.SQLiteDatabase.CursorFactory getCursorFactory();
		method public boolean getDistinct();
		method public java.util.Map<java.lang.String,java.lang.String> getProjectionMap();
		method public boolean getStrict();
		method public String getTables();
		method public android.database.Cursor query(android.database.sqlite.SQLiteDatabase, String[], String, String[], String, String, String);
		method public android.database.Cursor query(android.database.sqlite.SQLiteDatabase, String[], String, String[], String, String, String, String);
		@@ -14096,6 +14102,34 @@ package android.graphics {
		ctor @Deprecated public EmbossMaskFilter(float[], float, float, float);
		}

		public class HardwareRenderer {
		ctor public HardwareRenderer();
		method public void clearContent();
		method public android.graphics.HardwareRenderer.FrameRenderRequest createRenderRequest();
		method public void destroy();
		method public boolean isOpaque();
		method public void notifyFramePending();
		method public void setContentRoot(@Nullable android.graphics.RenderNode);
		method public void setLightSourceAlpha(@FloatRange(from=0.0f, to=1.0f) float, @FloatRange(from=0.0f, to=1.0f) float);
		method public void setLightSourceGeometry(float, float, float, float);
		method public void setName(String);
		method public void setOpaque(boolean);
		method public void setStopped(boolean);
		method public void setSurface(@Nullable android.view.Surface);
		field public static final int SYNC_CONTEXT_IS_STOPPED = 4; // 0x4
		field public static final int SYNC_FRAME_DROPPED = 8; // 0x8
		field public static final int SYNC_LOST_SURFACE_REWARD_IF_FOUND = 2; // 0x2
		field public static final int SYNC_OK = 0; // 0x0
		field public static final int SYNC_REDRAW_REQUESTED = 1; // 0x1
		}

		public final class HardwareRenderer.FrameRenderRequest {
		method public android.graphics.HardwareRenderer.FrameRenderRequest setFrameCommitCallback(@NonNull java.util.concurrent.Executor, @NonNull Runnable);
		method public android.graphics.HardwareRenderer.FrameRenderRequest setVsyncTime(long);
		method public android.graphics.HardwareRenderer.FrameRenderRequest setWaitForPresent(boolean);
		method public int syncAndDraw();
		}

		public final class ImageDecoder implements java.lang.AutoCloseable {
		method public void close();
		method @AnyThread @NonNull public static android.graphics.ImageDecoder.Source createSource(@NonNull android.content.res.Resources, int);
		@@ -23380,7 +23414,7 @@ package android.media {
		method @NonNull public android.media.AudioPresentation.Builder setProgramId(int);
		}

		public class AudioRecord implements android.media.AudioRecordingMonitor android.media.AudioRouting {
		public class AudioRecord implements android.media.AudioRecordingMonitor android.media.AudioRouting android.media.MicrophoneDirection {
		ctor public AudioRecord(int, int, int, int, int) throws java.lang.IllegalArgumentException;
		method public void addOnRoutingChangedListener(android.media.AudioRouting.OnRoutingChangedListener, android.os.Handler);
		method @Deprecated public void addOnRoutingChangedListener(android.media.AudioRecord.OnRoutingChangedListener, android.os.Handler);
		@@ -23415,6 +23449,8 @@ package android.media {
		method public void release();
		method public void removeOnRoutingChangedListener(android.media.AudioRouting.OnRoutingChangedListener);
		method @Deprecated public void removeOnRoutingChangedListener(android.media.AudioRecord.OnRoutingChangedListener);
		method public boolean setMicrophoneDirection(int);
		method public boolean setMicrophoneFieldDimension(@FloatRange(from=-1.0, to=1.0) float);
		method public int setNotificationMarkerPosition(int);
		method public int setPositionNotificationPeriod(int);
		method public boolean setPreferredDevice(android.media.AudioDeviceInfo);
		@@ -26064,6 +26100,15 @@ package android.media {
		field public static final android.media.MediaTimestamp TIMESTAMP_UNKNOWN;
		}

		public interface MicrophoneDirection {
		method public boolean setMicrophoneDirection(int);
		method public boolean setMicrophoneFieldDimension(@FloatRange(from=-1.0, to=1.0) float);
		field public static final int MIC_DIRECTION_BACK = 2; // 0x2
		field public static final int MIC_DIRECTION_EXTERNAL = 3; // 0x3
		field public static final int MIC_DIRECTION_FRONT = 1; // 0x1
		field public static final int MIC_DIRECTION_UNSPECIFIED = 0; // 0x0
		}

		public final class MicrophoneInfo {
		method @NonNull public String getAddress();
		method public java.util.List<android.util.Pair<java.lang.Integer,java.lang.Integer>> getChannelMapping();
		@@ -27445,6 +27490,7 @@ package android.media.session {
		method public void seekTo(long);
		method public void sendCustomAction(@NonNull android.media.session.PlaybackState.CustomAction, @Nullable android.os.Bundle);
		method public void sendCustomAction(@NonNull String, @Nullable android.os.Bundle);
		method public void setPlaybackSpeed(float);
		method public void setRating(android.media.Rating);
		method public void skipToNext();
		method public void skipToPrevious();
		@@ -27495,6 +27541,7 @@ package android.media.session {
		method public void onPrepareFromUri(android.net.Uri, android.os.Bundle);
		method public void onRewind();
		method public void onSeekTo(long);
		method public void onSetPlaybackSpeed(float);
		method public void onSetRating(@NonNull android.media.Rating);
		method public void onSkipToNext();
		method public void onSkipToPrevious();
		@@ -35050,7 +35097,7 @@ package android.os {
		method public android.os.PowerManager.WakeLock newWakeLock(int, String);
		method public void reboot(String);
		method public void registerThermalStatusCallback(@NonNull android.os.PowerManager.ThermalStatusCallback, @NonNull java.util.concurrent.Executor);
		method public void unregisterThermalStatusCallback(android.os.PowerManager.ThermalStatusCallback);
		method public void unregisterThermalStatusCallback(@NonNull android.os.PowerManager.ThermalStatusCallback);
		field public static final int ACQUIRE_CAUSES_WAKEUP = 268435456; // 0x10000000
		field public static final String ACTION_DEVICE_IDLE_MODE_CHANGED = "android.os.action.DEVICE_IDLE_MODE_CHANGED";
		field public static final String ACTION_POWER_SAVE_MODE_CHANGED = "android.os.action.POWER_SAVE_MODE_CHANGED";
		@@ -41558,6 +41605,7 @@ package android.service.notification {
		field public static final android.os.Parcelable.Creator<android.service.notification.Adjustment> CREATOR;
		field public static final String KEY_CONTEXTUAL_ACTIONS = "key_contextual_actions";
		field public static final String KEY_IMPORTANCE = "key_importance";
		field public static final String KEY_SNOOZE_CRITERIA = "key_snooze_criteria";
		field public static final String KEY_TEXT_REPLIES = "key_text_replies";
		field public static final String KEY_USER_SENTIMENT = "key_user_sentiment";
		}
		@@ -41615,12 +41663,14 @@ package android.service.notification {
		method public void onActionInvoked(@NonNull String, @NonNull android.app.Notification.Action, int);
		method public final android.os.IBinder onBind(android.content.Intent);
		method public void onNotificationDirectReplied(@NonNull String);
		method public android.service.notification.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification);
		method public abstract android.service.notification.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification);
		method public android.service.notification.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification, android.app.NotificationChannel);
		method public void onNotificationExpansionChanged(@NonNull String, boolean, boolean);
		method public void onNotificationRemoved(android.service.notification.StatusBarNotification, android.service.notification.NotificationListenerService.RankingMap, android.service.notification.NotificationStats, int);
		method public abstract void onNotificationSnoozedUntilContext(android.service.notification.StatusBarNotification, String);
		method public void onNotificationsSeen(java.util.List<java.lang.String>);
		method public void onSuggestedReplySent(@NonNull String, @NonNull CharSequence, int);
		method public final void unsnoozeNotification(String);
		field public static final String SERVICE_INTERFACE = "android.service.notification.NotificationAssistantService";
		field public static final int SOURCE_FROM_APP = 0; // 0x0
		field public static final int SOURCE_FROM_ASSISTANT = 1; // 0x1
		@@ -41953,7 +42003,6 @@ package android.service.voice {

		public class VoiceInteractionService extends android.app.Service {
		ctor public VoiceInteractionService();
		method public final void clearTranscription(boolean);
		method public final android.service.voice.AlwaysOnHotwordDetector createAlwaysOnHotwordDetector(String, java.util.Locale, android.service.voice.AlwaysOnHotwordDetector.Callback);
		method public int getDisabledShowContext();
		method public static boolean isActiveService(android.content.Context, android.content.ComponentName);
		@@ -41963,8 +42012,7 @@ package android.service.voice {
		method public void onReady();
		method public void onShutdown();
		method public void setDisabledShowContext(int);
		method public final void setTranscription(@NonNull String);
		method public final void setVoiceState(int);
		method public final void setUiHints(@NonNull android.os.Bundle);
		method public void showSession(android.os.Bundle, int);
		field public static final String SERVICE_INTERFACE = "android.service.voice.VoiceInteractionService";
		field public static final String SERVICE_META_DATA = "android.voice_interaction";
		@@ -45070,12 +45118,12 @@ package android.telephony {
		method public boolean canChangeDtmfToneLength();
		method @Nullable public android.telephony.TelephonyManager createForPhoneAccountHandle(android.telecom.PhoneAccountHandle);
		method public android.telephony.TelephonyManager createForSubscriptionId(int);
		method @RequiresPermission(android.Manifest.permission.ACCESS_COARSE_LOCATION) public java.util.List<android.telephony.CellInfo> getAllCellInfo();
		method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public java.util.List<android.telephony.CellInfo> getAllCellInfo();
		method public int getCallState();
		method public int getCardIdForDefaultEuicc();
		method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) @WorkerThread public android.os.PersistableBundle getCarrierConfig();
		method public int getCarrierIdFromSimMccMnc();
		method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public android.telephony.CellLocation getCellLocation();
		method @Deprecated @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public android.telephony.CellLocation getCellLocation();
		method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) @Nullable public java.util.Map<java.lang.Integer,java.util.List<android.telephony.emergency.EmergencyNumber>> getCurrentEmergencyNumberList();
		method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) @Nullable public java.util.Map<java.lang.Integer,java.util.List<android.telephony.emergency.EmergencyNumber>> getCurrentEmergencyNumberList(int);
		method public int getDataActivity();
		@@ -45105,7 +45153,7 @@ package android.telephony {
		method public int getPhoneCount();
		method public int getPhoneType();
		method @RequiresPermission(anyOf={"android.permission.READ_PRIVILEGED_PHONE_STATE", android.Manifest.permission.READ_PHONE_STATE}) public int getPreferredOpportunisticDataSubscription();
		method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public android.telephony.ServiceState getServiceState();
		method @RequiresPermission(allOf={android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.ACCESS_COARSE_LOCATION}) public android.telephony.ServiceState getServiceState();
		method @Nullable public android.telephony.SignalStrength getSignalStrength();
		method public int getSimCarrierId();
		method @Nullable public CharSequence getSimCarrierIdName();
		@@ -45147,8 +45195,8 @@ package android.telephony {
		method public boolean isVoicemailVibrationEnabled(android.telecom.PhoneAccountHandle);
		method public boolean isWorldPhone();
		method public void listen(android.telephony.PhoneStateListener, int);
		method @RequiresPermission(android.Manifest.permission.ACCESS_COARSE_LOCATION) public void requestCellInfoUpdate(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyManager.CellInfoCallback);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public android.telephony.NetworkScan requestNetworkScan(android.telephony.NetworkScanRequest, java.util.concurrent.Executor, android.telephony.TelephonyScanManager.NetworkScanCallback);
		method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void requestCellInfoUpdate(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyManager.CellInfoCallback);
		method @RequiresPermission(allOf={android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION}) public android.telephony.NetworkScan requestNetworkScan(android.telephony.NetworkScanRequest, java.util.concurrent.Executor, android.telephony.TelephonyScanManager.NetworkScanCallback);
		method public void sendDialerSpecialCode(String);
		method public String sendEnvelopeWithStatus(String);
		method @RequiresPermission(android.Manifest.permission.CALL_PHONE) public void sendUssdRequest(String, android.telephony.TelephonyManager.UssdResponseCallback, android.os.Handler);
		@@ -48999,6 +49047,7 @@ package android.util {
		}

		public final class StatsLog {
		method @RequiresPermission(allOf={android.Manifest.permission.DUMP, android.Manifest.permission.PACKAGE_USAGE_STATS}) public static boolean logBinaryPushStateChanged(@NonNull String, long, int, int, @NonNull long[]);
		method public static boolean logEvent(int);
		method public static boolean logStart(int);
		method public static boolean logStop(int);
		@@ -49218,6 +49267,7 @@ package android.view {
		ctor public ContextThemeWrapper(android.content.Context, android.content.res.Resources.Theme);
		method public void applyOverrideConfiguration(android.content.res.Configuration);
		method protected void onApplyThemeResource(android.content.res.Resources.Theme, int, boolean);
		method public void setTheme(@Nullable android.content.res.Resources.Theme);
		}

		public final class Display {
		@@ -53473,6 +53523,7 @@ package android.view.contentcapture {
		method public void close();
		method @NonNull public final android.view.contentcapture.ContentCaptureSession createContentCaptureSession(@NonNull android.view.contentcapture.ContentCaptureContext);
		method public final void destroy();
		method @Nullable public final android.view.contentcapture.ContentCaptureContext getContentCaptureContext();
		method public final android.view.contentcapture.ContentCaptureSessionId getContentCaptureSessionId();
		method @NonNull public android.view.autofill.AutofillId newAutofillId(@NonNull android.view.autofill.AutofillId, long);
		method @NonNull public final android.view.ViewStructure newVirtualViewStructure(@NonNull android.view.autofill.AutofillId, long);
		@@ -53480,6 +53531,7 @@ package android.view.contentcapture {
		method public final void notifyViewDisappeared(@NonNull android.view.autofill.AutofillId);
		method public final void notifyViewTextChanged(@NonNull android.view.autofill.AutofillId, @Nullable CharSequence);
		method public final void notifyViewsDisappeared(@NonNull android.view.autofill.AutofillId, @NonNull long[]);
		method public final void setContentCaptureContext(@Nullable android.view.contentcapture.ContentCaptureContext);
		}

		public final class ContentCaptureSessionId implements android.os.Parcelable {
		@@ -55740,6 +55792,7 @@ package android.widget {
		method public int getDropDownVerticalOffset();
		method public int getDropDownWidth();
		method protected android.widget.Filter getFilter();
		method public int getInputMethodMode();
		method @Deprecated public android.widget.AdapterView.OnItemClickListener getItemClickListener();
		method @Deprecated public android.widget.AdapterView.OnItemSelectedListener getItemSelectedListener();
		method public int getListSelection();
		@@ -55764,6 +55817,7 @@ package android.widget {
		method public void setDropDownHorizontalOffset(int);
		method public void setDropDownVerticalOffset(int);
		method public void setDropDownWidth(int);
		method public void setInputMethodMode(int);
		method public void setListSelection(int);
		method public void setOnDismissListener(android.widget.AutoCompleteTextView.OnDismissListener);
		method public void setOnItemClickListener(android.widget.AdapterView.OnItemClickListener);

api/removed.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -558,7 +558,7 @@ package android.telephony {

		public class TelephonyManager {
		method @Deprecated @RequiresPermission(android.Manifest.permission.ACCESS_COARSE_LOCATION) public java.util.List<android.telephony.NeighboringCellInfo> getNeighboringCellInfo();
		method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public android.telephony.NetworkScan requestNetworkScan(android.telephony.NetworkScanRequest, android.telephony.TelephonyScanManager.NetworkScanCallback);
		method @Deprecated @RequiresPermission(allOf={android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION}) public android.telephony.NetworkScan requestNetworkScan(android.telephony.NetworkScanRequest, android.telephony.TelephonyScanManager.NetworkScanCallback);
		}

		}