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

156193 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Laurent
8fa4d6f585 AudioService: fix cross deadlock 
Fix cross deadlock between VolumeStreamState.class and
VolumeStreamState instance synchronization.

Do not synchronize on VolumeStreamState instance anymore.

Also document the locking order for synchronization objects
related to volume management.

Bug: 18159081.
Change-Id: Ibfe0759215cdac778408b95191cf0fd96bf46312
 2014-11-03 17:30:41 -08:00
Alan Viverette
685a8770c0 Merge "Fix inset check in ThreadedRenderer" into lmp-mr1-dev 2014-10-30 22:30:21 +00:00
Craig Mautner
159da3dba8 Merge "Add enter-animation-done callback for system windows" into lmp-mr1-dev 2014-10-30 22:12:31 +00:00
Craig Mautner
9c79504225 Add enter-animation-done callback for system windows 
Existing hidden methods allow activities to be notified when their
windows have completed animating in. This change adds that capability
to system windows using a ViewTreeObserver callback since system
windows lack an activity token.

The first subsystem to use this is the UserSwitchingDialog which was
previously using a 250 msec timeout to dismiss the dialog. That
deadline was often missed leaving the user with no dialog on the
screen during the transition.

Fixes bug 16661752.

Change-Id: I70789e0d9c07112f275e76fb82850926305f290d
 2014-10-30 14:43:18 -07:00
Alan Viverette
afffc5c29a Merge "Remove scroll view from correct parent in AlertController" into lmp-mr1-dev 2014-10-30 21:09:19 +00:00
Guang Zhu
4ba4e03e6b Merge "also add backtraces of CPUs before watchdog kills system server" into lmp-mr1-dev 2014-10-30 20:56:40 +00:00
Alan Viverette
35c3cb6a59 Remove scroll view from correct parent in AlertController 
BUG: 18191700
Change-Id: I37602fc26d103b76021f00c58f03bc32d7a978fe
 2014-10-30 13:51:21 -07:00
Santos Cordon
c1c86151b0 Merge "More updates to javadocs for Telecom APIs." into lmp-mr1-dev 2014-10-30 20:01:40 +00:00
Santos Cordon
9acb9598b7 Merge "Even more javadocs for telecom." into lmp-mr1-dev 2014-10-30 19:25:40 +00:00
Alan Viverette
3aa1ffbc75 Fix inset check in ThreadedRenderer 
BUG: 17729606
Change-Id: I9303a788968b424fd8ca27fe4bb99bab51ec34a7
 2014-10-30 12:22:08 -07:00
Selim Cinek
a68da93829 Merge "Fixed a bug with notification clipping" into lmp-mr1-dev 2014-10-30 18:33:14 +00:00
Guang Zhu
0620c451da also add backtraces of CPUs before watchdog kills system server 
Bug: 18003452
Change-Id: I052fe0b2948ea036c3f1b842ea6270b6f11eadef
 2014-10-30 18:25:05 +00:00
Selim Cinek
c5baa3eb08 Fixed a bug with notification clipping 
The clip rect was not correctly set for a view which
was fading out leading to some overdraw.
It also fixes a bug where the alpha was not applied when
made invisible.

Bug: 16077953
Change-Id: I4c26aee88c5c87147df31ec7fb413bc63cd2625c
 2014-10-30 19:19:26 +01:00
John Spurlock
fc2b9039b8 Merge "Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS." into lmp-mr1-dev 2014-10-30 18:12:23 +00:00
John Spurlock
734666657f Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS. 
Bug: 18186862
Change-Id: I685934118a53ba2135eaf0872564e58069de2a30
 2014-10-30 13:42:05 -04:00
Alan Viverette
272e2f73bd Merge "Ensure we don't pass null values in to Theme.resolveAttributes" into lmp-mr1-dev 2014-10-30 17:38:40 +00:00
Alan Viverette
7f4a63d1eb Ensure we don't pass null values in to Theme.resolveAttributes 
BUG: 18182274
Change-Id: I08acf877cb81478cc205254edf92a31fcf05991d
 2014-10-30 10:29:03 -07:00
