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

124378 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Wren
92aaff8a80 Merge "add a setting for the heads up: base part" 2014-02-28 23:00:19 +00:00
Chris Wren
7bd2412332 add a setting for the heads up: base part 
also fix a crash if the feature is disabled and then enabled
while a heads up is active.

Bug: 13208692
Change-Id: I6847f7a5f275aee2f608de0237dab0e45c39b33f
 2014-02-28 17:37:51 -05:00
Will Haldean Brown
718e39f1dc am 987fb9cd: am 9d50308b: am 41044e5e: Merge "Maintain binding to crashed listeners from NotificationManagerService." into klp-modular-dev 
* commit '987fb9cd299bf0bf73bec233eaf184fb4e8353ac':
  Maintain binding to crashed listeners from NotificationManagerService.
 2014-02-28 22:36:25 +00:00
Will Haldean Brown
987fb9cd29 am 9d50308b: am 41044e5e: Merge "Maintain binding to crashed listeners from NotificationManagerService." into klp-modular-dev 
* commit '9d50308b3e51b871e541397384d8c59d7717bd56':
  Maintain binding to crashed listeners from NotificationManagerService.
 2014-02-28 22:33:50 +00:00
Takeshi Kishimoto
c6f0de6cb4 Merge "Changed MTU for mcc440-mnc20 (SoftBank Mobile) per their request." 2014-02-28 22:32:04 +00:00
Will Haldean Brown
9d50308b3e am 41044e5e: Merge "Maintain binding to crashed listeners from NotificationManagerService." into klp-modular-dev 
* commit '41044e5e8ef3ade33ae5d6377beca5852851a16b':
  Maintain binding to crashed listeners from NotificationManagerService.
 2014-02-28 22:30:31 +00:00
Will Haldean Brown
41044e5e8e Merge "Maintain binding to crashed listeners from NotificationManagerService." into klp-modular-dev 2014-02-28 22:26:17 +00:00
John Reck
fa22e9e001 Merge "Avoid running functors after detach" 2014-02-28 21:20:27 +00:00
Nick Kralevich
1c05125ae2 am 33fc60d6: am 7842cff8: am 787d8145: am 4a794846: Merge "Fix descriptor leak after accepting connections" 
* commit '33fc60d64e82adeea7a9478be3a153a7c7ab9537':
  Fix descriptor leak after accepting connections
 2014-02-28 21:16:08 +00:00
Nick Kralevich
33fc60d64e am 7842cff8: am 787d8145: am 4a794846: Merge "Fix descriptor leak after accepting connections" 
* commit '7842cff88dd519d5eba6ff86e21f9ce616d9ad9b':
  Fix descriptor leak after accepting connections
 2014-02-28 21:13:04 +00:00
Nick Kralevich
7842cff88d am 787d8145: am 4a794846: Merge "Fix descriptor leak after accepting connections" 
* commit '787d81453ce1e5451bd2c289c8b53cfeda2eab29':
  Fix descriptor leak after accepting connections
 2014-02-28 21:07:55 +00:00
Nick Kralevich
787d81453c am 4a794846: Merge "Fix descriptor leak after accepting connections" 
* commit '4a79484648262d5d0dc9e72c3d9cf36c77cca599':
  Fix descriptor leak after accepting connections
 2014-02-28 13:04:42 -08:00
Nick Kralevich
4a79484648 Merge "Fix descriptor leak after accepting connections" 2014-02-28 21:02:21 +00:00
John Reck
f9a901e101 Avoid running functors after detach 
Bug: 10861732

Change-Id: Ida55fff716c37c6ab1c98eef02582282de0034f6
 2014-02-28 13:02:15 -08:00
Chris Craik
adbd2ba1bc Call correct MaskFilter factory method 
Change-Id: Ibc30361427cc484443579930f729145ef19c6916
 2014-02-28 12:47:47 -08:00
Chris Craik
411d13985f Merge "Fix use of Skia deprecated methods" 2014-02-28 20:39:57 +00:00
Chris Craik
6786252405 Fix use of Skia deprecated methods 
Change-Id: Ib89c20fc94bcce29b7490d6f55c73492735befda
 2014-02-28 12:26:34 -08:00
Alan Viverette
5523db2ea3 Merge "Don't smooth scroll if the adapter is null" 2014-02-28 20:22:53 +00:00
Tim Kilbourn
ce601aee4c am 7489271c: am c405bae9: am 7071786e: Clear child FragmentManagers when destroying Fragments. 
* commit '7489271cd12ef04ba19cd2ea31a1e79251b10a08':
  Clear child FragmentManagers when destroying Fragments.
 2014-02-28 20:19:16 +00:00
