Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
50,025 Commits 3 Branches 0 Tags
294539df2c05eb62c417e25b2e1c8a71474b09e6
Commit Graph

17301 Commits

Author SHA1 Message Date
Amith Yamasani
648dc03cd0 am 4dbd1bc6: am 5f074067: am 712a8cca: Merge "VolumePreference.onActivityStop only stops playback" 
* commit '4dbd1bc6ae84cb4d0cd28922e917473ec6e53517':
  VolumePreference.onActivityStop only stops playback
 2011-08-12 13:16:21 -07:00
Amith Yamasani
712a8cca1f Merge "VolumePreference.onActivityStop only stops playback" 2011-08-11 12:29:34 -07:00
Wink Saville
7bb2d94249 am 090df1dc: Merge "Delay connectivity change notifications." into honeycomb-LTE 
* commit '090df1dc4188e5b9ef10a0aca5081a196085ff56':
  Delay connectivity change notifications.
 2011-08-04 16:11:41 -07:00
Wink Saville
090df1dc41 Merge "Delay connectivity change notifications." into honeycomb-LTE 2011-08-04 16:10:11 -07:00
Wink Saville
628b08530a Delay connectivity change notifications. 
Because changes to the route tables take time to propagate
we add a delay when sending out change notifications. This allows
applications, such as GTalk, to create sockets without encountering
a 3 minute timeout.

Bug: 5008488
Change-Id: I0eefb03a5d6358a58ea6ae5b4f697ff302b5511d
 2011-08-04 15:01:58 -07:00
Steve Block
03f8fcb8b0 am c4d93ba5: Cherry-pick DeviceMotionService CL from master [do not merge] 
* commit 'c4d93ba55fbe905fa72ee7a068efd7c5fb4e8257':
  Cherry-pick DeviceMotionService CL from master [do not merge]
 2011-08-04 14:49:44 -07:00
Steve Block
c4d93ba55f Cherry-pick DeviceMotionService CL from master [do not merge] 
In DeviceMotionService, handle the fact that we may receive updates from SensorManager after unregistering.

cherry-pick of Change: d09001fea4

Bug: 5110230
Change-Id: Id1d1f51b445ce4a14bfcdfad8f173922e01b6563
 2011-08-04 10:59:59 -07:00
Robert Greenwalt
86574d66da am 0d8acea9: Make copy-constructor make deep copy. 
* commit '0d8acea9bb452d1fdbb3d811041f7bdb1b0ef8a3':
  Make copy-constructor make deep copy.
 2011-07-29 09:20:51 -07:00
Robert Greenwalt
0d8acea9bb Make copy-constructor make deep copy. 
Used to grab immutables but now will copy the data so the result
is mutable and we don't get crashes.

bug:5051667
Change-Id: I0878bf8c58069055f528121541d1911f404cbe49
 2011-07-28 17:21:25 -07:00
Jeff Brown
d5d7e164d3 Support wrapping app processes to inject debug instrumentation. 
Bug: 4437846

Change-Id: Ib0559e5224b0fa0df074e485787307b6634e8654
 2011-07-28 14:00:27 -07:00
Robert Greenwalt
af75fdb165 resolved conflicts for merge of 41394a36 to honeycomb-plus-aosp 
Change-Id: Ic839eb7bd8081b94802dbbf9140b9d1fa0cf7df3
 2011-07-27 09:27:00 -07:00
Robert Greenwalt
41394a3610 Merge "Use dns proxy a bit." into honeycomb-LTE 2011-07-26 13:21:09 -07:00
Robert Greenwalt
572b7048a6 Use dns proxy a bit. 
Sets the current default interface and sets the dns per interface.
port of changes 23041 and 22098 from opensource.
bug:5060618

Change-Id: I80e7ef88727eeb8ff2b48059f69b270e5a6b5c16
 2011-07-25 17:00:13 -07:00
Robert Greenwalt
37e433fd1c Fix build. 
Add NetworkUtils function missed in manual merge.

Change-Id: Ifce8f2988bb581ddc9b971b8af07a32f46c91e14
 2011-07-25 14:00:42 -07:00
Robert Greenwalt
1993391694 am ad55d351: Add better routes for secondary DNS 
* commit 'ad55d35114237071133eb28ded93a014185d4e35':
  Add better routes for secondary DNS
 2011-07-22 13:15:56 -07:00
Robert Greenwalt
ad55d35114 Add better routes for secondary DNS 
We'd been doing no-gateway hostroutes for dns servers on secondary nets, but on
some devices (multi-homed stingray) this is a problem.  Add gateway-ed hostroutes
instead so the BP can do it's nonstandard "magical" demultiplexing.

bug:5011392
Change-Id: Ia48f69c8ddf2a37cfb8f014f078f96bf601d2ddb
 2011-07-22 12:52:21 -07:00