Ricardo Cervera
e0a3bcfbe1 am 0db81996: am e0acf536: am e3dd89a4: Merge "docs: Two-page notification fix." into lmp-docs 
* commit '0db8199664e9f501c4b2d1f8e404d762f68ae684':
  docs: Two-page notification fix.
 2014-10-30 15:44:55 +00:00
Ricardo Cervera
0db8199664 am e0acf536: am e3dd89a4: Merge "docs: Two-page notification fix." into lmp-docs 
* commit 'e0acf536a00cc30ab8420e43321096afba601024':
  docs: Two-page notification fix.
 2014-10-30 15:38:35 +00:00
Ricardo Cervera
e0acf536a0 am e3dd89a4: Merge "docs: Two-page notification fix." into lmp-docs 
* commit 'e3dd89a42a48c9ba461a0fff7859b7d0b205d146':
  docs: Two-page notification fix.
 2014-10-30 15:34:37 +00:00
Ricardo Cervera
e3dd89a42a Merge "docs: Two-page notification fix." into lmp-docs 2014-10-30 15:27:32 +00:00
Jorim Jaggi
cdbdbe3a54 Merge "Make status bar expanding more tightly coupled to finger" into lmp-mr1-dev 2014-10-30 14:51:45 +00:00
Jorim Jaggi
0b1528aac4 Make status bar expanding more tightly coupled to finger 
Improves the "direct modification" feeling a bit.

Bug: 17040206
Change-Id: Ide4bfb36aef584da36e0340bc2ed099e2e24c0ee
 2014-10-30 15:35:38 +01:00
Jorim Jaggi
2905cafcb8 Merge "Follow up to I495ce480c25de24b6433adebdfe923b637d98f66" into lmp-mr1-dev 2014-10-30 14:25:51 +00:00
Lorenzo Colitti
2d2a69b2d3 Merge "Enable 464xlat on wifi." into lmp-mr1-dev 2014-10-30 13:28:03 +00:00
Lorenzo Colitti
bbb2c5b28a Merge "Add support for running 464xlat on wifi as well." into lmp-mr1-dev 2014-10-30 13:27:54 +00:00
Lorenzo Colitti
dc6690867b Enable 464xlat on wifi. 
Bug: 12111730
Change-Id: If6d118a3c6e163262b09cc2fb3e3d3f9a81986ec
 2014-10-30 20:31:27 +09:00
Lorenzo Colitti
e21a26b3ba Add support for running 464xlat on wifi as well. 
1. Add a command to NetworkManagementService to enable/disable
   IPv6 ND offload via netd.
2. Make Nat464Xlat enable offload if clatd successfully comes up
   on a wifi network (which means it detected a NAT64), and
   correspondingly re-enable offload when the clatd interface
   goes down.

This change does not enable clatd on wifi yet, that requires an
extra 2 lines to enable it.

Bug: 12111730
Change-Id: I4318611762a37487c9a84f8c4867ec5aece98be8
 2014-10-30 20:31:26 +09:00
Nicolas Prevot
9710b04f35 Merge "Schedule to write package restrictions." into lmp-mr1-dev 2014-10-30 10:28:20 +00:00
Chris Banes
e436cb39da Merge "Fix ActionMenuView vertical alignment of items" into lmp-mr1-dev 2014-10-30 08:42:37 +00:00
Dongwon Kang
ce34c6d308 TIF: handle inputs holding the overlay view even after the session release 
Bug: 17336221
Change-Id: I7fb7890039bc3731b62410caa9802db5870ec2e2
 2014-10-30 13:37:03 +09:00