Alan Viverette
2ac93ae919 Don't smooth scroll if the adapter is null 
BUG: 13235508
Change-Id: I1ca8a5675aa07b9a987e47a6eacdc0a1e4adde74
 2014-02-28 12:18:38 -08:00
Tim Kilbourn
7489271cd1 am c405bae9: am 7071786e: Clear child FragmentManagers when destroying Fragments. 
* commit 'c405bae90d861a2487367c34b1a2ebd695da340d':
  Clear child FragmentManagers when destroying Fragments.
 2014-02-28 20:16:09 +00:00
Tim Kilbourn
c405bae90d am 7071786e: Clear child FragmentManagers when destroying Fragments. 
* commit '7071786e0074bea42b01236f817383cab69c1b63':
  Clear child FragmentManagers when destroying Fragments.
 2014-02-28 20:13:11 +00:00
Dave Platt
d75932b521 Fix descriptor leak after accepting connections 
After accepting a connection on a listening socket and
storing the resulting FileDescriptor into a newly created
LocalSocketImpl, the new impl's "descriptor was created
locally and should be closed normally" flag should be set.

(cherrypicked from 3e7305c6bf6062b5cb1e2ddcec6c6d30b4a8bc0d)

Bug: 11805817
Change-Id: I0a1a7c62ec3fbcf647a44a22110ddc778d14e5f4
 2014-02-28 12:04:51 -08:00
Chad Brubaker
f87b224849 Merge "Remove SO_BINDTODEVICE from VPN protect" 2014-02-28 19:28:45 +00:00
Will Haldean Brown
866b25425e Maintain binding to crashed listeners from NotificationManagerService. 
This fixes the logic on the death handlers for notification listeners,
and doesn't unbind from the listener services so that the system will
bring them back up again.

Bug: 12587702
Change-Id: I44ce250e0e1c2583836dc823d9a333dabec51df9
 2014-02-28 11:26:47 -08:00
Chris Wren
9f6a372ca0 Merge "create a synthetic 2U heads up notification" 2014-02-28 16:28:53 +00:00
Chris Wren
595c2c58d5 Merge "use ticker text as a criterion for heads up" 2014-02-28 16:28:39 +00:00
Chris Wren
8fd39ec46b create a synthetic 2U heads up notification 
combine the 1U with the action buttons to make a mid-sized notification
bounded to 128dp by the system ui
used for the heads up

Bug: 13208692
Change-Id: I382bb0bd1ce73f35295f05ca2606195986cff1d3
 2014-02-28 11:20:11 -05:00
Glenn Kasten
1489b09b64 Merge "AudioTrack constructor/set parameter frameCount is size_t" 2014-02-28 16:18:07 +00:00
Narayan Kamath
317f5119f8 Merge "Fix bad link tag in javadoc." 2014-02-28 14:07:33 +00:00
Narayan Kamath
80009c0298 Fix bad link tag in javadoc. 
Java7 javadoc tools seem to accept this without complaint
but not all targets use java7 yet.

Change-Id: Ib025d12550f5fd68edce5760747f9225a2be50c6
 2014-02-28 14:06:44 +00:00
Narayan Kamath
e0d10cd923 am d8ccf8b7: am be094d89: am 8fb22ae7: am eee2c72f: Merge "Various format string fixes for 64bit" 
* commit 'd8ccf8b789461e1706d10df44d109849fa974fc5':
  Various format string fixes for 64bit
 2014-02-28 13:53:15 +00:00
Narayan Kamath
d8ccf8b789 am be094d89: am 8fb22ae7: am eee2c72f: Merge "Various format string fixes for 64bit" 
* commit 'be094d89db01387f773786435e110bbe166f3c65':
  Various format string fixes for 64bit
 2014-02-28 13:50:57 +00:00
Narayan Kamath
be094d89db am 8fb22ae7: am eee2c72f: Merge "Various format string fixes for 64bit" 
* commit '8fb22ae772fc62a10db6a06f283140d9233e8704':
  Various format string fixes for 64bit
 2014-02-28 13:46:53 +00:00
Narayan Kamath
8fb22ae772 am eee2c72f: Merge "Various format string fixes for 64bit" 
* commit 'eee2c72f96cd4e6228c50c8b461b4dd84a9f4538':
  Various format string fixes for 64bit
 2014-02-28 05:45:01 -08:00
