Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
165,856 Commits 3 Branches 0 Tags
bc593c56fb3f0b618dc43bfdb7db8ccd1852b134
Commit Graph

46309 Commits

Author SHA1 Message Date
Paul West
bc593c56fb am 746bf3b9: am 98bb023a: am c55a2547: am bebcde44: Merge "[DS] DSDS support for widget view" into lmp-sprout-dev 
* commit '746bf3b9b4815dcdb25610402a878b0322618293':
  [DS] DSDS support for widget view
 2014-10-02 19:50:25 +00:00
Paul West
746bf3b9b4 am 98bb023a: am c55a2547: am bebcde44: Merge "[DS] DSDS support for widget view" into lmp-sprout-dev 
* commit '98bb023a8971d4744fbfc504118b09b04e181e38':
  [DS] DSDS support for widget view
 2014-10-02 19:42:36 +00:00
Paul West
c55a2547a1 am bebcde44: Merge "[DS] DSDS support for widget view" into lmp-sprout-dev 
* commit 'bebcde4453af3f0711c60d09f5b0f82076daff3d':
  [DS] DSDS support for widget view
 2014-10-02 15:28:41 +00:00
Paul West
bebcde4453 Merge "[DS] DSDS support for widget view" into lmp-sprout-dev 2014-10-02 15:24:14 +00:00
George Mount
cb7172152a am 9ed996ad: am 7aaefa52: am b29b651d: am a590a95c: am d982b582: Merge "Fix ChangeTransform works only once on a View." into lmp-dev 
* commit '9ed996ad8766f7c88b0d0b5ffe8bb7ce8eacd24d':
  Fix ChangeTransform works only once on a View.
 2014-10-02 14:56:04 +00:00
George Mount
9ed996ad87 am 7aaefa52: am b29b651d: am a590a95c: am d982b582: Merge "Fix ChangeTransform works only once on a View." into lmp-dev 
* commit '7aaefa52e034c924a9c536fe378bb8b47efcfdb4':
  Fix ChangeTransform works only once on a View.
 2014-10-02 14:50:12 +00:00
George Mount
b29b651dd5 am a590a95c: am d982b582: Merge "Fix ChangeTransform works only once on a View." into lmp-dev 
* commit 'a590a95c4d3b68f9df40b76eef1462d159ff568f':
  Fix ChangeTransform works only once on a View.
 2014-10-02 14:39:41 +00:00
George Mount
a590a95c4d am d982b582: Merge "Fix ChangeTransform works only once on a View." into lmp-dev 
* commit 'd982b582d1993288347f771177f6889fe14fb387':
  Fix ChangeTransform works only once on a View.
 2014-10-02 14:33:15 +00:00
George Mount
d982b582d1 Merge "Fix ChangeTransform works only once on a View." into lmp-dev 2014-10-02 14:27:21 +00:00
Sreeram Ramachandran
4924e5d87b am 44774ad0: am 9e987f1d: am 4f4b81bd: am c04e922f: am 5aaabc0f: Merge "Send app permissions to netd." into lmp-dev 
* commit '44774ad079e95606186ed186672449de295d6769':
  Send app permissions to netd.
 2014-10-02 13:46:58 +00:00
Dianne Hackborn
7c56fd3c25 am 7cf6cac5: am 03e173ed: am ded96310: am 796d6ece: am c338784b: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '7cf6cac507df68ecb1d6484a5287687e4df61573':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-02 13:46:39 +00:00
Erik Pasternak
fcdd687092 am c7cbbe8e: am d68362b9: am c6646b0c: am 739bf81d: am 4d82c46e: Merge "Implement auto-sleep functionality." into lmp-dev 
* commit 'c7cbbe8e82b2dda4889a6663a83586f1e6759282':
  Implement auto-sleep functionality.
 2014-10-02 13:46:34 +00:00
Alan Viverette
7546a39181 am 52bab6e7: am 3c062db9: am a5ecdbb1: Merge "Manage pressed state during drag-to-open" into lmp-mr1-dev 
* commit '52bab6e7220bc85f678f13637d5b9a122d5ca1c9':
  Manage pressed state during drag-to-open
 2014-10-02 13:46:23 +00:00
Neil Fuller
ebf2e8b451 am c2a0b448: resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp 
* commit 'c2a0b4482d7144e8382346ea4c22c7b89368fec0':
  Switch from FloatMath -> Math and Math.hypot where possible
 2014-10-02 13:39:55 +00:00
Sreeram Ramachandran
44774ad079 am 9e987f1d: am 4f4b81bd: am c04e922f: am 5aaabc0f: Merge "Send app permissions to netd." into lmp-dev 
* commit '9e987f1d76e18bca72583ab5f4ff65ae4e8c381e':
  Send app permissions to netd.
 2014-10-02 13:39:05 +00:00
