CY Cheng 0f7856add6 resolve merge conflicts of e58c780571 to stage-aosp-master ...

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I6d2feec990c23fb3536fc6b3e19c0b2696b81441
Merged-In: I9c920e31433c0ac23165f917d8dd2befaaa4938d
Merged-In: I8e6bb72ce7b8cecdb6bd01150b53f61f1515dbb1
Merged-In: Ic08cabc63daebc4001c8eda751857d11cb0e6352

2018-08-16 10:43:49 +00:00

..

AlarmClock.java

Change selection strategy for ACTION_DISMISS_TIMER

2018-01-08 16:38:35 -08:00

BaseColumns.java

…

BlockedNumberContract.java

Add exception catching for BlockedNumberContract methods used by Telecom.

2018-03-27 15:20:09 +00:00

Browser.java

Add @UnsupportedAppUsage annotations

2018-08-10 09:37:35 +01:00

BrowserContract.java

Add @UnsupportedAppUsage annotations

2018-08-10 09:37:35 +01:00

CalendarContract.java

Add @UnsupportedAppUsage annotations

2018-08-10 09:37:35 +01:00

CallLog.java

Add @UnsupportedAppUsage annotations

2018-08-10 09:37:35 +01:00

Contacts.java

…

ContactsContract.java

Add @UnsupportedAppUsage annotations

2018-08-10 09:37:35 +01:00

ContactsInternal.java

Add @UnsupportedAppUsage annotations

2018-08-10 09:37:35 +01:00

DocumentsContract.java

Add @UnsupportedAppUsage annotations

2018-08-10 09:37:35 +01:00

DocumentsProvider.java

Add metadata support to MTP docs provider.

2017-08-02 09:45:26 -07:00

Downloads.java

Add @UnsupportedAppUsage annotations

2018-08-10 09:37:35 +01:00

FontRequest.java

…

FontsContract.java

Add more IntDef prefixes for auto-documenting.

2017-12-13 20:05:36 -07:00

LiveFolders.java

…

MediaStore.java

Add @UnsupportedAppUsage annotations

2018-08-10 09:37:35 +01:00

MetadataReader.java

Add backend ISO and Focal Length support to Metadata Reader

2017-08-02 15:27:47 -07:00

OneTimeUseBuilder.java

…

OpenableColumns.java

…

package.html

…

SearchIndexableData.java

Update javadoc on SearchIndexableData

2017-11-15 17:07:19 -08:00

SearchIndexableResource.java

…

SearchIndexablesContract.java

Extend SearchIndexablesProvider to support query sitemap.

2017-11-28 09:59:16 -08:00

SearchIndexablesProvider.java

Extend SearchIndexablesProvider to support query sitemap.

2017-11-28 09:59:16 -08:00

SearchRecentSuggestions.java

…

Settings.java

resolve merge conflicts of e58c780571 to stage-aosp-master

2018-08-16 10:43:49 +00:00

SettingsSlicesContract.java

Fix javadoc in SettingsSliceContract

2018-02-16 09:28:34 -08:00

SettingsStringUtil.java

…

SettingsValidators.java

Allow restore of settings with nullable components

2018-05-22 11:11:58 +01:00

SyncConstValue.java

…

SyncStateContract.java

…

TimeZoneRulesDataContract.java

Add TimeZoneRulesDataContract to system API

2017-11-07 01:12:28 +00:00

UserDictionary.java

…

VoicemailContract.java

Allow carrier-privileged apps to access voicemail provider.

2018-03-09 20:32:21 +00:00