drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,827 Commits 1 Branch 0 Tags
Commit Graph

81827 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Simmons
db63260758 Set the SO_BROADCAST option if the master election endpoint is the broadcast address 
Change-Id: I75b3815be73744b99a4bea52916984de76634e7e
 2012-07-17 18:02:24 -07:00
Haoyu Bai
6b7358d951 Netd event code for interface class acitivity. 
Change-Id: I83d5ca9ab854cb30ce6d9c06a977ca295f0cdbfd
 2012-07-17 16:55:05 -07:00
Jason Simmons
71cac13bea am 2da0bbc8: (-s ours) DO NOT MERGE - Set the SO_BROADCAST option if the master election endpoint is the broadcast address 
* commit '2da0bbc80545769541e2a24e8ce152f0ea2a113c':
  DO NOT MERGE - Set the SO_BROADCAST option if the master election endpoint is the broadcast address
 2012-07-17 16:15:53 -07:00
Jason Simmons
2da0bbc805 DO NOT MERGE - Set the SO_BROADCAST option if the master election endpoint is the broadcast address 
Change-Id: I76aa9df717ee5ca32859e21c7e25635b44739c75
 2012-07-17 16:07:07 -07:00
Jonathan Dixon
f6468ca4dc Merge "Remove deprecated methods from webview provider interface" 2012-07-17 15:41:29 -07:00
Scott Main
0b8bd49544 am d329fa02: am 28a3897d: docs: re-add download.jd file to support archived SDK downloads 
* commit 'd329fa02c1036df580335661d41bf1c599324011':
  docs: re-add download.jd file to support archived SDK downloads
 2012-07-17 14:17:32 -07:00
Scott Main
d329fa02c1 am 28a3897d: docs: re-add download.jd file to support archived SDK downloads 
* commit '28a3897d08e0d2bce69225a89cbada792761f0ed':
  docs: re-add download.jd file to support archived SDK downloads
 2012-07-17 14:14:40 -07:00
Wink Saville
e26399d332 am 07e021b1: (-s ours) am 33034b13: (-s ours) Create telephony-common and mms-common - DO NOT MERGE 
* commit '07e021b11b86ba3af85e12dc9d090fc20bf8f96b':
  Create telephony-common and mms-common - DO NOT MERGE
 2012-07-17 14:08:56 -07:00
Ying Wang
8dcac6651b am 166615f2: (-s ours) am 1ed1c399: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '166615f243dc170dbbae7e107634f92f05942015':
  Import translations. DO NOT MERGE
 2012-07-17 14:08:43 -07:00
Dirk Dougherty
858905f419 am 92c4339b: am 1c185c20: Merge "Doc change: Fixes to IAB purchase state docs." into jb-dev 
* commit '92c4339bb73a58378e510242c6ccdb093ae1a5a9':
  Doc change: Fixes to IAB purchase state docs.
 2012-07-17 14:08:38 -07:00
Adam Powell
5d1f11d9c2 Merge "Fix MediaRouteActionProvider button sizing" 2012-07-17 14:03:59 -07:00
Adam Powell
8c1b02e759 Fix MediaRouteActionProvider button sizing 
Bug 6768999

Use proper layout height for MediaRouteButtons generated from
MediaRouteActionProvider.

Update ActionMenuView's LayoutParams handling to correctly propagate
width/height values if the supplied LayoutParams is of a different
type.

Change-Id: I1e1b250d873869ca27f59ffb06ccf2299d57b40d
 2012-07-17 13:57:59 -07:00
Scott Main
28a3897d08 docs: re-add download.jd file to support archived SDK downloads 
Change-Id: If814238c8fa017ce10e7fe770826a1e162fe5e87
 2012-07-17 13:19:20 -07:00
Wink Saville
07e021b11b am 33034b13: (-s ours) Create telephony-common and mms-common - DO NOT MERGE 
* commit '33034b13cae1429d526722374bd39be3f9605ae4':
  Create telephony-common and mms-common - DO NOT MERGE
 2012-07-17 12:36:56 -07:00
Wink Saville
33034b13ca Create telephony-common and mms-common - DO NOT MERGE 
These have been created to reduce the size and complexity
of frameworks/base.

mms-common was created by moving all of
  frameworks/base/core/java/com/google/android/mms
to:
   frameworks/opt/mms

telephony-common was created by moving some of
   frameworks/base/telephony
to:
   frameworks/opt/telephony

Change-Id: If6cb3c6ff952767fc10210f923dc0e4b343cd4ad
 2012-07-17 12:23:09 -07:00