Robert Greenwalt
8550f3b86a resolved conflicts for merge of 0a46db5d to honeycomb-plus-aosp 
Change-Id: I0f1bea54d999ab3ef10400ee67bd4d3b2a5d1783
 2011-07-15 09:55:48 -07:00
Robert Greenwalt
0a46db5d88 Apply the dns and route diff which we get a change 
bug:5008973
Change-Id: Ib99e43d9d852452cc1f2aea6bef07bbd194f28cc
 2011-07-14 18:12:14 -07:00
Wink Saville
3810361e4a am 6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE 
* commit '6d1d16c324a681dd966d47497a71a02eac512234':
  Remove STOPSHIP but allow seamless Handoff when possible.
 2011-07-13 14:19:12 -07:00
Wink Saville
e822225f7a Remove STOPSHIP but allow seamless Handoff when possible. 
If an address is removed we must reset the connection but
only for the connections associated with that address. For
now we're doing the "all" addresses for a type (IPv6 or IPv4)
in the future we only need to reset a particular addresses
connections.


Bug: 4981919
Change-Id: I97f8071a3ed6f827ed22f32216ca5011bfe6c1d9
 2011-07-13 13:44:13 -07:00
Jaikumar Ganesh
6dd4531639 resolved conflicts for merge of ab3ec176 to honeycomb-plus-aosp 
Change-Id: I75fcd15f85f2cb3912ada1df453fb02bd13e5d85
 2011-07-13 12:29:57 -07:00
Jaikumar Ganesh
9ff89495a4 am 53cf7858: Merge "Bluetooth: correcting return value from cancelDiscovery" 
* commit '53cf7858c3fd36082302efdc4d848925bcc0001e':
  Bluetooth: correcting return value from cancelDiscovery
 2011-07-13 10:22:40 -07:00
Jaikumar Ganesh
53cf7858c3 Merge "Bluetooth: correcting return value from cancelDiscovery" 2011-07-13 10:04:19 -07:00
Wink Saville
e4a56a32ac am 8171e6f6: Use resetConnections with resetMask. 
* commit '8171e6f690cca1bad354e7e352823d79d420daf3':
  Use resetConnections with resetMask.
 2011-07-08 09:40:08 -07:00
Wink Saville
a736cd54e1 am 848aa3ab: Merge "No need to have BASE_DATA_CONNECTION_TRACKER start at 50000." into honeycomb-LTE 
* commit '848aa3ab8a00835c5af2ead954c7736e507249b5':
  No need to have BASE_DATA_CONNECTION_TRACKER start at 50000.
 2011-07-08 09:40:03 -07:00
Wink Saville
8171e6f690 Use resetConnections with resetMask. 
Bug: 4981919
Change-Id: I5dec2da0756d5083bc81494fd583672704537694
 2011-07-07 16:17:06 -07:00
Wink Saville
8735a07a64 No need to have BASE_DATA_CONNECTION_TRACKER start at 50000. 
Update comment that values should be changed after releasing.

Change-Id: I10ed6a0238e4f5be866dd97cfb56c5e7c84ddb52
 2011-07-07 14:16:30 -07:00
Robert Greenwalt
37dbfcaf83 am 7022db4c: am 2b62c4fb: am 38bb0123: Merge "Added methods to support dns cache per interface" 
* commit '7022db4cd2ca3721631595d7379eabb2cc77f6a9':
  Added methods to support dns cache per interface
 2011-07-06 07:48:21 -07:00
Robert Greenwalt
2b62c4fbfe am 38bb0123: Merge "Added methods to support dns cache per interface" 
* commit '38bb0123b8b9857c3119fd359739daf872f619d6':
  Added methods to support dns cache per interface
 2011-07-06 07:35:02 -07:00
Robert Greenwalt
38bb0123b8 Merge "Added methods to support dns cache per interface" 2011-07-01 09:26:50 -07:00
Dianne Hackborn
06ca9b90e6 am fa5e3b65: am 2dafe771: Merge "DO NOT MERGE. Fix density compat mode." into honeycomb-mr2 
* commit 'fa5e3b658f3f42eabec82c9f8e44d8a4cc565249':
  DO NOT MERGE.  Fix density compat mode.
 2011-06-24 12:43:44 -07:00
Dianne Hackborn
fa5e3b658f am 2dafe771: Merge "DO NOT MERGE. Fix density compat mode." into honeycomb-mr2 
* commit '2dafe771bb7ad4b15db6b740fd3ccb8f0fae836d':
  DO NOT MERGE.  Fix density compat mode.
 2011-06-24 12:26:17 -07:00
Dianne Hackborn
83e0bc18e0 DO NOT MERGE. Fix density compat mode. 
Fix issue #4770360: older app compatibility mode is really tiny on ICS phones

We were applying the density compat mode scaling multiple times to
display metrics, causing bad values.

Change-Id: Iafafd9a5e94b9d774cd2715bf968e91602a1bd82
 2011-06-23 12:29:03 -07:00
