Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
c77b02028e145fe82d982d554b95a9d1f99eccae
frameworks_base/core/java/android
History
yuanjiahsu 8eb9d4711b resolve merge conflicts of 2cb9a70cac to master 
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic1db72d57f3003bcec0fd8f7fbb2dc4ec7b5dcf3
2018-09-17 23:46:14 +08:00
..
accessibilityservice
Merge "Spoken feedback when a11y shortcut dialog is shown"
2018-09-17 08:37:11 +00:00
accounts
Obfuscate account name in account manager logs and dumpsys.
2018-09-10 17:28:04 -07:00
animation
Merge "Add @UnsupportedAppUsage annotations" am: 058b566f90
2018-08-03 04:29:45 -07:00
annotation
Merge "Add <p> to UnsupportedAppUsage javadoc."
2018-08-28 15:30:29 +00:00
app
Merge "Annotate Window.Callback menu methods with nullability"
2018-09-14 15:52:56 +00:00
appwidget
Merge "Framework: Remove a nonsensical substring(0)" am: 98627fa455
2018-09-11 10:34:11 -07:00
bluetooth
Move some members to the "Q blacklist".
2018-09-14 13:18:34 +01:00
companion
Add @UnsupportedAppUsage annotations
2018-08-09 15:35:32 +01:00
content
Merge "Keep app in high memory adjust if moving from TOP to FGS"
2018-09-15 04:38:29 +00:00
database
Merge "Mark deprecated APIs, support column greylisting."
2018-09-14 18:38:15 +00:00
ddm
Add @UnsupportedAppUsage annotations
2018-08-01 15:35:51 +01:00
debug
…
gesture
…
hardware
Merge "Revert "Adding getModelState API to sound trigger""
2018-09-14 16:21:17 +00:00
inputmethodservice
Move some members to the "Q blacklist".
2018-09-14 13:18:34 +01:00
metrics
…
net
Merge "Move some members to the "Q blacklist"."
2018-09-14 13:54:28 +00:00
nfc
Move some members to the "Q blacklist".
2018-09-14 13:18:34 +01:00
os
Merge "Move some members to the "Q blacklist"."
2018-09-14 13:54:28 +00:00
permissionpresenterservice
Add @UnsupportedAppUsage annotations
2018-08-09 18:03:24 +01:00
preference
Move some members to the "Q blacklist".
2018-09-14 13:18:34 +01:00
print
Merge "Add @UnsupportedAppUsage annotations"
2018-08-01 15:58:23 -07:00
printservice
…
privacy
…
provider
resolve merge conflicts of 2cb9a70cac to master
2018-09-17 23:46:14 +08:00
se/omapi
…
security
Add @UnsupportedAppUsage annotations
2018-08-16 18:49:37 +01:00
service
Merge "Clarified that some autofill interfaces can only be implemented by the system."
2018-09-14 17:04:16 +00:00
speech
Merge "Add @UnsupportedAppUsage annotations" am: 14dea1f70c
2018-08-09 07:15:52 -07:00
text
Move some members to the "Q blacklist".
2018-09-14 13:18:34 +01:00
transition
Fix IntDef's usages in the platform Transitions
2018-09-07 16:54:45 +00:00
util
resolve merge conflicts of 2cb9a70cac to master
2018-09-17 23:46:14 +08:00
view
Merge "Extract constructLocaleFromString()"
2018-09-15 16:58:05 +00:00
webkit
Merge "WebView: fix SafeBrowsingResponse javadoc bug" into pi-dev am: 62348dad3e
2018-09-13 15:52:31 -07:00
widget
Merge "Move some members to the "Q blacklist"."
2018-09-14 13:54:28 +00:00
package.html
…