Wu-cheng Li
f0d6a48c6a
Add frame metadata parameter to camera data_callback.
...
bug:4460717
Change-Id: Ib47d7d7df20af8155a719f3dabefe030893bfebc
2011-07-29 07:14:38 +08:00
Jeff Sharkey
2043b01b20
Merge "Maintain separate "restrict background data" flag."
2011-07-27 22:08:02 -07:00
Jeff Sharkey
4664500de0
Maintain separate "restrict background data" flag.
...
Since "restrict background" depends on active networks, separate its
definition from setBackgroundDataSetting().
Bug: 4979025
Change-Id: I12bfe3a2e606375b39c67706270caa7a1bb0214e
2011-07-27 21:11:32 -07:00
Wink Saville
35a9c52791
am 5ad5c9e3: am d20f60c8: Merge "Support of LTE Only mode" into honeycomb-LTE
...
* commit '5ad5c9e3efd26155ae7b5d0f3e9e2094e1f65dfe':
Support of LTE Only mode
2011-07-27 20:41:23 -07:00
Wink Saville
5ad5c9e3ef
am d20f60c8: Merge "Support of LTE Only mode" into honeycomb-LTE
...
* commit 'd20f60c8a71ca0aa853bc433f74b32dcfc98f984':
Support of LTE Only mode
2011-07-27 20:39:09 -07:00
Wink Saville
d20f60c8a7
Merge "Support of LTE Only mode" into honeycomb-LTE
2011-07-27 20:35:52 -07:00
Ramesh Sudini
d5f8d84d45
Support of LTE Only mode
...
In CDMA-LTE hybrid mode, the service state is derived based on
CDMA state. However, CDMA radio is off while in LTE only mode
so thre will be no signal bar or data type icon displayed on
the status UI.
This patch handles LTE only mode scenario. The service state
is derived from LTE if CDMA is OOS and LTE only mode is used.
Bug: 5070240
Change-Id: Ie55daaf9eea1b16ca73312ebab208810b145d2bc
2011-07-27 20:34:15 -07:00
Romain Guy
b6f7a27c59
Merge "Reclaim more memory, more often."
2011-07-27 18:53:32 -07:00
Romain Guy
65b345fa22
Reclaim more memory, more often.
...
Yay.
Change-Id: I04557ad575c307a55088549f48f0e9ad994b7275
2011-07-27 18:51:50 -07:00
Xavier Ducrohet
395c86f7f6
am 6abf2f50: am 0b45ca88: am cd01ad7c: am 20339b24: Merge "Remove Debug Code"
...
* commit '6abf2f501e60132a5369ad5b15b388912c8e9e5b':
Remove Debug Code
2011-07-27 18:43:32 -07:00
Xavier Ducrohet
6abf2f501e
am 0b45ca88: am cd01ad7c: am 20339b24: Merge "Remove Debug Code"
...
* commit '0b45ca8884acfd2e9ccdcb3fbe641a46b116bda0':
Remove Debug Code
2011-07-27 18:40:49 -07:00
Xavier Ducrohet
0b45ca8884
am cd01ad7c: am 20339b24: Merge "Remove Debug Code"
...
* commit 'cd01ad7cc7813e3067826945c2a472602f1d3509':
Remove Debug Code
2011-07-27 18:38:50 -07:00
Xavier Ducrohet
cd01ad7cc7
am 20339b24: Merge "Remove Debug Code"
...
* commit '20339b24394be06c5bfe5157a4b35adc48f665eb':
Remove Debug Code
2011-07-27 18:36:17 -07:00
Chia-chi Yeh
fcbb492486
Merge "Unhide APIs for user space VPN."
2011-07-27 18:35:51 -07:00
Ying Wang
00fd1fc9b3
Merge "Fix uses of all-subdir-makefiles"
2011-07-27 18:29:26 -07:00
Xavier Ducrohet
20339b2439
Merge "Remove Debug Code"
2011-07-27 18:26:01 -07:00
Jeff Sharkey
06a2895b58
Merge "Grant AID_NET_BW_STATS to system service."
2011-07-27 18:09:42 -07:00
Josiah Gaskin
7a09ccfb50
Remove Debug Code
...
This change removes debugging code from FileFinder.
This code was considered harmful because it uses the std::cout
from <iostream>.
Change-Id: Iad9b5e8a631883bd4854abdb29bc6df8a5b4a056
2011-07-27 17:45:32 -07:00
Dave Santoro
1d55c3343d
Added ACCOUNT_TYPE_AND_DATA_SET pseudo-column.
...
This was added to simplify some logic in the provider and app, as
there are places that can simply compare the concatenation of the
account type and data set.
Also added a DATA_SET extra for contact creation, to allow for this
value to be passed around via intents.
Bug 5077096
Change-Id: Ia0634cfcf4590fd90ccb5cb99360c38c86f08d25
2011-07-27 17:16:12 -07:00
Ying Wang
d84d6c7b1a
Fix uses of all-subdir-makefiles
...
We should use all-makefiles-under instead.
all-subdir-makefiles can be used only before any "include" statement.
Before this change, both subdirs were actually not included.
Change-Id: I6bf35d07f294a5012c9322096f999ac26e37432f
2011-07-27 16:59:08 -07:00
Gilles Debunne
041eb4bddb
Merge "Bug 4571327: error popup empty when displayed on top"
2011-07-27 16:47:26 -07:00
Daniel Sandler
6d96dd0140
Merge "Restore status icons to former size & opacity on tablets."
2011-07-27 16:36:11 -07:00
Ramesh Sudini
0aea293d15
am 8ce53e38: am 9a87deb5: DataConnection: Clear cid when entering inactive state.
...
* commit '8ce53e387e2b4427265ae9e43bc15d9fe850643d':
DataConnection: Clear cid when entering inactive state.
2011-07-27 16:35:41 -07:00
Ramesh Sudini
8ce53e387e
am 9a87deb5: DataConnection: Clear cid when entering inactive state.
...
* commit '9a87deb538caed347621e57c5c83e0185a963bb4':
DataConnection: Clear cid when entering inactive state.
2011-07-27 16:32:48 -07:00
Romain Guy
c8ec222cd8
Merge "Destroy layers and flush layers cache when a window is destroyed."
2011-07-27 16:31:19 -07:00
Jeff Sharkey
e516893097
Grant AID_NET_BW_STATS to system service.
...
NetworkManagementService is reading stats /proc/ files, which are now
being protected by GID.
Bug: 5087530
Change-Id: I29b35a97ab621999544b6acc8ad4cf72ee053b79
2011-07-27 16:30:00 -07:00
Romain Guy
6d7475d666
Destroy layers and flush layers cache when a window is destroyed.
...
Change-Id: I3fa1bc3ff50fb99e3d2e490925bd6b0a0f809fff
2011-07-27 16:29:39 -07:00
Irfan Sheriff
6f9e6ea8df
Merge "Will not disable wifi on wifi-only devices."
2011-07-27 16:09:18 -07:00
Jeff Brown
c8b7ac16c1
Merge "Reset input dispatcher targets when focus changes apps."
2011-07-27 15:54:57 -07:00
Kenny Root
4f35092af5
Merge "Move extract native libraries to JNI code"
2011-07-27 15:54:51 -07:00
Jeff Brown
3d5a703db8
Merge "Report the external display size to the input reader."
2011-07-27 15:54:50 -07:00
Jeff Brown
be922d6006
Merge "Handle stylus buttons and tool types."
2011-07-27 15:54:41 -07:00
Kenny Root
388432ac43
Merge "Change ZipFile flags anonymous enum"
2011-07-27 15:54:39 -07:00
Jeff Brown
d3cb204a7b
Merge "Drop hack for drivers that emit zero ABS_MT_TOUCH_MAJOR. Bug: 5064702"
2011-07-27 15:54:35 -07:00
Jeff Sharkey
d02fa35e8c
Merge "Revise data limit notifs, watch kernel alerts."
2011-07-27 15:52:24 -07:00
Mike Lockwood
ccc83629f9
Merge "UsbDeviceManager: Don't show USB notification for RNDIS"
2011-07-27 15:49:05 -07:00
Adam Powell
257466d4e2
Merge "Bug 5076788 - Optimize the building and invalidation of menus"
2011-07-27 15:47:04 -07:00
Chris Craik
24f2936d35
Merge "Use WebTextView overlay to render text fields/areas much faster"
2011-07-27 15:46:44 -07:00
Adam Powell
89b09da7b3
Bug 5076788 - Optimize the building and invalidation of menus
...
Fix cases that weren't batching menu presenter changes correctly.
Have FragmentManager invalidate the options menu less often.
Change-Id: Ia66fcd09ada8b0a084ad6b08d4340a8fa0c8fc5d
2011-07-27 15:37:58 -07:00
Svetoslav Ganov
e1b9259190
Merge "Not user generated accessibility events can change the interrogation allowing window."
2011-07-27 15:24:10 -07:00
Ramesh Sudini
9a87deb538
DataConnection: Clear cid when entering inactive state.
...
Bug: 5083242
Change-Id: I0657739da54bc424433063a2244d045e47411e5f
2011-07-27 15:04:24 -07:00
Glenn Kasten
43a5d6e541
Merge "Bug 4599730 Get audio channel count on MediaPlayer"
2011-07-27 14:45:28 -07:00
Isaac Levy
4ad39d6ac1
Will not disable wifi on wifi-only devices.
...
- Turn off watchdog by default on wifi-only devices, b/5073657
- Do not disable wifi networks if connectivity manager reports
no mobile connection.
Change-Id: I835e753624fc5e447081cde473039011721112c6
2011-07-27 14:39:33 -07:00
Irfan Sheriff
f92fbc5daf
Merge "Run hostapd on a seperate thread"
2011-07-27 14:20:21 -07:00
Jason Sams
a12036bc97
Merge "Add const to matrix by vector multiply routines. Cleanup ifdef for rsForEach."
2011-07-27 14:19:58 -07:00
Jason Sams
4575a8e4de
Add const to matrix by vector multiply routines.
...
Cleanup ifdef for rsForEach.
Change-Id: Id0d053f5dc73fef7dffed57ed02e90340b6cb798
2011-07-27 14:10:53 -07:00
Xavier Ducrohet
ccb722d5aa
am 64994077: (-s ours) am c682559d: (-s ours) am 4d21c773: am 4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc"
...
* commit '64994077347276fba4fe2eb1719c7dd2c2105073':
DO NOT MERGE. may fix build on some version of gcc
2011-07-27 14:08:27 -07:00
Xavier Ducrohet
6499407734
am c682559d: (-s ours) am 4d21c773: am 4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc"
...
* commit 'c682559d3c39aa4503d5c4d60ae046393aa45b79':
DO NOT MERGE. may fix build on some version of gcc
2011-07-27 14:03:35 -07:00
Xavier Ducrohet
c682559d3c
am 4d21c773: am 4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc"
...
* commit '4d21c7732c978a593dfa78f8da1fed7511b38e95':
DO NOT MERGE. may fix build on some version of gcc
2011-07-27 14:01:23 -07:00
Xavier Ducrohet
4d21c7732c
am 4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc"
...
* commit '4d1fa60bfe660fd0fc6671116da597c0027cbb16':
DO NOT MERGE. may fix build on some version of gcc
2011-07-27 13:59:57 -07:00