Irfan Sheriff
1cc0fa416f am db45e0bd: am ecce539f: Merge "Release wakelock after use" into honeycomb-mr2 
* commit 'db45e0bdd02c2b9416b89999422561929feb5cc0':
  Release wakelock after use
 2011-06-22 11:21:12 -07:00
Irfan Sheriff
a08c552083 am 38053dad: am 41b35884: Revert "DO NOT MERGE Revert "Fix lease duration handling"" 
* commit '38053dad9f8b988a162fba89545f4f7b8a09d34c':
  Revert "DO NOT MERGE Revert "Fix lease duration handling""
 2011-06-22 11:21:05 -07:00
Irfan Sheriff
5389c80d1f am cf99765b: resolved conflicts for merge of 914ed90f to honeycomb-LTE 
* commit 'cf99765b6255d73aa4fbc61d5bd78ec65fbd0370':
  Revert "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine""
 2011-06-22 11:19:09 -07:00
Irfan Sheriff
db45e0bdd0 am ecce539f: Merge "Release wakelock after use" into honeycomb-mr2 
* commit 'ecce539f3d739fbf4b395639a485fddf51f688d6':
  Release wakelock after use
 2011-06-22 11:10:26 -07:00
Irfan Sheriff
38053dad9f am 41b35884: Revert "DO NOT MERGE Revert "Fix lease duration handling"" 
* commit '41b35884ff68a62f5fc8f65dcc26342d0889113d':
  Revert "DO NOT MERGE Revert "Fix lease duration handling""
 2011-06-22 11:10:16 -07:00
Irfan Sheriff
cf99765b62 resolved conflicts for merge of 914ed90f to honeycomb-LTE 
Change-Id: I616b7ba5c27d0cc4247f5cce4303effe14658e1e
 2011-06-22 11:01:16 -07:00
Irfan Sheriff
20b6ded6e3 am 5d5b73be: Merge "resolved conflicts for merge of 267a6181 to honeycomb-LTE" into honeycomb-LTE 
* commit '5d5b73be515d839d72e1cf7aeffdfdfb56d66045':
  DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"
 2011-06-22 07:47:16 -07:00
Irfan Sheriff
c74eacde30 resolved conflicts for merge of 267a6181 to honeycomb-LTE 
Change-Id: I95d459c937f788ed15f178e85692e1c393bdaa04
 2011-06-22 07:11:42 -07:00
Irfan Sheriff
cd672ebf29 Release wakelock after use 
DHCP renewal can finish pretty quick most times and holding
a timed wakelock wastes battery.

Hold a non-reference counted lock and release it immediate
while having the safety of a 40s release

Bug: 4575773
Change-Id: I49d2e8c27b2723690aef26417c4b9a145843a401
 2011-06-21 15:42:48 -07:00
Irfan Sheriff
e8898d4a44 am 885c3c11: am bc4ddef4: Merge "DO NOT MERGE Revert "Fix lease duration handling"" into honeycomb-mr2 
* commit '885c3c11cf1e20c456ddf681a06a4a878426a632':
  DO NOT MERGE Revert "Fix lease duration handling"
 2011-06-21 14:44:13 -07:00
Irfan Sheriff
885c3c11cf am bc4ddef4: Merge "DO NOT MERGE Revert "Fix lease duration handling"" into honeycomb-mr2 
* commit 'bc4ddef479011e200d0273fe73c22922a85de1fe':
  DO NOT MERGE Revert "Fix lease duration handling"
 2011-06-21 14:29:42 -07:00
Irfan Sheriff
41b35884ff Revert "DO NOT MERGE Revert "Fix lease duration handling"" 
This reverts commit 7dd1200589.
 2011-06-21 14:26:59 -07:00
Irfan Sheriff
914ed90f2c Revert "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"" 
This reverts commit 58d1bb497e.
 2011-06-21 14:26:37 -07:00
Jaikumar Ganesh
9e5d0de9a3 am b38fa2a0: Merge "DO NOT MERGE Incoming Bluetooth Connection requests - dialog." into gingerbread 
* commit 'b38fa2a0ac2bde56504929de6a3dd61ac723958e':
  DO NOT MERGE Incoming Bluetooth Connection requests - dialog.
 2011-06-21 13:24:46 -07:00
Irfan Sheriff
58d1bb497e DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine" 
This reverts commit fe3b33d4ea.

Change-Id: I3a9ae1f0d17e7a154d27d4f3f3eb1efa21a34f64
 2011-06-21 11:38:23 -07:00
Jaikumar Ganesh
b38fa2a0ac Merge "DO NOT MERGE Incoming Bluetooth Connection requests - dialog." into gingerbread 2011-06-21 11:23:51 -07:00
Irfan Sheriff
7dd1200589 DO NOT MERGE Revert "Fix lease duration handling" 
This reverts commit 56878760c3.
 2011-06-21 11:01:54 -07:00