Dongwon Kang
c1f26faa2d Merge "TIF: Handle notifyXXX() calls requested before the session initialization" into lmp-mr1-dev 2014-10-30 04:32:30 +00:00
Yigit Boyar
33d9dc46cf Merge "Move all actionbar related methods to DecorToolbar" into lmp-mr1-dev 2014-10-30 02:02:15 +00:00
Alan Viverette
a9ba2cdfc1 Merge "Ensure ImageView.setImageResource() always resolves Drawable" into lmp-mr1-dev 2014-10-30 00:52:17 +00:00
Alan Viverette
674a3a21cb Merge "Distinguish unspecified and explicit null values in resources" into lmp-mr1-dev 2014-10-30 00:41:44 +00:00
Dongwon Kang
3eefa59e37 TIF: Handle notifyXXX() calls requested before the session initialization 
Previously, we relied on a handler by posting runnables when the
session is not initialized yet. However, this trick was broken when we
separated the creation procedure into DO_CREATE_SESSION and
DO_NOTIFY_SESSION_CREATED.

Bug: 17909798
Change-Id: I46f610cb9673f8162266525ac0e343b61c6db9ec
 2014-10-30 09:34:56 +09:00
Alan Viverette
d739d7bd8a Ensure ImageView.setImageResource() always resolves Drawable 
Fixes no-op on method call after configuration change at the expense
of removing a micro-optimization that wasn't really needed.

BUG: 18178233
Change-Id: I36eccf91b138e4bed34be96d9b87200edeb66938
 2014-10-29 17:26:37 -07:00
Alan Viverette
425b1dc88c Merge "Add theme and config change support to more Drawable types" into lmp-mr1-dev 2014-10-30 00:24:28 +00:00
Alan Viverette
104504053d Merge "Show scroll indicators in AlertDialog" into lmp-mr1-dev 2014-10-30 00:18:32 +00:00
Alan Viverette
154c2c24dc Show scroll indicators in AlertDialog 
BUG: 16353356
Change-Id: I0307283751ccb23b9d85b0c36cb78b01243e70dd
 2014-10-30 00:18:22 +00:00
Alan Viverette
f296940502 Distinguish unspecified and explicit null values in resources 
BUG: 17919345
Change-Id: Ic4f04f7dd0f986f58a749b5950d80c1cfdb074ea
 2014-10-29 17:09:36 -07:00
kmccormick
f769c98172 am 4d9872e6: am 1649712f: am 13d7ea46: (-s ours) DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes. 
* commit '4d9872e6ecc221d3c8bbd66b8efee819d12dbb90':
  DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.
 2014-10-29 23:49:03 +00:00
kmccormick
20dfe399a6 am 63ee1976: am 2b20b9d2: am 3e92c4a2: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs 
* commit '63ee197682bf7cf831950087028b2a81902f92c9':
  Doc update: deliv receipt, rate exceeded, bug fixes.
 2014-10-29 23:48:53 +00:00
kmccormick
4d9872e6ec am 1649712f: am 13d7ea46: (-s ours) DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes. 
* commit '1649712f8745f6b62e453b8b4a230374308732ce':
  DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.
 2014-10-29 23:26:18 +00:00
kmccormick
1649712f87 am 13d7ea46: (-s ours) DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes. 
* commit '13d7ea464ec7947a0c55cd778c8b2bacc9d0745d':
  DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.
 2014-10-29 23:20:34 +00:00
kmccormick
63ee197682 am 2b20b9d2: am 3e92c4a2: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs 
* commit '2b20b9d23a0cd5a70db95bc70bae832a6d1f356d':
  Doc update: deliv receipt, rate exceeded, bug fixes.
 2014-10-29 23:19:46 +00:00
kmccormick
2b20b9d23a am 3e92c4a2: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs 
* commit '3e92c4a20f413a800c168ee8ff7fe3b687f234a7':
  Doc update: deliv receipt, rate exceeded, bug fixes.
 2014-10-29 23:12:52 +00:00
Adam Lesinski
720a5c51be Merge "Add dumpsys output to UsageStatsService, along with --checkin support" into lmp-mr1-dev 2014-10-29 23:11:54 +00:00
kmccormick
3e92c4a20f am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs 
* commit '1867f2cfdd477cb12c167fc47c79e2e5d6332e24':
  Doc update: deliv receipt, rate exceeded, bug fixes.
 2014-10-29 23:09:23 +00:00
Wale Ogunwale
a232953ea3 Merge "Fix issue 6455374: Bad recent image on camera launch from lockscreen." into lmp-mr1-dev 2014-10-29 23:08:21 +00:00