Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,722 Commits 3 Branches 0 Tags
8d044e8bc287c1a567d82aedbe30085b011544c3
Commit Graph

29697 Commits

Author SHA1 Message Date
Jeff Sharkey
5a996b30f7 Merge "Disable various sampling event logs." 2013-04-26 21:56:26 +00:00
Elliott Hughes
305615e5b8 am 032d8e38: am 0bb497b8: Merge "Use the newer ZoneInfoDB API." 
* commit '032d8e3890335e96b16bfa3fbd7706fbb0f2d2c0':
  Use the newer ZoneInfoDB API.
 2013-04-26 12:39:34 -07:00
Elliott Hughes
032d8e3890 am 0bb497b8: Merge "Use the newer ZoneInfoDB API." 
* commit '0bb497b8d1bac2206df89a878ecb7e356d21fe99':
  Use the newer ZoneInfoDB API.
 2013-04-26 12:38:04 -07:00
Elliott Hughes
0bb497b8d1 Merge "Use the newer ZoneInfoDB API." 2013-04-26 18:41:47 +00:00
Elliott Hughes
48289433d8 Use the newer ZoneInfoDB API. 
Change-Id: I846c720ae6c262afb4fd7f8a749008c837e76cc4
 2013-04-26 11:30:54 -07:00
Jeff Sharkey
2b4d22cda3 Disable various sampling event logs. 
They're unused at the moment.

Change-Id: Ib629b405e7b6666d38fcd0ebaa16490bfb0e95f0
 2013-04-26 10:52:00 -07:00
Victoria Lease
7e56c7b8e3 am aae1b516: am b0e0e54d: Merge "Can not mark the same content of browser page after copy" 
* commit 'aae1b5163c319eae31fca509f13ce0a4ea422840':
  Can not mark the same content of browser page after copy
 2013-04-26 10:28:56 -07:00
Victoria Lease
aae1b5163c am b0e0e54d: Merge "Can not mark the same content of browser page after copy" 
* commit 'b0e0e54d9dbef720ac653ed87d8ed6b46e1abdbe':
  Can not mark the same content of browser page after copy
 2013-04-26 10:27:02 -07:00
Victoria Lease
b0e0e54d9d Merge "Can not mark the same content of browser page after copy" 2013-04-26 17:17:39 +00:00
Svetoslav Ganov
0bd6a395d8 am d3859994: am 951ce6c9: Merge "Revert change f449c0c381239dc0f78b0f01ecfb3889e056a597." into jb-mr2-dev 
* commit 'd3859994624af39e0f75fd70fe623403f38c408d':
  Revert change f449c0c381.
 2013-04-26 09:40:11 -07:00
Svetoslav Ganov
d385999462 am 951ce6c9: Merge "Revert change f449c0c381239dc0f78b0f01ecfb3889e056a597." into jb-mr2-dev 
* commit '951ce6c966311d36328a89784d4c2e6836e9ae87':
  Revert change f449c0c381.
 2013-04-26 09:38:18 -07:00
Svetoslav Ganov
951ce6c966 Merge "Revert change f449c0c381239dc0f78b0f01ecfb3889e056a597." into jb-mr2-dev 2013-04-26 16:35:49 +00:00
Scott Main
3fc184cf6e am 01e48e7d: am 22f6a60e: Merge "add docs for new attributes, including account restriction for restricted profiles" into jb-mr2-dev 
* commit '01e48e7d1541920ece358257e4c2481936497835':
  add docs for new attributes, including account restriction for restricted profiles
 2013-04-25 21:27:06 -07:00
Chris Craik
80246dbdb5 am 57fc8122: am addc906f: Merge "Force clipping on layers that fail to be allocated" into jb-mr2-dev 
* commit '57fc8122eabc08b19a41f308d409795d094856d8':
  Force clipping on layers that fail to be allocated
 2013-04-25 21:27:04 -07:00
Scott Main
93b7e769eb am 22e9225a: am 5e5aeb46: Merge "fix javadoc build also add some docs to the service" into jb-mr2-dev 
* commit '22e9225ab13347e3653449af0306bc87fa7965f2':
  fix javadoc build also add some docs to the service
 2013-04-25 21:27:02 -07:00
Amith Yamasani
fe9270712e am 83a61421: am bbd90f8e: Merge "Hide isLinkedUser()" into jb-mr2-dev 
* commit '83a6142173fbd3ddf5c4285e2b6359e44beaddb0':
  Hide isLinkedUser()
 2013-04-25 21:26:59 -07:00