Ying Wang
166615f243 am 1ed1c399: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '1ed1c399939e035707dd6da7057570a8da96394e':
  Import translations. DO NOT MERGE
 2012-07-17 12:22:31 -07:00
Ying Wang
ad6565d2aa Merge "Import translations. DO NOT MERGE" 2012-07-17 12:19:23 -07:00
Ying Wang
1ed1c39993 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-07-17 12:19:12 -07:00
Dirk Dougherty
92c4339bb7 am 1c185c20: Merge "Doc change: Fixes to IAB purchase state docs." into jb-dev 
* commit '1c185c2068212c78d124897fdfe33cebb194d84a':
  Doc change: Fixes to IAB purchase state docs.
 2012-07-17 12:17:10 -07:00
Dirk Dougherty
1c185c2068 Merge "Doc change: Fixes to IAB purchase state docs." into jb-dev 2012-07-17 12:14:09 -07:00
Roman Nurik
6a35547023 am 90cc1811: am d0e84d30: docs: Add link to action bar design pattern. 
* commit '90cc1811245dde00ec23c390e4cba6345368b265':
  docs: Add link to action bar design pattern.
 2012-07-17 12:09:36 -07:00
Roman Nurik
90cc181124 am d0e84d30: docs: Add link to action bar design pattern. 
* commit 'd0e84d30c89300993d45307959a86ad1ceb06da2':
  docs: Add link to action bar design pattern.
 2012-07-17 12:06:22 -07:00
Ying Wang
59a4cb36cf Import translations. DO NOT MERGE 
Change-Id: I7055f4855c1e911d218fef9ba3167b28c3077840
Auto-generated-cl: translation import
 2012-07-17 11:38:59 -07:00
Ying Wang
7b3813340d Import translations. DO NOT MERGE 
Change-Id: I5c3c2a4556764f14d354ea0431b6cba175b2c49f
Auto-generated-cl: translation import
 2012-07-17 11:31:03 -07:00
Roman Nurik
d0e84d30c8 docs: Add link to action bar design pattern. 
Change-Id: I3e00c3bb81f785c70138ae1069e065d9118f031e
related-to-bug: 5833099
 2012-07-17 10:30:51 -07:00
Steve Block
6bcb45934e Merge "Improve JavaDoc for WebView.restoreState()" 2012-07-17 08:22:31 -07:00
Steve Block
42499061be Improve JavaDoc for WebView.restoreState() 
Change-Id: I01b3f8ac78b08ef0a6f563fa63978934a23fd183
 2012-07-17 16:01:38 +01:00
Matthew Xie
cdce0b9897 Handle airplane mode messages in BroadcastReceiver, safe locking, etc 
Handle airplane mode messages in BroadcastReceiver
Safe-lock the access of mBluetooth as a indication of binding state
break indent

Change-Id: Ib24ba0b1f5102c80e55e44b40a8dbf88bc2fad2e
 2012-07-16 21:31:02 -07:00
Matthew Xie
fe19f1234e Add TODO comments to remove start/stopReverseTethering 
Change start/stopReverseTethering permission from CHANGE_NETWORK_STATE
to CONNECTIVITY_INTERNAL

Change-Id: Iac76d5af6418e6a3e2d2f77bf713466981285e1a
 2012-07-16 21:30:45 -07:00
Matthew Xie
6fde309807 Minor changes. Change some instance variables to be final. 
Variable name changes, better code reability.

Change-Id: I9f0e9c8a57d4bacf0723be1f91d621c592860683
 2012-07-16 21:30:10 -07:00
Fred
a8c6df0d3a Removed startService() call from BluetoothManagerService. 
BT enable()/disable() are handled by using the binder interface

Change-Id: I0bb8d4984129706e424320241ca3ea7e12caf0d3

Conflicts:

	core/java/android/bluetooth/IBluetooth.aidl
 2012-07-16 21:29:44 -07:00
Matthew Xie
9631314e3d Fix merge error, put in tmp workaround for input manager. 
Fix merge error, missing enableNoAutoConnect api.
Remove bluetoothF from inputManageF.systemReady call as tmp workaround.
Recover shutdownRadios(MAX_RADIO_WAIT_TIME) call in ShutdownThread

Change-Id: Ice2b5c54267755bdbf56c742feabbb8709b92570
 2012-07-16 21:29:12 -07:00
fredc
5a1195fd5f Fixed issue with ActivityChooserView not working if there is only 1 share option available 
Change-Id: If21742f3ddc28f54bf8da6cbc7e81ee0df19d6f0
 2012-07-16 21:28:28 -07:00