Narayan Kamath
eee2c72f96 Merge "Various format string fixes for 64bit" 2014-02-28 13:41:58 +00:00
Narayan Kamath
11e4317555 am 62d675c2: am 0d3548be: am d138029d: am 14420e29: Merge "AArch64: Use long[] for RS id array" 
* commit '62d675c240fd87cb987c86ae4f6ac17dc13374c8':
  AArch64: Use long[] for RS id array
 2014-02-28 13:35:07 +00:00
Narayan Kamath
62d675c240 am 0d3548be: am d138029d: am 14420e29: Merge "AArch64: Use long[] for RS id array" 
* commit '0d3548bea9986bb7446156699e200ffa147a3a02':
  AArch64: Use long[] for RS id array
 2014-02-28 13:31:58 +00:00
Narayan Kamath
0d3548bea9 am d138029d: am 14420e29: Merge "AArch64: Use long[] for RS id array" 
* commit 'd138029d92e1d4657815747f30004323061d34de':
  AArch64: Use long[] for RS id array
 2014-02-28 13:28:30 +00:00
Narayan Kamath
d138029d92 am 14420e29: Merge "AArch64: Use long[] for RS id array" 
* commit '14420e29abc0f16f818ddaf606515861ba69ae68':
  AArch64: Use long[] for RS id array
 2014-02-28 05:26:30 -08:00
Derek Sollenberger
fc92763408 Merge "Fix includes so that they no longer rely on the global Skia includes directories." 2014-02-28 13:23:15 +00:00
Narayan Kamath
14420e29ab Merge "AArch64: Use long[] for RS id array" 2014-02-28 13:22:26 +00:00
Narayan Kamath
ef23865154 Merge "API changes for 64 bit platforms." 2014-02-28 13:21:22 +00:00
Jeff Brown
ddb90b65f7 am 098bed6f: am bb689496: am 4c7e6900: Make meaning of PowerManager.isScreenOn() more consistent. 
* commit '098bed6f27b05c16ecc30f9d39005e5995f14263':
  Make meaning of PowerManager.isScreenOn() more consistent.
 2014-02-28 09:47:12 +00:00
Jeff Brown
098bed6f27 am bb689496: am 4c7e6900: Make meaning of PowerManager.isScreenOn() more consistent. 
* commit 'bb6894964b30d02dc3545f07b45140646ef17581':
  Make meaning of PowerManager.isScreenOn() more consistent.
 2014-02-28 09:40:28 +00:00
Jeff Brown
bb6894964b am 4c7e6900: Make meaning of PowerManager.isScreenOn() more consistent. 
* commit '4c7e6900c8bfd57652fc1ceca724208ca7556196':
  Make meaning of PowerManager.isScreenOn() more consistent.
 2014-02-28 09:21:36 +00:00
Tim Kilbourn
7071786e00 Clear child FragmentManagers when destroying Fragments. 
If Fragment has instantiated a child FragmentManager and is later
detached, it retains its reference to the child FragmentManager which
has been destroyed. This causes an IllegalStateException in the
child FragmentManager if the original Fragment is reattached.

Fixes Issue 42601.

Change-Id: I8db2b1a110a341dc259939723f4c5ec131ca5f1e
 2014-02-28 01:05:17 -08:00
Takeshi Kishimoto
d18d3ba1fa Changed MTU for mcc440-mnc20 (SoftBank Mobile) per their request. 
Bug: 13235517
Change-Id: I2c09ae147391d9e7645fe279926981ccd271b145
 2014-02-28 08:51:39 +00:00
Jeff Brown
4c7e6900c8 Make meaning of PowerManager.isScreenOn() more consistent. 
The power manager sends SCREEN_ON and SCREEN_OFF broadcasts
purely based on the current wakefulness state.  In particular,
when the system is awake, we consider the screen to be on even
if the screen may actually be off due to the proximity sensor
or some other condition.  Likewise when the system is dozing
or asleep, we consider the screen to be off although technically
it may still be on and dozing.

This behavior is maintained for compatibility with applications
that interpret screen on / off as an indicator of user presence.

As it happened, the value of PowerManager.isScreenOn() did not
always match the state indicated by the broadcasts under certain
situations.  Instead, it was based on the desired screen state.
These states used to be closely correlated but the addition
of doze mode causes them to diverge in meaning.

One consequence is that wake events from input devices might not
always wake the device from sleep unless the display's power
state was actually DOZING or OFF even if the power manager's
wakefulness was already DOZING or ASLEEP.  This is now fixed.

Change-Id: Ie819c6d2c5a9ffaaf3101c5dee93ff72e9bc9f30
 2014-02-27 21:17:34 -08:00
Alan Viverette
ed43470925 Merge "Refactor smooth scrolling sub-row calculation and clamp target" 2014-02-28 00:35:13 +00:00