Matthew Xie
6a78365072 am 7a21c4cd: am 7f3c5d16: Merge "Added flush() for bluetooth output stream" into jb-mr2-dev 
* commit '7a21c4cdb172f6353cd4166e80910893dc981196':
  Added flush() for bluetooth output stream
 2013-04-25 21:26:56 -07:00
Kristian Monsen
659e804108 am 501bf503: am 58665709: Merge "Workaround for bug 8700358: Reproducible WebView crash in Feedly starting in JWR22B" into jb-mr2-dev 
* commit '501bf503559ff301034e2fb3680b4e046d0ceca5':
  Workaround for bug 8700358: Reproducible WebView crash in Feedly starting in JWR22B
 2013-04-25 21:26:53 -07:00
Scott Main
01e48e7d15 am 22f6a60e: Merge "add docs for new attributes, including account restriction for restricted profiles" into jb-mr2-dev 
* commit '22f6a60e62253436a4f7da1a5d59adc0f17534cc':
  add docs for new attributes, including account restriction for restricted profiles
 2013-04-25 21:22:38 -07:00
Chris Craik
57fc8122ea am addc906f: Merge "Force clipping on layers that fail to be allocated" into jb-mr2-dev 
* commit 'addc906f70ba24aa4b649fff7f98d88b96c8d808':
  Force clipping on layers that fail to be allocated
 2013-04-25 21:22:35 -07:00
Scott Main
22e9225ab1 am 5e5aeb46: Merge "fix javadoc build also add some docs to the service" into jb-mr2-dev 
* commit '5e5aeb46849e21b605ef59a691bca478eb4fa380':
  fix javadoc build also add some docs to the service
 2013-04-25 21:22:33 -07:00
Amith Yamasani
83a6142173 am bbd90f8e: Merge "Hide isLinkedUser()" into jb-mr2-dev 
* commit 'bbd90f8e7051fde96092cacdebc5d94ce46c7140':
  Hide isLinkedUser()
 2013-04-25 21:22:31 -07:00
Matthew Xie
7a21c4cdb1 am 7f3c5d16: Merge "Added flush() for bluetooth output stream" into jb-mr2-dev 
* commit '7f3c5d164fd34e77b783e8c09b65645a1b143f6a':
  Added flush() for bluetooth output stream
 2013-04-25 21:22:29 -07:00
Kristian Monsen
501bf50355 am 58665709: Merge "Workaround for bug 8700358: Reproducible WebView crash in Feedly starting in JWR22B" into jb-mr2-dev 
* commit '5866570947a7ef325f74d9dbfc1ccbdd02d3e7b6':
  Workaround for bug 8700358: Reproducible WebView crash in Feedly starting in JWR22B
 2013-04-25 21:22:26 -07:00
Scott Main
22f6a60e62 Merge "add docs for new attributes, including account restriction for restricted profiles" into jb-mr2-dev 2013-04-26 03:26:12 +00:00
Chris Craik
addc906f70 Merge "Force clipping on layers that fail to be allocated" into jb-mr2-dev 2013-04-26 02:15:45 +00:00
Scott Main
b40c1fdaee add docs for new attributes, including account restriction for restricted profiles 
Change-Id: I737ea55bfa58562b1b384e52626e95b479759376
 2013-04-25 19:05:55 -07:00
Scott Main
5e5aeb4684 Merge "fix javadoc build also add some docs to the service" into jb-mr2-dev 2013-04-26 01:57:00 +00:00
Amith Yamasani
bbd90f8e70 Merge "Hide isLinkedUser()" into jb-mr2-dev 2013-04-26 01:42:20 +00:00
Matthew Xie
7f3c5d164f Merge "Added flush() for bluetooth output stream" into jb-mr2-dev 2013-04-26 01:18:34 +00:00
Alan Viverette
e7a4e636ac Revert change f449c0c381. 
Previously, onHoverEvent() would return true if a view was hoverable
and consume the event. After the change, it would return the result of
dispatchGenericMotionEventInternal(). As a result, touch exploration
caused multiple hover events to be sent from every view under a given
touch point. This change reverts to the original behavior and fixes
touch exploration.

BUG: 8723842
Change-Id: I0c7362f19c51bf21ed842711a03b7f02613958d2
 2013-04-25 17:32:45 -07:00
Svetoslav
afab4fd00b am c6eeacd9: am c38bc5ab: Merge "Lockscreen widgets not always announced." into jb-mr2-dev 
* commit 'c6eeacd9341c0348c2eb29d1808eb17ea08464f4':
  Lockscreen widgets not always announced.
 2013-04-25 17:14:33 -07:00
Michael Wright
b31c361077 resolved conflicts for merge of f652551b to master 
Change-Id: I210f0e45d9163a8f5b70f99eba38f343c621a8e7
 2013-04-25 17:09:58 -07:00
