drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
314,543 Commits 1 Branch 0 Tags
Commit Graph

314543 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoffrey Pitsch
aa8dcf3751 Merge "Ensure removeForegroundService checks both lists under lock" into oc-dev 
am: c4ca1b5677

Change-Id: I81a50649ba59d28fdfc9a7b8381bcaf346555a3a
 2017-04-13 20:10:13 +00:00
Jack He
97164fe986 Merge "Add developer setting and system API for inband ringing support" into oc-dev 
am: aadf525e1a

Change-Id: I458b5df924ca65edc4b38ee1e275b6b6f86310fe
 2017-04-13 20:07:44 +00:00
Todd Kennedy
0bb486bcb4 Merge "Filter instant app content providers" into oc-dev 
am: 3891674204

Change-Id: I4e33d8e82a249249dfe25964cbfdb89b2f1e0318
 2017-04-13 19:59:28 +00:00
TreeHugger Robot
c4ca1b5677 Merge "Ensure removeForegroundService checks both lists under lock" into oc-dev 2017-04-13 19:50:00 +00:00
Jason Monk
4520cb7ad9 Merge "Update mobile data icon" into oc-dev 
am: 99856429db

Change-Id: I1cb5f4e16f3832ff304894fac43eced6decd020d
 2017-04-13 19:46:47 +00:00
Chris Tate
636915a2ed Merge "Introduce PACKAGE_FIRST_ADDED broadcast" into oc-dev 
am: 117ac766a9

Change-Id: I9bec0f90873a5bcb9ff89eadcf7e334e9f0afb89
 2017-04-13 19:45:30 +00:00
Jack He
aadf525e1a Merge "Add developer setting and system API for inband ringing support" into oc-dev 2017-04-13 19:43:54 +00:00
TreeHugger Robot
3891674204 Merge "Filter instant app content providers" into oc-dev 2017-04-13 19:43:31 +00:00
Seigo Nonaka
17452ee553 Merge "Introduce setFallbackTypeface" into oc-dev 
am: 729a515e5e

Change-Id: I3e88a1d51b8a8be7f932964917218a28ae23c5c9
 2017-04-13 19:38:09 +00:00
TreeHugger Robot
99856429db Merge "Update mobile data icon" into oc-dev 2017-04-13 19:37:36 +00:00
Yu Liu
5303f33bdc Merge "Fix some issues came up from the reviews of the newly added APIs Test: Existing unit tests still pass. BUG: 36554361 Change-Id: I6c2dab2e0df7f8578f92c70907f45aa69909892c" into oc-dev 
am: e425b366ba

Change-Id: I371260b7a82bbda02f978c2396385c96fd03ec66
 2017-04-13 19:34:48 +00:00
Chris Tate
117ac766a9 Merge "Introduce PACKAGE_FIRST_ADDED broadcast" into oc-dev 2017-04-13 19:24:13 +00:00
TreeHugger Robot
729a515e5e Merge "Introduce setFallbackTypeface" into oc-dev 2017-04-13 19:21:25 +00:00
Yu Liu
e425b366ba Merge "Fix some issues came up from the reviews of the newly added APIs Test: Existing unit tests still pass. BUG: 36554361 Change-Id: I6c2dab2e0df7f8578f92c70907f45aa69909892c" into oc-dev 2017-04-13 19:21:03 +00:00
Daniel Sandler
dc4fd3c847 Merge "Quick fix to lockscreen text color." into oc-dev 
am: f06c2a01a5

Change-Id: If3ec3b915bb2defe9999b323bf7f7ce2c55ff7be
 2017-04-13 19:16:13 +00:00
Daniel Sandler
f06c2a01a5 Merge "Quick fix to lockscreen text color." into oc-dev 2017-04-13 19:06:28 +00:00
Dan Sandler
0c9b9ae557 Quick fix to lockscreen text color. 
Bug: 37299706
Test: visual
Change-Id: Ide48186f0f1cb4a50c77b45ae8b80a79781d7b0d
 2017-04-13 14:50:30 -04:00
Daniel Nishi
57fb5872d1 Merge changes from topic 'cp-movies' into oc-dev 
am: ff97ea2eef

Change-Id: Ife4f6fb260439003a46e6510af41f8bb6c542cb7
 2017-04-13 18:44:53 +00:00