Dianne Hackborn
7cf6cac507 am 03e173ed: am ded96310: am 796d6ece: am c338784b: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '03e173edce42a5ae0de8a7718330d83664a84a9e':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-02 13:38:23 +00:00
Erik Pasternak
c7cbbe8e82 am d68362b9: am c6646b0c: am 739bf81d: am 4d82c46e: Merge "Implement auto-sleep functionality." into lmp-dev 
* commit 'd68362b962be2237418a1a10ebec7a2f75b9b267':
  Implement auto-sleep functionality.
 2014-10-02 13:38:16 +00:00
Alan Viverette
52bab6e722 am 3c062db9: am a5ecdbb1: Merge "Manage pressed state during drag-to-open" into lmp-mr1-dev 
* commit '3c062db99406f083f8c3529bcc56d042b9cb06b0':
  Manage pressed state during drag-to-open
 2014-10-02 13:37:56 +00:00
Neil Fuller
c2a0b4482d resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp 
Change-Id: I2588c65b7a9fa43f968151a206924a804f0595a7
 2014-10-02 14:32:37 +01:00
Hui Shu
4299ae9f50 am 0fdb1651: am 724fe35e: am 5f961157: am 888fd710: am 4e0ad44f: Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev 
* commit '0fdb165193a032ced17c319eebe6a3b2617b2852':
  Revert "Remove WebView DRP Setting from Developer Settings"
 2014-10-02 12:53:16 +00:00
Patrick Tjin
b04491a6ff am 21b0fc91: am d104aae8: am cae74017: am f7c59190: am dea847c2: Skip over directories when iterating tombstones 
* commit '21b0fc91e0950bb2f2e52527ad2a3e23d1a5d449':
  Skip over directories when iterating tombstones
 2014-10-02 12:53:05 +00:00
John Reck
37c8a96411 am 2b16483a: am 3b2f6701: am d644facf: am f408656a: am 8786a962: Merge "Re-allow suppressing onDetachedFromWindow" into lmp-dev 
* commit '2b16483ae6de201d7324de9f3d7a351c51f0c5f2':
  Re-allow suppressing onDetachedFromWindow
 2014-10-02 12:52:43 +00:00
Hui Shu
9db0d62d96 am 30c284fc: am 03e73745: am 7ce8d27f: am 9cd616e0: am aee5c9e7: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev 
* commit '30c284fc460218652ffa89aed3da41225ad9b7cc':
  Remove WebView DRP Setting from Developer Settings
 2014-10-02 12:52:32 +00:00
Hui Shu
0fdb165193 am 724fe35e: am 5f961157: am 888fd710: am 4e0ad44f: Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev 
* commit '724fe35eac0afd885f3a20ebf846f0429303c157':
  Revert "Remove WebView DRP Setting from Developer Settings"
 2014-10-02 12:40:59 +00:00
Patrick Tjin
21b0fc91e0 am d104aae8: am cae74017: am f7c59190: am dea847c2: Skip over directories when iterating tombstones 
* commit 'd104aae8154ae182d58fc4c2b85fabbbe152faca':
  Skip over directories when iterating tombstones
 2014-10-02 12:38:44 +00:00
John Reck
2b16483ae6 am 3b2f6701: am d644facf: am f408656a: am 8786a962: Merge "Re-allow suppressing onDetachedFromWindow" into lmp-dev 
* commit '3b2f670187fde9079a1f9eaee92415b6a886611f':
  Re-allow suppressing onDetachedFromWindow
 2014-10-02 12:38:26 +00:00
Hui Shu
30c284fc46 am 03e73745: am 7ce8d27f: am 9cd616e0: am aee5c9e7: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev 
* commit '03e73745c69637efb806e174109410b0192536e7':
  Remove WebView DRP Setting from Developer Settings
 2014-10-02 12:38:15 +00:00
Neil Fuller
ee665151a4 am 0c1faf43: Merge "Switch from FloatMath -> Math and Math.hypot where possible" 
* commit '0c1faf43aecadc37b78c4ad6cb669eb351d21385':
  Switch from FloatMath -> Math and Math.hypot where possible
 2014-10-02 10:18:29 +00:00
Sreeram Ramachandran
4f4b81bd3d am c04e922f: am 5aaabc0f: Merge "Send app permissions to netd." into lmp-dev 
* commit 'c04e922f67cacfc428d09fd266f7c9b36a6fb472':
  Send app permissions to netd.
 2014-10-02 06:34:16 +00:00
Sreeram Ramachandran
c04e922f67 am 5aaabc0f: Merge "Send app permissions to netd." into lmp-dev 
* commit '5aaabc0fa66dd755843f040fe634962477107950':
  Send app permissions to netd.
 2014-10-02 06:29:37 +00:00
Sreeram Ramachandran
e4a05afe85 Send app permissions to netd. 
Based largely off Robert's http://ag/546170 (thanks!)

Bug: 15413737
Change-Id: I8a1f0a184923c4c0a4935e6b88895bcc05e39f02
 2014-10-01 20:22:34 -07:00
Craig Mautner
ce324a2da7 am bee6dfe0: am 8a33674b: am 3867e4d0: am 9ab8fbbc: am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev 
* commit 'bee6dfe09d4381f9ddf666fd04012c662f31e7fd':
  Don't clear visible-behind activity if it is top
 2014-10-02 02:00:41 +00:00
