Anwar Ghuloum
27ff7ba394
Merge "More stats for meminfo"
2013-05-23 22:13:52 +00:00
Anwar Ghuloum
9a78222df2
Merge "break out boot.art"
2013-05-23 22:13:28 +00:00
Anwar Ghuloum
17082e0452
Merge "Break out Oat footprint for ram"
2013-05-23 22:13:04 +00:00
Dmitry Shmidt
130a27ae8d
Merge "wifi: Use 'IFNAME=iface CMD' instead of 'CMD interface=iface Rest'"
2013-05-23 21:59:22 +00:00
Joe Fernandez
b735b151e7
am a44ff503: am 62f47bc2: am 22689bc5: am a8b2186b: am a502c59e: docs: Add FileProvider to Support Library r13 Release Notes
...
* commit 'a44ff5034fc64aa9cf2cf288ff548b591518cd64':
docs: Add FileProvider to Support Library r13 Release Notes
2013-05-23 14:11:47 -07:00
Joe Fernandez
a44ff5034f
am 62f47bc2: am 22689bc5: am a8b2186b: am a502c59e: docs: Add FileProvider to Support Library r13 Release Notes
...
* commit '62f47bc29588e495a6f8efd082b34a92f8ec2098':
docs: Add FileProvider to Support Library r13 Release Notes
2013-05-23 14:08:51 -07:00
Jim Miller
a62996e3c5
am 2f567679: am 2f48c4a7: Merge "Check for invalid pointer index in PagedView" into jb-mr2-dev
...
* commit '2f567679f40ad0580928502972308ec540eeba3f':
Check for invalid pointer index in PagedView
2013-05-23 14:08:18 -07:00
Joe Fernandez
62f47bc295
am 22689bc5: am a8b2186b: am a502c59e: docs: Add FileProvider to Support Library r13 Release Notes
...
* commit '22689bc5e52a1c2f2d748440c0eeeebec17637c2':
docs: Add FileProvider to Support Library r13 Release Notes
2013-05-23 14:06:41 -07:00
Jim Miller
2f567679f4
am 2f48c4a7: Merge "Check for invalid pointer index in PagedView" into jb-mr2-dev
...
* commit '2f48c4a754ce40a0854791c1f4ddf61458fffafc':
Check for invalid pointer index in PagedView
2013-05-23 14:05:21 -07:00
Joe Fernandez
22689bc5e5
am a8b2186b: am a502c59e: docs: Add FileProvider to Support Library r13 Release Notes
...
* commit 'a8b2186b09a0f79b746d0fbab3611d95877af5fe':
docs: Add FileProvider to Support Library r13 Release Notes
2013-05-23 14:04:41 -07:00
Jim Miller
2f48c4a754
Merge "Check for invalid pointer index in PagedView" into jb-mr2-dev
2013-05-23 21:03:09 +00:00
Joe Fernandez
a8b2186b09
am a502c59e: docs: Add FileProvider to Support Library r13 Release Notes
...
* commit 'a502c59e679c1b355d6ad3387449d82c590d84cf':
docs: Add FileProvider to Support Library r13 Release Notes
2013-05-23 14:01:23 -07:00
Dmitry Shmidt
fa0e6d5231
wifi: Use 'IFNAME=iface CMD' instead of 'CMD interface=iface Rest'
...
Change-Id: Iad7389a9030c9f8a697b147941a8f296db6eb08d
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-05-23 13:19:37 -07:00
Andrew Wilson
d078990429
am f25b876c: am 55bf965e: Merge "Compare binder instances when checking if listeners match." into jb-mr2-dev
...
* commit 'f25b876c8d0a8abb235d6509ceaad218240fca46':
Compare binder instances when checking if listeners match.
2013-05-23 13:10:51 -07:00
Andrew Wilson
f25b876c8d
am 55bf965e: Merge "Compare binder instances when checking if listeners match." into jb-mr2-dev
...
* commit '55bf965e89df5986a7a988c2b1ec2cd9f01edb56':
Compare binder instances when checking if listeners match.
2013-05-23 13:08:04 -07:00
Romain Guy
6080940411
Merge "Add PerfHUD ES profiling capabilities"
2013-05-23 19:50:58 +00:00
Romain Guy
e9bc11f712
Add PerfHUD ES profiling capabilities
...
The eglGetSystemTimeNV extension can be used to enable profiling
in PerfHUD ES. When the delta of two calls to eglGetSystemTimeNV
equals 0, we now cancels display lists updates. This allows the
tool to redraw the same frame several times in a row to run its
analysis.
For better results profiling should only be attempted after
setting viewroot.profile_rendering to true using adb shell
setprop.
Change-Id: I02e3c237418004cff8d6cb0b9a37126efae44c90
2013-05-23 12:50:13 -07:00
Anwar Ghuloum
3a8ce1bec8
More stats for meminfo
...
Added shared clean tracking (for pageable stuff). Renamed .oat and .art mmap.
(cherry picked from commit 967d53b17b6010c3a675ca9c3bbd0e9dd2f2f092)
Change-Id: I741e0dbe0d3f9aee6975c6fad8af9905942962d4
2013-05-23 12:29:59 -07:00
Anwar Ghuloum
88887d0a53
break out boot.art
...
breaking out boot.art mapped pages
(cherry picked from commit eaa3f2d59adaeb87cd8d1726b696521f984659c4)
Change-Id: Ie89477bd3a93a15de3a4db76ef5eae497c3087e3
2013-05-23 12:29:37 -07:00
Anwar Ghuloum
8884ef4fe8
Break out Oat footprint for ram
...
Breaking out oat footprint in meminfo.
(cherry picked from commit c92f177d96b5952e0bfde01597972fc607aed93a)
Change-Id: I7b0452045c265b7544c41d3a5953e10a081c5315
2013-05-23 12:28:08 -07:00
Alan Viverette
ac5b347d03
Merge "Fix number picker accessibility focus."
2013-05-23 18:57:12 +00:00
Andrew Wilson
55bf965e89
Merge "Compare binder instances when checking if listeners match." into jb-mr2-dev
2013-05-23 18:47:48 +00:00
Chet Haase
341ac60009
am 1bf58a5a: am cfbbc864: Merge "Restore previous alpha value on noop\'d DisplayList operations" into jb-mr2-dev
...
* commit '1bf58a5a4c3275a8de676046da311ec0c3c61c78':
Restore previous alpha value on noop'd DisplayList operations
2013-05-23 11:28:05 -07:00
Chet Haase
1bf58a5a4c
am cfbbc864: Merge "Restore previous alpha value on noop\'d DisplayList operations" into jb-mr2-dev
...
* commit 'cfbbc864da1b7a9ed64807f9072c5730c421b4ef':
Restore previous alpha value on noop'd DisplayList operations
2013-05-23 11:25:34 -07:00
Chet Haase
cfbbc864da
Merge "Restore previous alpha value on noop'd DisplayList operations" into jb-mr2-dev
2013-05-23 18:23:34 +00:00
Joe Fernandez
a502c59e67
docs: Add FileProvider to Support Library r13 Release Notes
...
Change-Id: I9a87312f1bb5d4a18c720a9c3d3a558240450f6d
2013-05-23 11:16:09 -07:00
kmccormick
664ed997a2
am e5f8b6ed: am 5482b65a: am 88f24e6f: am 84fb096e: am e56e2483: am 7b1adeb8: am c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs
...
* commit 'e5f8b6ed87274171e3adcc36aec272cd3060112e':
Doc update: fix GCM TOC
2013-05-23 11:05:35 -07:00
kmccormick
e5f8b6ed87
am 5482b65a: am 88f24e6f: am 84fb096e: am e56e2483: am 7b1adeb8: am c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs
...
* commit '5482b65ae8d3d02fa4b07a2221b3f00079c9aa80':
Doc update: fix GCM TOC
2013-05-23 11:01:50 -07:00
kmccormick
5482b65ae8
am 88f24e6f: am 84fb096e: am e56e2483: am 7b1adeb8: am c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs
...
* commit '88f24e6fe8b854f43bebc77c891228a28a503cd9':
Doc update: fix GCM TOC
2013-05-23 10:56:56 -07:00
kmccormick
88f24e6fe8
am 84fb096e: am e56e2483: am 7b1adeb8: am c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs
...
* commit '84fb096ee7a4f6d2af7dab6e18063ed029e0ff94':
Doc update: fix GCM TOC
2013-05-23 10:54:10 -07:00
kmccormick
84fb096ee7
am e56e2483: am 7b1adeb8: am c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs
...
* commit 'e56e2483c57f9d6a12421ca7e124e7ec0e61f0ab':
Doc update: fix GCM TOC
2013-05-23 10:51:49 -07:00
kmccormick
e56e2483c5
am 7b1adeb8: am c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs
...
* commit '7b1adeb80ae87e9eff90aa01bae35053fc74c66f':
Doc update: fix GCM TOC
2013-05-23 10:49:58 -07:00
kmccormick
7b1adeb80a
am c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs
...
* commit 'c6c149aa14610925158ef1ba6320c9356e45e631':
Doc update: fix GCM TOC
2013-05-23 10:47:13 -07:00
kmccormick
c6c149aa14
Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs
2013-05-23 17:45:26 +00:00
Baligh Uddin
5dbeb6521c
am bc25a20e: (-s ours) am a9a0409d: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit 'bc25a20e3891c83e516b6e5c94b404ab85a2e150':
Import translations. DO NOT MERGE
2013-05-23 09:18:12 -07:00
Baligh Uddin
5e9fc2f0e1
Merge "Import translations. DO NOT MERGE"
2013-05-23 16:15:57 +00:00
Baligh Uddin
bc25a20e38
am a9a0409d: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit 'a9a0409d626bc63c6cbd4b734ce8609559bb9540':
Import translations. DO NOT MERGE
2013-05-23 09:15:51 -07:00
Baligh Uddin
934fe05ebd
Merge "Import translations. DO NOT MERGE"
2013-05-23 16:14:49 +00:00
Baligh Uddin
a9a0409d62
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-05-23 16:14:16 +00:00
Nick Kralevich
db90a330ba
Merge "Move VelocityTracker.cpp to target build only"
2013-05-23 15:40:11 +00:00
The Android Open Source Project
f17771f2a5
am 701cf5e1: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '701cf5e1bf771953f084010fa2d73a41ce71ad6e':
Add a queue of pending finished input events.
2013-05-23 08:06:40 -07:00
The Android Open Source Project
701cf5e1bf
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I339cc5b68bd236440c5d2ccbbc800ffcd3a0e7c6
2013-05-23 08:05:15 -07:00
Chet Haase
c725903eec
Restore previous alpha value on noop'd DisplayList operations
...
Previously, when a DisplayList operation was rejected because it was not
in the clip bounds, the code would not properly restore the previous
state, leading to errors in alpha values of the noop'd op being applied
to unrelated operations later in the DisplayList.
Issue #9051935 Flash of grey background when transitioning to conversation view
Change-Id: I56645cc9ebf2e07be0228ca5e249213dbeb10d7d
2013-05-23 07:57:17 -07:00
Amith Yamasani
9a6d5fc5a1
am 77049e13: am 60b4afed: Merge "Fix account filtering for specific package name" into jb-mr2-dev
...
* commit '77049e1303bba3056c4a1353d3c03421d0ba27f7':
Fix account filtering for specific package name
2013-05-23 07:43:14 -07:00
Amith Yamasani
77049e1303
am 60b4afed: Merge "Fix account filtering for specific package name" into jb-mr2-dev
...
* commit '60b4afedbeea11983b748d0d8ea9032d177dd6e7':
Fix account filtering for specific package name
2013-05-23 07:41:09 -07:00
Amith Yamasani
60b4afedbe
Merge "Fix account filtering for specific package name" into jb-mr2-dev
2013-05-23 14:39:07 +00:00
The Android Automerger
be0e8b6700
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-23 05:55:19 -07:00
Baligh Uddin
187da85c39
Import translations. DO NOT MERGE
...
Change-Id: Iaf53e2af9ac67e74522a8e27e762c04eadf25468
Auto-generated-cl: translation import
2013-05-22 22:37:20 -07:00
Baligh Uddin
4e508f775c
Import translations. DO NOT MERGE
...
Change-Id: Ib740b1d34023b2b808a403bec217ca61cbae6e41
Auto-generated-cl: translation import
2013-05-22 22:23:39 -07:00
Baligh Uddin
b52156cd67
Import translations. DO NOT MERGE
...
Change-Id: I8af9de6adcf346f5d2b9241eceefdc42a4c42026
Auto-generated-cl: translation import
2013-05-22 22:14:01 -07:00