Daniel Nishi
ff97ea2eef Merge changes from topic 'cp-movies' into oc-dev 
* changes:
  Use the real filters when determining Other Apps.
  Add support for movies & tv apps querying.
 2017-04-13 18:39:57 +00:00
Roozbeh Pournader
18fcf3f0d7 Merge "Switch i18n listeners to use IME hint locales" into oc-dev 
am: da97b66f41

Change-Id: I9db037d0566c35c12aaed5e3f509498ca498b34f
 2017-04-13 18:33:57 +00:00
Chris Wren
a881fc2e2c Merge "don't interpret milliseconds as nanoseconds" into oc-dev 
am: de12503268

Change-Id: I51eb680e3e966577e30647b6529e900894da60c4
 2017-04-13 18:31:49 +00:00
Steve McKay
0b28e794de Merge "Remove support for auto-paging of cursors." into oc-dev 
am: 7f0d8c8076

Change-Id: Ice100c419ce6d53721d6bbec1147bb1cc1bb7b4d
 2017-04-13 18:26:43 +00:00
TreeHugger Robot
da97b66f41 Merge "Switch i18n listeners to use IME hint locales" into oc-dev 2017-04-13 18:23:05 +00:00
Daichi Hirono
8bf30a7826 Merge "Address API review for ProxyFileDescriptorCallback" into oc-dev 
am: 73b54bfd6d

Change-Id: I5969b9ec58b1d9d9baf3f9a9e4bd87678416e469
 2017-04-13 18:21:18 +00:00
TreeHugger Robot
de12503268 Merge "don't interpret milliseconds as nanoseconds" into oc-dev 2017-04-13 18:18:26 +00:00
TreeHugger Robot
7f0d8c8076 Merge "Remove support for auto-paging of cursors." into oc-dev 2017-04-13 18:12:14 +00:00
TreeHugger Robot
73b54bfd6d Merge "Address API review for ProxyFileDescriptorCallback" into oc-dev 2017-04-13 18:11:48 +00:00
Andrew Solovay
7cfe7cf19b Merge "doc: Add note to Context.bindService()" into oc-dev 
am: 2c63aa3be7

Change-Id: I35b4a37abc8573340811a0ca5f9fd479ae5f20e3
 2017-04-13 17:57:51 +00:00
Andrew Solovay
2c63aa3be7 Merge "doc: Add note to Context.bindService()" into oc-dev 2017-04-13 17:46:16 +00:00
Geoffrey Pitsch
87237d70a5 Ensure removeForegroundService checks both lists under lock 
Prior CL didn't lock properly and would still fail if a
notification was both enqueued and posted at the same time.

Test: runtest systemui-notification
Change-Id: I1bdd779ecb872f1a02ffc38b6007239eb522b521
Fixes: 36550043
 2017-04-13 13:44:09 -04:00
Dave Friedman
0e6b584116 Merge "Docs: Fixes broken link in Javadoc. am: df0fd34d50 am: 506a8b39fb am: 4eff74f8cb am: 2d642f9e2d am: f125662db1" into oc-dev 
am: 46802905f5

Change-Id: Idedbe69b858c4d77a610d68bfad47cd58eec9754
 2017-04-13 17:43:44 +00:00
Matt Sarett
d6b4c56a91 Merge "Add SkiaCanvas::captureCanvasState()" into oc-dev 
am: 59fa17a9d4

Change-Id: I434b6f2d5e26c1a0f09792ce0c22c34034ca5514
 2017-04-13 17:42:16 +00:00
Jeremy Joslin
3a74fcedad Merge "Always call unbind." into oc-dev 
am: f726b4aa9a

Change-Id: If6fafdd633bb3c9120f00818de5f97ae2cfd7735
 2017-04-13 17:41:06 +00:00
Seigo Nonaka
284944c7f8 Merge "Introduce FontsContract.requestFont and deprecate Typeface.create" into oc-dev 
am: d09be1c0e9

Change-Id: I51f68dc5b1453ca4ac700ca68976efd412812eae
 2017-04-13 17:40:02 +00:00
Sudheer Shanka
9865369cf5 Merge "Fix the issue of voice interactor getting reset after reboot." into oc-dev 
am: c59a2a7649

