Tianjie Xu 2fd269494a Merge changes Icf10d577,Ia9d3cae7 am: 6083210d17 am: a258be9df5 ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I12512a441b330e062fe8e8d482a367e719c7d45d

2020-12-15 00:03:48 +00:00

..

AlarmClock.java

…

AndroidDeviceConfig.java

…

BaseColumns.java

Shuffling to prepare for MediaProvider APEX.

2019-12-18 01:35:46 +00:00

BlockedNumberContract.java

Revert [Telephony mainline] Add SystemApi and NonNull annotation

2020-03-12 03:22:48 +00:00

Browser.java

Use new UnsupportedAppUsage annotation.

2020-01-13 12:39:59 +00:00

BrowserContract.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

CalendarContract.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

CallLog.java

Add missed information relative parameter and fields.

2020-11-02 18:09:01 +00:00

Contacts.java

…

ContactsContract.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

ContactsInternal.java

Use new UnsupportedAppUsage annotation.

2020-01-09 15:08:18 +00:00

DeviceConfig.java

Add namespace in DeviceConfig to support ota teams's features

2020-12-14 11:21:17 -08:00

DocumentsContract.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

DocumentsProvider.java

DO NOT MERGE - Merge RQ1A.201205.011

2020-12-07 00:39:42 -08:00

Downloads.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

FontRequest.java

…

FontsContract.java

…

LiveFolders.java

…

MetadataReader.java

…

OneTimeUseBuilder.java

…

OpenableColumns.java

…

OWNERS

Improve OWNERS coverage across frameworks/base/.

2020-12-08 08:36:28 -07:00

package.html

…

SearchIndexableData.java

…

SearchIndexableResource.java

…

SearchIndexablesContract.java

Remove the @hide annotation for the dynamic index of Settings Search.

2020-01-14 17:11:10 +08:00

SearchIndexablesProvider.java

Update language to comply with Android's inclusive language guidance

2020-09-14 10:00:02 -06:00

SearchRecentSuggestions.java

…

Settings.java

Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855

2020-12-02 00:38:58 -08:00

SettingsSlicesContract.java

…

SettingsStringUtil.java

…

SyncConstValue.java

…

SyncStateContract.java

…

Telephony.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

TEST_MAPPING

…

TimeZoneRulesDataContract.java

…

UserDictionary.java

…

VoicemailContract.java

…