Kristian Monsen
5866570947 Merge "Workaround for bug 8700358: Reproducible WebView crash in Feedly starting in JWR22B" into jb-mr2-dev 2013-04-26 00:06:16 +00:00
Jeff Sharkey
60c7acaaf9 Merge "Track foreground activities in battery stats." 2013-04-26 00:02:49 +00:00
Scott Main
04667dae3a fix javadoc build 
also add some docs to the service

Change-Id: I712710de403bc000c0a69a2de726bace6e7873bd
 2013-04-25 17:01:53 -07:00
Jeff Sharkey
3e013e85b0 Track foreground activities in battery stats. 
To help correlate battery usage against actual foreground app usage,
start tracking time on a per UID basis.  It uses the nesting feature
of StopwatchTimer to track multiple PIDs inside the same UID.

Improves units on docs, and persists foreground CPU time with a
consistent ordering.  Reports foreground activities time and
foreground CPU time.

Change-Id: I95d12963923e3fd421730f6fbfc842dfd8d3a055
 2013-04-25 17:01:37 -07:00
Daniel Sandler
914dcfd093 am ca12d755: am 027f84c3: Merge "API: getPkg() -> getPackageName()" into jb-mr2-dev 
* commit 'ca12d75577afb7063af4cae1e6b989eec905cd58':
  API: getPkg() -> getPackageName()
 2013-04-25 17:01:13 -07:00
Daniel Sandler
06cacff626 am 4064af9b: am a7b6cbf1: Merge "API cleanup: NotificationListener" into jb-mr2-dev 
* commit '4064af9b096dfdf317d158c8aafd396c86f3fd0a':
  API cleanup: NotificationListener
 2013-04-25 17:01:10 -07:00
Svetoslav
c6eeacd934 am c38bc5ab: Merge "Lockscreen widgets not always announced." into jb-mr2-dev 
* commit 'c38bc5ab6b55804c7a8d440cf2bf249baa2efc98':
  Lockscreen widgets not always announced.
 2013-04-25 16:57:56 -07:00
Michael Wright
f652551b3b am b044c40c: Merge "Fixed javadoc in input related classes" into jb-mr2-dev 
* commit 'b044c40c154ba8abe62154608812ad87993ca0d8':
  Fixed javadoc in input related classes
 2013-04-25 16:57:52 -07:00
Daniel Sandler
ca12d75577 am 027f84c3: Merge "API: getPkg() -> getPackageName()" into jb-mr2-dev 
* commit '027f84c310158edfc94d94ab0ef0480843d49d3b':
  API: getPkg() -> getPackageName()
 2013-04-25 16:57:45 -07:00
Daniel Sandler
4064af9b09 am a7b6cbf1: Merge "API cleanup: NotificationListener" into jb-mr2-dev 
* commit 'a7b6cbf1a3fe91bdbb01edd9a656a62c40c302fd':
  API cleanup: NotificationListener
 2013-04-25 16:57:43 -07:00
Chris Craik
eaddac6d26 Force clipping on layers that fail to be allocated 
bug:8666842

In SW rendering, a previous optimization avoided clipping to the
bounds of views that are layers. This breaks if the view fails to
create a layer (such as if it's too big), so instead look at whether
the view has a layer.

Change-Id: I653882035512012aefd91f06ff0bdc73aa5e4430
 2013-04-25 15:32:40 -07:00
Romain Guy
281f422686 Merge "Revert "Skip 2nd measure pass whenever possible"" 2013-04-25 21:56:07 +00:00
Romain Guy
1b7c791adf Revert "Skip 2nd measure pass whenever possible" 
This reverts commit e8fb03c058.
 2013-04-25 14:55:28 -07:00
Svetoslav
c38bc5ab6b Merge "Lockscreen widgets not always announced." into jb-mr2-dev 2013-04-25 21:49:00 +00:00
Michael Wright
b044c40c15 Merge "Fixed javadoc in input related classes" into jb-mr2-dev 2013-04-25 21:43:03 +00:00
Daniel Sandler
027f84c310 Merge "API: getPkg() -> getPackageName()" into jb-mr2-dev 2013-04-25 21:03:55 +00:00
Daniel Sandler
6064df5c64 am fa1c4430: am 5e97c317: Merge "New NotificationListener API: getActiveNotifications()" into jb-mr2-dev 
* commit 'fa1c443063f3d3a98c4f3bb71689fb3e1d4c6c37':
  New NotificationListener API: getActiveNotifications()
 2013-04-25 13:50:40 -07:00