Change-Id: I5676e0f3927f2de123e9d5d219bd10a881754583
 2017-04-13 17:38:59 +00:00
Sundeep Ghuman
2dfbfc3134 Merge "Listen to RSSI_CHANGED_ACTION broadcasts in WifiTracker." into oc-dev 
am: 56fcd408e6

Change-Id: If4d14ff4f69b86af16e65736b32e3e01d06eeaf5
 2017-04-13 17:37:57 +00:00
Dave Friedman
85b7a34094 Docs: Fixes broken link in Javadoc. am: df0fd34d50 am: 506a8b39fb am: 4eff74f8cb am: 2d642f9e2d am: f125662db1 
am: 27aeab9763

Change-Id: I0879ba9238602a3af19cdc91c5ae8762d8776c4d
 2017-04-13 17:33:56 +00:00
Android Build Merger (Role)
46802905f5 Merge "Docs: Fixes broken link in Javadoc. am: df0fd34d50 am: 506a8b39fb am: 4eff74f8cb am: 2d642f9e2d am: f125662db1" into oc-dev 2017-04-13 17:29:14 +00:00
Matt Sarett
59fa17a9d4 Merge "Add SkiaCanvas::captureCanvasState()" into oc-dev 2017-04-13 17:29:00 +00:00
TreeHugger Robot
f726b4aa9a Merge "Always call unbind." into oc-dev 2017-04-13 17:28:52 +00:00
Dave Friedman
27aeab9763 Docs: Fixes broken link in Javadoc. am: df0fd34d50 am: 506a8b39fb am: 4eff74f8cb am: 2d642f9e2d 
am: f125662db1

Change-Id: I5220c1ef4ac51e876c3461b64e2a3dd54c9e2b48
 2017-04-13 17:28:34 +00:00
Dave Friedman
b97cdeb7ac Docs: Fixes broken link in Javadoc. am: df0fd34d50 am: 506a8b39fb am: 4eff74f8cb am: 2d642f9e2d 
am: f125662db1

Change-Id: Ic69e95f68255e5e0bea646cdce2c56881586d24d
 2017-04-13 17:28:18 +00:00
Julia Reynolds
41de81ea75 Merge "Allow notification channels to be silent." into oc-dev 
am: d178ec489f

Change-Id: I9e016e2523b9da200c26df2ddce642942bc0b806
 2017-04-13 17:23:39 +00:00
Hyunyoung Song
e99cf60039 Merge "Update API, add more documentation on AdaptiveIconDrawable" into oc-dev 
am: 76c13a5fce

Change-Id: I060797416983056208f21c099ba21fdc8409103a
 2017-04-13 17:20:50 +00:00
Dave Friedman
f125662db1 Docs: Fixes broken link in Javadoc. am: df0fd34d50 am: 506a8b39fb am: 4eff74f8cb 
am: 2d642f9e2d

Change-Id: I5257f51a37e6e45a928befea94b2ecdb0cf01f45
 2017-04-13 17:19:36 +00:00
TreeHugger Robot
d09be1c0e9 Merge "Introduce FontsContract.requestFont and deprecate Typeface.create" into oc-dev 2017-04-13 17:13:37 +00:00
Jason Monk
6d21855e16 Update mobile data icon 
Test: visual
Change-Id: I21be005b0f4c4371b616377be77025412c2b58e6
Fixes: 35996345
 2017-04-13 13:13:19 -04:00
Seigo Nonaka
5b6347a6af Introduce setFallbackTypeface 
setFallbackTypeface is returned by Builder.build() method when the
provided font is not loaded due to some reasons.
The fallback family is resolved with width/italic passed to Builder.

Bug: 36794225
Test: android.graphics.cts.TypefaceTest passes
Change-Id: I65e220aca823fd815a52437b11c8e6dc952de8e2
 2017-04-13 10:12:27 -07:00
Martijn Coenen
e90bf46a78 Merge "Add persistentFeature application attribute." into oc-dev 
am: e4960cf495

Change-Id: Idf9355d092efa1ffb7eacd9299e3a8471396d3d6
 2017-04-13 17:12:12 +00:00
Sudheer Shanka
c59a2a7649 Merge "Fix the issue of voice interactor getting reset after reboot." into oc-dev 2017-04-13 17:10:00 +00:00