Scott Main
5a876b4ce0
add since flag for ICS
...
Change-Id: Id6d82f0ecd9f24af85a0fa7c4e712e4ea8a59bb3
2011-07-27 18:18:57 -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
Svetoslav Ganov
93b2182a2e
AccessibilityNodeInfo reports no children for the topmost view in the tree.
...
1. My previous change to restrain AccessibilityNodeInfo to report children
if it is root namespace did not take into account that the tompost view
i.e. the decor view actually is a root namespace. Adding check to allow
the info to report children of rthe topmost view but do not do so if a
descendant is flagged as root namespace.
bug:5086988
Change-Id: Ib82b8ebe5a2c287ab1c5333d130ec50eb9ced78c
2011-07-27 16:02:55 -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
Xavier Ducrohet
4d1fa60bfe
Merge "DO NOT MERGE. may fix build on some version of gcc"
2011-07-27 13:45:05 -07:00
Scott Main
5465e054d3
cherrypick Change-Id: I3f72534db2944ff447da8f6564ad0cfd1b6674f0
...
docs: add release notes to several platforms for rendering library updates
Change-Id: I44f8dca5be10d945c044307a694fc2f254b40d8f
2011-07-27 13:38:20 -07:00
Scott Main
541d1b9883
cherrypick Change-Id: Ibbbb2a9ba9c4d6c72c8781027850726ba7c548e0
...
docs: add new orientation types.
issue 5050865
Change-Id: Idcc557734dbaa4e5631fb7459905cd4bd69a2581
2011-07-27 13:37:01 -07:00
Scott Main
ca4cc3cf65
cherrypick Change-Id: I9f4688a7eb3dfc22f423c114befc665f7f83f168
...
docs: add JNI Tips doc to the dev guide sidenav
Change-Id: I7522ba8bcad96d5c424f7e894e62ceb700df3027
2011-07-27 13:35:04 -07:00
Scott Main
de8a90ce51
Merge "cherrypick Change-Id: I213711f4b5d867ba91c961a2f098b6cc415cfcb3 docs: clarify framelayout class summary, issue 5055437"
2011-07-27 13:34:12 -07:00
Daniel Sandler
88d6877223
Restore status icons to former size & opacity on tablets.
...
Bug: 5086130
Change-Id: Ie1d86f8d40882d0f8193a85295a5a45ce0fe53c5
2011-07-27 16:33:39 -04:00
Scott Main
812634c236
cherrypick Change-Id: I213711f4b5d867ba91c961a2f098b6cc415cfcb3
...
docs: clarify framelayout class summary, issue 5055437
Conflicts:
core/java/android/view/View.java
core/java/android/widget/FrameLayout.java
Change-Id: Ia446d2d4cc798757d7aea104cfaf75fc2315dc50
2011-07-27 13:22:35 -07:00
Christopher Tate
3c6c3ddb6a
Merge "Don't actually try to stop processes marked 'persistent'"
2011-07-27 12:41:42 -07:00
Scott Main
88409f84bf
Merge "cherrypick Change-Id: I09778f0795dcb5d87cde652bfb7d514a0dfd9782 docs: add documentation about market multiple apk support"
2011-07-27 12:35:48 -07:00
Scott Main
56e1debe92
cherrypick Change-Id: I09778f0795dcb5d87cde652bfb7d514a0dfd9782
...
docs: add documentation about market multiple apk support
Change-Id: I65815f86890ca51009bdcfa89ab7733bba2881eb
2011-07-27 12:34:48 -07:00
Scott Main
90334b8d67
Merge "cherrypick Change-Id: Ib8e73aabb6369a25599aca2351f69cc56333578e docs: clarify that the market app responds to http urls"
2011-07-27 12:34:24 -07:00
Scott Main
1698fd608c
cherrypick Change-Id: Ib8e73aabb6369a25599aca2351f69cc56333578e
...
docs: clarify that the market app responds to http urls
Change-Id: Ie9afca5d2e3072bd85c4eb7da1debbf1b5ec02a0
2011-07-27 12:33:10 -07:00
Scott Main
4d1e80f8f3
Merge "cherrypick Change-Id: Iaada8d42f97786d393743cd7fc3011da1d21f22e docs: resolve issue 5044273 and fix markup error"
2011-07-27 12:32:40 -07:00
Scott Main
34235c6ede
cherrypick Change-Id: Iaada8d42f97786d393743cd7fc3011da1d21f22e
...
docs: resolve issue 5044273 and fix markup error
Change-Id: Ic028292245c14cca218ea9ac771f292254577e7c
2011-07-27 12:27:39 -07:00