Adam Powell
1e1ccfb88b
Merge "Fix a monkey bug with AbsListView data set observers" into jb-mr2-dev
2013-04-10 01:35:22 +00:00
Mathias Agopian
57d019e222
rework GLSurfaceView so it can use the choreographer
...
GLSurfaceView will now automatically use the Choreographer to
schedule render updates on VSYNC. This happens only in
RENDERMODE_CONTINUOUSLY.
GLSurfaceView was rewriten to use a Looper and a HandlerThread
instead of a custom thread.
The basic mode of operation is unchanged, however the implementation
is largely different.
Removed support for older GPUs which had a limited number of contexts.
Bug: 8485730
Change-Id: I7b270f7ad7bb1259e858429054b1c8c9cc159dc6
2013-04-09 17:55:32 -07:00
Adam Powell
bd1dd0d51a
Fix a monkey bug with AbsListView data set observers
...
Several conditions can cause an AbsListView's data set observer to be
removed and nulled out. If for some reason the view receives duplicate
onDetachedFromWindow events this could cause AbsListView to attempt to
unregister a null observer. Skip this unregister process if this
happens.
Bug 7088152
Change-Id: Ib0c630d1ee598640512023e4ef158f01e3ed474d
2013-04-09 17:46:15 -07:00
Robert Greenwalt
0c455f3d6f
am 20495d2a: Merge "Fix crash bug with mismatched iface names" into jb-mr2-dev
...
* commit '20495d2a9fddfe712e04bde6a056f9fb058876d5':
Fix crash bug with mismatched iface names
2013-04-09 17:13:06 -07:00
Christopher Tate
32a019d438
Implicitly enable system apps when updates installed
...
If someone explicitly installs an update to a system-bundled package,
we infer that this means they actually want to use the new code.
Bug 7467302
Change-Id: If2dc6f764bafbb3a5c94cbdd32273c030fd784b9
2013-04-09 17:11:55 -07:00
Robert Greenwalt
20495d2a9f
Merge "Fix crash bug with mismatched iface names" into jb-mr2-dev
2013-04-10 00:08:01 +00:00
Adam Powell
3431f7ed15
am 2c966932: Merge "Fix for ActionBar#setSelectedNavigationItem() in collapsed tab mode" into jb-mr2-dev
...
* commit '2c9669320f6eb7227dd66fb8fe6cce3d39a56f06':
Fix for ActionBar#setSelectedNavigationItem() in collapsed tab mode
2013-04-09 16:43:36 -07:00
Adam Powell
2c9669320f
Merge "Fix for ActionBar#setSelectedNavigationItem() in collapsed tab mode" into jb-mr2-dev
2013-04-09 23:40:12 +00:00
Wink Saville
a66a77fc16
am e5ac8217: Update function comment for getAllCellInfo
...
* commit 'e5ac8217727e792fc378e70d7439b373952e7674':
Update function comment for getAllCellInfo
2013-04-09 16:27:05 -07:00
Wink Saville
e5ac821772
Update function comment for getAllCellInfo
...
Bug: 8235566
Change-Id: Iae9b11480605d5302ee45601d1357fc07f9bd3e1
2013-04-09 16:19:27 -07:00
Tim Murray
f8c033db1e
Implement RS GC worker thread.
...
Bug 8579360
Change-Id: I98a5509b68e592bcbb4958f2ca72c236a22910b5
2013-04-09 16:01:23 -07:00
Jason Sams
b05d689653
Cleanup Allocation and add 3D copies.
...
bug 8567058
Change-Id: Ib05ff3de851bccfea1531ca6c1801153632a2a85
2013-04-09 15:59:24 -07:00
Wink Saville
5b8971f3e6
am 0a17eb09: Merge "Add FW support for CellInfo RIL commands." into jb-mr2-dev
...
* commit '0a17eb09f0639ae93747b4bbdbfa2d04b3804d80':
Add FW support for CellInfo RIL commands.
2013-04-09 15:57:25 -07:00
Wink Saville
0a17eb09f0
Merge "Add FW support for CellInfo RIL commands." into jb-mr2-dev
2013-04-09 22:50:00 +00:00
Jamie Gennis
bb2e031ace
am 65b08486: Merge "Add APIs for application-generated systrace events" into jb-mr2-dev
...
* commit '65b08486fde649e6dd11f17808e7aa85101dea93':
Add APIs for application-generated systrace events
2013-04-09 15:36:17 -07:00
Jamie Gennis
65b08486fd
Merge "Add APIs for application-generated systrace events" into jb-mr2-dev
2013-04-09 22:30:52 +00:00
Maxim Siniavine
5877687b38
Make download manager tests more reliable.
...
Use larger files in tests. Using small files fails because downloads
complete too quickly. Using files that are too large fails because
downloads take too long.
Change-Id: I0786ece21e0acffa09dd8d85abf70ec4cde5e477
2013-04-09 15:08:43 -07:00
Jean-Michel Trivi
3fbf67e217
Handle seek requests in AudioService
...
AudioService handles seek requests to RemoteControlClients.
Discard old or unprocessed seek requests when handling a new one.
Update javadoc for OnPlaybackPositionUpdateListener interface.
bug 8120740
Change-Id: Id17c2852b24d4b8af85e472a177484b98cfeba05
2013-04-09 14:37:26 -07:00
Romain Guy
52706c6cc0
am 4a745e78: Merge "Change the dither texture\'s swizzling" into jb-mr2-dev
...
* commit '4a745e78bb1a3fdb4d28e71ddccd9709df7db4b1':
Change the dither texture's swizzling
2013-04-09 14:20:05 -07:00
Chiao Cheng
3e41c7c9ba
am 2355d131: Adding public api support for finding contact changes.
...
* commit '2355d13154d50687c0d8d74ea1c0e41ab9d88e7e':
Adding public api support for finding contact changes.
2013-04-09 14:20:02 -07:00
Romain Guy
4a745e78bb
Merge "Change the dither texture's swizzling" into jb-mr2-dev
2013-04-09 21:18:46 +00:00
Chiao Cheng
2355d13154
Adding public api support for finding contact changes.
...
DeletedContacts holds a log of deleted contacts which will be pruned
after a certain amount of time.
A timestamp field has been added to contacts so clients can query
for changes.
Bug: 8182147
Change-Id: Ic6e56e567892712da3c3941400dfb3ddc565aaac
2013-04-09 14:12:31 -07:00
Adam Powell
daa1d56726
Fix for ActionBar#setSelectedNavigationItem() in collapsed tab mode
...
Make sure the selected item is properly propagated to the collapsed
spinner.
Bug 6754308
Change-Id: Iaa4e331b00106b31c5984980d33e3ac88853ae4d
2013-04-09 13:57:22 -07:00
Derek Sollenberger
45fa0cbc54
Ensure that a canvas is always backed by some form of SkDevice.
...
bug: 8518884
Change-Id: Id6c597179878ce5b938c00422e88bef5f12e2e1f
2013-04-09 16:36:55 -04:00
Jonathan Dixon
a9b3334688
am f38b070b: Merge "Hide PlusinsEnabled/PluginsPath methods" into jb-mr2-dev
...
* commit 'f38b070b31269e974298ec9e644814bcc2663c91':
Hide PlusinsEnabled/PluginsPath methods
2013-04-09 13:15:27 -07:00
Jonathan Dixon
f38b070b31
Merge "Hide PlusinsEnabled/PluginsPath methods" into jb-mr2-dev
2013-04-09 20:09:29 +00:00
Jamie Gennis
f9c7d6bc15
Add APIs for application-generated systrace events
...
This change adds new APIs to enable applications to generate custom Systrace
begin/end events. Application-generated events use the ATRACE_APP_TAG tag,
which is enabled only if either the application has declared itself debuggable
in its manifest or ro.debuggable is set to 1 on the device.
Change-Id: I311d09e2e6ed1a30f5ffa84907f250e11cc0d48d
2013-04-09 11:59:43 -07:00
Robert Greenwalt
273703935d
am dbf500aa: Merge "Turn back on global proxy support." into jb-mr2-dev
...
* commit 'dbf500aaafd0889aa3ac9bf0fb2b2be4e0c3ebbf':
Turn back on global proxy support.
2013-04-09 11:19:34 -07:00
Robert Greenwalt
dbf500aaaf
Merge "Turn back on global proxy support." into jb-mr2-dev
2013-04-09 18:15:06 +00:00
Scott Main
92bc5d5c7d
am b4c13c4b: am 405c6e2d: am d3724e02: am 2568d7f0: am 0bf013fd: am f417fc4a: fix xml error in sample
...
* commit 'b4c13c4b045f4d96c377ba1fb9d834c111412a8c':
fix xml error in sample
2013-04-09 10:53:13 -07:00
Scott Main
b4c13c4b04
am 405c6e2d: am d3724e02: am 2568d7f0: am 0bf013fd: am f417fc4a: fix xml error in sample
...
* commit '405c6e2d656b628262ff3e3d0b79f58a46c839ec':
fix xml error in sample
2013-04-09 10:50:29 -07:00
Scott Main
405c6e2d65
am d3724e02: am 2568d7f0: am 0bf013fd: am f417fc4a: fix xml error in sample
...
* commit 'd3724e02d898b66a5b94cf0f2d3bbfaec5295b32':
fix xml error in sample
2013-04-09 10:47:50 -07:00
Scott Main
d3724e02d8
am 2568d7f0: am 0bf013fd: am f417fc4a: fix xml error in sample
...
* commit '2568d7f0cb9ee568309a0347805a12b9e771b689':
fix xml error in sample
2013-04-09 10:43:38 -07:00
Dianne Hackborn
e9b4ee692c
am 558a3c1b: Merge "Kill processes when permissions are revoked." into jb-mr2-dev
...
* commit '558a3c1b7b40eb9356f8c4446ca63af8cf16bd91':
Kill processes when permissions are revoked.
2013-04-09 10:42:09 -07:00
Scott Main
2568d7f0cb
am 0bf013fd: am f417fc4a: fix xml error in sample
...
* commit '0bf013fdbd11a18c010147aed5899034172feb9a':
fix xml error in sample
2013-04-09 10:41:03 -07:00
Baligh Uddin
0e45086dff
am 5660b484: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit '5660b4843ed1471b3b5318b77367dda7960596a1':
Import translations. DO NOT MERGE
2013-04-09 10:38:37 -07:00
Scott Main
0bf013fdbd
am f417fc4a: fix xml error in sample
...
* commit 'f417fc4a4f6aa577e0af08776825aa4569638f51':
fix xml error in sample
2013-04-09 10:38:18 -07:00
Dianne Hackborn
558a3c1b7b
Merge "Kill processes when permissions are revoked." into jb-mr2-dev
2013-04-09 17:38:00 +00:00
Baligh Uddin
5660b4843e
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-04-09 17:34:24 +00:00
Scott Main
f417fc4a4f
fix xml error in sample
...
Change-Id: I59ca15028c52e0be081f4e65308f88e06115f7fd
2013-04-09 10:29:00 -07:00
Raph Levien
d2773b5cf8
am 37605412: Merge "Update Droid Serif" into jb-mr2-dev
...
* commit '376054121edc62e88b2e3f69ce3397fac557bc64':
Update Droid Serif
2013-04-09 10:14:58 -07:00
Romain Guy
032d47af73
Change the dither texture's swizzling
...
This is a more elegant way to sample from a float alpha texture.
Instead of sampling from the red channel in the fragment shader
we can set the alpha channel swizzle to redirect it to the
red channel. This lets us sample from the alpha channel in the
fragment shader and get the correct value.
Change-Id: I95bbf7a82964e1bf42c0fee1b782b6bdbbcef618
2013-04-09 10:12:47 -07:00
Raph Levien
376054121e
Merge "Update Droid Serif" into jb-mr2-dev
2013-04-09 17:10:56 +00:00
Daniel Sandler
800d99f6b5
am 9fa49cc3: Merge "Fix [-] buttons in the notification builder test." into jb-mr2-dev
...
* commit '9fa49cc3308f6af593d780581121afc3c1d7e046':
Fix [-] buttons in the notification builder test.
2013-04-09 07:40:22 -07:00
Daniel Sandler
9fa49cc330
Merge "Fix [-] buttons in the notification builder test." into jb-mr2-dev
2013-04-09 14:34:20 +00:00
Daniel Sandler
72dcb91393
Fix [-] buttons in the notification builder test.
...
(Broken by change I9fae5a4a).
Bug: 8564511
Change-Id: I0d5b65e6678018630c812c5616e9b3f068029e66
2013-04-09 13:34:04 +00:00
The Android Automerger
446250cc4b
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-09 05:55:37 -07:00
Michael Jurka
7449844f69
am 104ca45a: Merge "Fix janky icon fade-in animation in Recents" into jb-mr2-dev
...
* commit '104ca45a046cf6f056d84799f6a161c8befe7522':
Fix janky icon fade-in animation in Recents
2013-04-08 23:10:14 -07:00
Michael Jurka
104ca45a04
Merge "Fix janky icon fade-in animation in Recents" into jb-mr2-dev
2013-04-09 06:04:36 +00:00
Dianne Hackborn
f1b782427f
Kill processes when permissions are revoked.
...
Some permissions are associated with gids, so we need to
kill any running processes if their permission is revoked.
We will do this for any permission being revoked, since
the association between gids and permissions can change
over time.
Change-Id: Ieb7408e032539c4f21eb089d65a7a7e6c289f010
2013-04-08 22:28:59 -07:00