fredc
bf072a712f Moved BluetoothAdapter.ACTION_STATE_CHANGED broadcast from AdapterService to BluetoothManagerService 
Change-Id: I88e5f3fe050cf11eae9c5cf1b7c393a178b8f9b1
 2012-07-16 21:28:12 -07:00
zzy
c2f5cc50f7 disable the sync addr flag 2012-07-16 21:27:44 -07:00
Swaminatha Balaji
20738945d4 Auto connect hf/a2dp 
Change-Id: I7c1fb4e2614f65e6810f195814dcf0cad88aee21
 2012-07-16 21:26:46 -07:00
Andre Eisenbach
a732ffd8e0 Re-enable Bluetooth after a reboot, even if airplane mode is enabled. 
This is to resolve Buganizer issue 6325950 and make the behaviour of
Blueooth and Wifi consistant.

Change-Id: Idd6cfa79136f7847e9e670d6d2aa0bf613b0381f
 2012-07-16 21:26:26 -07:00
zzy
7329e70841 Added code to tear down dhcp thread when tethering is off 2012-07-16 21:25:57 -07:00
fredc
d6883533e4 Fixed socket not closing on BT off. Used RemoteCallbackList to monitor binder deaths in BluetoothManagerService. 
Change-Id: I524964bd2836d8c5a4bae095b93ac9481337941d
 2012-07-16 21:25:05 -07:00
fredc
903ac6f399 Fixed issue with Settings app crashing after during on/off and unpair. 
Fixed issue with BluetoothAdapter.getRemoteDevice() returning null.

Change-Id: Ie86813532530a6b57bde1c430c7b4875ecc7354c
 2012-07-16 21:24:32 -07:00
Ravi Nagarajan
7077272d8f Disable debug logs in BluetoothDevice, that was turned on accidentally Change-Id: I8a0a3f5775c2b9f5a928e4840851e687f25b57ab 2012-07-16 21:24:09 -07:00
fredc
116d1d4696 Fixed issue with getting Bluetooth adapter's name and airplane mode 
Change-Id: I18b632223574aa41b09ba30de8e35417fad86cbe
 2012-07-16 21:23:34 -07:00
fredc
649fe497ce Fixed BT on/off issues and added airplane mode handling 
Change-Id: If39df19b99a3f45ebe82e89205d8bb0ff036e2a2
 2012-07-16 21:22:56 -07:00
Sreenidhi T
4bedba49fe Change done in BluetoothAdapter to use the same API for interacting with the Bluetooth Service. setName was being done using mService while getName was using mManagerService. As a result, the device name was not being updated in Localadapter getname call. Modified to use mService in both cases. 
Change-Id: I2e900a782df11fd511319fbb42d94324e50ae89b
 2012-07-16 21:22:32 -07:00
fredc
f24588615e Fixed issue with Bluetooth not turning on if enabled called twice in a row or disabled called twice in a row 
Change-Id: I26cac2fa347934e0740578b811aa5a6767cf4862
 2012-07-16 21:21:50 -07:00
Kausik Sinnaswamy
a097f51e5f BT enable adapter API should return TRUE or FALSE. 
Change-Id: Iaef14c51d3407b69505c55a0bbdaf902213402cf
 2012-07-16 21:21:23 -07:00
fredc
0f42037eb7 Non persistent adapter service 
Change-Id: Ib13d5c77416e58161df0e04d7a15ec0dddbde8b5

Conflicts:

	core/java/android/bluetooth/BluetoothInputDevice.java

Conflicts:

	core/java/com/android/internal/app/ShutdownThread.java
	services/java/com/android/server/SystemServer.java

Conflicts:

	services/java/com/android/server/SystemServer.java
	services/java/com/android/server/pm/ShutdownThread.java
 2012-07-16 21:20:54 -07:00
Ravi Nagarajan
919a4c6264 Handle cancel bond for both legacy and ssp pairing 
Change-Id: I7a6db3cd7b5b8e72dca988e753dcba9a8df614c8
 2012-07-16 21:20:29 -07:00
Priti Aghera
349e62f329 HID-PTS: Included apis' for pts tests 
Change-Id: I7dc0a893ee86a2560c351a565bd170517f6c6079
 2012-07-16 21:20:07 -07:00
fredc
4c9cacadcc Added support to get a remote device's service UUIDs 
Change-Id: I9aa47ac2bb7377aca268e95fec31c518358b3065
 2012-07-16 21:19:51 -07:00