Craig Mautner
bee6dfe09d am 8a33674b: am 3867e4d0: am 9ab8fbbc: am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev 
* commit '8a33674bed6791c63eee9d798693e25bc07b7cba':
  Don't clear visible-behind activity if it is top
 2014-10-02 00:58:50 +00:00
Dianne Hackborn
ded96310cf am 796d6ece: am c338784b: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '796d6eced1e23217914e639da45d9371baf8a5b0':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-02 00:32:02 +00:00
Dianne Hackborn
796d6eced1 am c338784b: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit 'c338784bf6bfcce3cd7db40f46b0e6c815e9ed3a':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-02 00:27:48 +00:00
Dianne Hackborn
c338784bf6 Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 2014-10-02 00:23:18 +00:00
Erik Pasternak
c6646b0cb4 am 739bf81d: am 4d82c46e: Merge "Implement auto-sleep functionality." into lmp-dev 
* commit '739bf81dd130957c9bc09abc4e25732af2d675c0':
  Implement auto-sleep functionality.
 2014-10-02 00:09:47 +00:00
Erik Pasternak
739bf81dd1 am 4d82c46e: Merge "Implement auto-sleep functionality." into lmp-dev 
* commit '4d82c46ef5df06e1b92f3574e41b38a62ec0e607':
  Implement auto-sleep functionality.
 2014-10-02 00:04:01 +00:00
Erik Pasternak
4d82c46ef5 Merge "Implement auto-sleep functionality." into lmp-dev 2014-10-02 00:00:40 +00:00
Dianne Hackborn
8d05172112 More work on issue #17656716: Unhandled exception in Window Manager 
Fix Slog.wtf to not acquire the activity manager lock in its code
path, so that it can never deadlock.  This was the original intention
of it, but part was missed.

Now we can put back in the code to detect when strict mode data is
getting large (a little more targeted now to the actual problem),
and use Slog.wtf to report it.  And as a bonus, when this happens
we will now clear all of the collected violations, to avoid getting
in to the bad case where IPCs start failing.  So this should be
good enough for L to fix the problem, with wtf reports for us to
see if the underlying issue is still happening.

Finally, switch a butch of stuff in the system process from Log.wtf
to Slog.wtf, since many of those are deadlocks waiting to happen.

Oh and fix a crash in the settings provider I noticed in APR.

Change-Id: I307d51b7a4db238fd1e5fe2f3f9bf1b9c6f1c041
 2014-10-01 16:58:56 -07:00
Alan Viverette
a5ecdbb1a8 Merge "Manage pressed state during drag-to-open" into lmp-mr1-dev 2014-10-01 23:43:03 +00:00
Alan Viverette
62a8b61f92 Manage pressed state during drag-to-open 
BUG: 17573390
Change-Id: Ia85d7b51d6e4a18dcbf99b930f9f7c045697a31b
 2014-10-01 16:41:31 -07:00
Hui Shu
5f961157c4 am 888fd710: am 4e0ad44f: Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev 
* commit '888fd710cd9ae569d47e1795f47e2ad909b5c8df':
  Revert "Remove WebView DRP Setting from Developer Settings"
 2014-10-01 22:25:53 +00:00
Patrick Tjin
cae740173f am f7c59190: am dea847c2: Skip over directories when iterating tombstones 
* commit 'f7c59190f7f0ece82b98ed61ca16d5f7ab20dc0d':
  Skip over directories when iterating tombstones
 2014-10-01 22:18:04 +00:00
John Reck
d644facfcd am f408656a: am 8786a962: Merge "Re-allow suppressing onDetachedFromWindow" into lmp-dev 
* commit 'f408656a731328694b3ffee2f588263d60349dc3':
  Re-allow suppressing onDetachedFromWindow
 2014-10-01 22:16:43 +00:00
Hui Shu
7ce8d27fcd am 9cd616e0: am aee5c9e7: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev 
* commit '9cd616e067b9049c87ad5064d3cf4b8cc380ddfa':
  Remove WebView DRP Setting from Developer Settings
 2014-10-01 22:15:52 +00:00
Hui Shu
888fd710cd am 4e0ad44f: Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev 
* commit '4e0ad44fcac48b2be77bd116ffdb696cb6490829':
  Revert "Remove WebView DRP Setting from Developer Settings"
 2014-10-01 22:15:20 +00:00
Narayan Kamath
89f3665dac am 17044459: am 870c3553: am 13705ca9: am d480147f: am 7dc7f676: Merge "Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS" into lmp-dev 
* commit '170444599ce44b3b427267a190bed79d9afb709d':
  Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS
 2014-10-01 22:13:28 +00:00
Jerome Poichet
4df8a1e369 am c2ece422: am 87ed0483: am 0d71155d: am a5fa02df: am 72079f7f: Merge "Make sure cancel is called on tear down." into lmp-dev 
* commit 'c2ece4228d64a5621bdadc042d3182af89141f8c':
  Make sure cancel is called on tear down.
 2014-10-01 22:13:02 +00:00
Hui Shu
4e0ad44fca Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev 2014-10-01 22:10:23 +00:00