OSDN Git Service
John Du [Fri, 6 Sep 2013 20:38:40 +0000 (13:38 -0700)]
am
cd34ad74: Stop scan when client binder dies
* commit '
cd34ad74f093c4867e616ba247fe3853b06afebc':
Stop scan when client binder dies
John Du [Fri, 16 Aug 2013 00:40:24 +0000 (17:40 -0700)]
Stop scan when client binder dies
bug
10213756
Change-Id: I01b397070f729df7c6000c2dc2613efbe8801681
(cherry picked from commit
45ba247afa1cb3c61a871b0c13f6546411afe68b)
Baligh Uddin [Wed, 4 Sep 2013 04:42:43 +0000 (21:42 -0700)]
am
70ddb0d7: (-s ours) Import translations. DO NOT MERGE
* commit '
70ddb0d79c784b3fb84c03a71537521f35688793':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 3 Sep 2013 15:33:40 +0000 (08:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I134988fe16520246474f92a6f7b035e30d0b6afb
Auto-generated-cl: translation import
Edward Jee [Mon, 26 Aug 2013 22:05:08 +0000 (15:05 -0700)]
am
b65328f1: Merge "Enables AT+ANDROID command in Bluetooth HFP." into klp-dev
* commit '
b65328f18100546c606026f8323a2da11af3edbc':
Enables AT+ANDROID command in Bluetooth HFP.
Edward Jee [Mon, 26 Aug 2013 20:33:36 +0000 (20:33 +0000)]
Merge "Enables AT+ANDROID command in Bluetooth HFP." into klp-dev
Baligh Uddin [Fri, 23 Aug 2013 16:56:35 +0000 (09:56 -0700)]
am
9f5c7c6e: (-s ours) Import translations. DO NOT MERGE
* commit '
9f5c7c6ed2a50148049656ec79cd945ce8c04fbf':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 23 Aug 2013 05:23:57 +0000 (22:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0cccc9b44a66829a7f781986c6aee97c8744d17e
Auto-generated-cl: translation import
Edward Jee [Fri, 16 Aug 2013 11:10:56 +0000 (04:10 -0700)]
Enables AT+ANDROID command in Bluetooth HFP.
Adds another vendor-specific command AT+ANDROID in Bluetooth Hands-Free
Profile. And creates an API function that sends an unsolicited result
code +ANDROID .
Bug:
8736189
Change-Id: I7e5bba8a568f596565a1531948061e4d2fe456e0
Baligh Uddin [Mon, 19 Aug 2013 14:21:50 +0000 (07:21 -0700)]
am
09360264: (-s ours) Import translations. DO NOT MERGE
* commit '
09360264f212768c828ed8fc5051cd4d3ec1b381':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 19 Aug 2013 14:17:34 +0000 (07:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie4e94f0caf464133c4fb2e3c993d066ceeb8edb3
Auto-generated-cl: translation import
John Du [Sun, 18 Aug 2013 19:51:21 +0000 (12:51 -0700)]
am
17675906: Adding support for Absolute Volume
* commit '
17675906064bb72fdcca75baa56cdf8bb8968d01':
Adding support for Absolute Volume
John Du [Thu, 18 Jul 2013 22:48:16 +0000 (15:48 -0700)]
Adding support for Absolute Volume
Change-Id: Ie2ccaad7aaf56a89fe44b168026df3d84b373c06
Conflicts:
jni/com_android_bluetooth_avrcp.cpp
src/com/android/bluetooth/a2dp/Avrcp.java
Baligh Uddin [Fri, 16 Aug 2013 00:28:18 +0000 (17:28 -0700)]
am
e606cba8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
e606cba88423e5fbfe651b12c2ae2d6c1d48df56':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 16 Aug 2013 00:25:26 +0000 (00:25 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
John Du [Thu, 15 Aug 2013 21:53:36 +0000 (14:53 -0700)]
am
ace834fe: Add support for ff/rew
* commit '
ace834feb02adabd61f628c4471147aea02d939c':
Add support for ff/rew
John Du [Fri, 28 Jun 2013 01:39:42 +0000 (18:39 -0700)]
Add support for ff/rew
Change-Id: I7ec60d94313b9ba5e4e8e62c82f19ae332b6fdd3
(cherry picked from commit
55123eff985f4d15ec198569a5db895ea086447a)
Baligh Uddin [Wed, 14 Aug 2013 16:51:16 +0000 (09:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: If4f19d104c3f906156a4470e4a8cc3d1e5d07c2c
Auto-generated-cl: translation import
Matthew Xie [Wed, 14 Aug 2013 14:58:58 +0000 (07:58 -0700)]
am
8c85057a: Merge "LE: Add peripheral role support (4/4)" into klp-dev
* commit '
8c85057a003441674807e2991092735011c72b26':
LE: Add peripheral role support (4/4)
Matthew Xie [Wed, 14 Aug 2013 14:58:44 +0000 (07:58 -0700)]
am
59f7aee8: Merge "LE: Add instance ID to descriptors (4/4)" into klp-dev
* commit '
59f7aee85186fa07fc29ea941cfdab99e7c87d91':
LE: Add instance ID to descriptors (4/4)
Matthew Xie [Wed, 14 Aug 2013 08:16:08 +0000 (08:16 +0000)]
Merge "LE: Add peripheral role support (4/4)" into klp-dev
Andre Eisenbach [Wed, 7 Aug 2013 02:58:39 +0000 (19:58 -0700)]
LE: Add peripheral role support (4/4)
Initial stack support for the LE peripheral role.
Change-Id: I3600558fd777999bcd610fa3aaed259414702ea4
Matthew Xie [Wed, 14 Aug 2013 07:32:04 +0000 (07:32 +0000)]
Merge "LE: Add instance ID to descriptors (4/4)" into klp-dev
Andre Eisenbach [Tue, 9 Jul 2013 07:03:57 +0000 (00:03 -0700)]
LE: Add instance ID to descriptors (4/4)
If a remote devices offers multiple descriptors with the same UUID, the
instance ID is used to differentiate between them.
Change-Id: I176dcfe1dc582120173cf3bd2d4329d7d764e39a
Baligh Uddin [Tue, 13 Aug 2013 07:26:36 +0000 (00:26 -0700)]
am
e76ce140: (-s ours) Import translations. DO NOT MERGE
* commit '
e76ce140acd95cff140d9b01886ef6018e82e1b9':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 12 Aug 2013 15:25:26 +0000 (08:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: I13faa9f5838b1d36fba572c47272703ae944c535
Auto-generated-cl: translation import
Matthew Xie [Fri, 19 Jul 2013 01:18:36 +0000 (18:18 -0700)]
Bluetooth MAP profile - sms and mms support initial check-in
bug:
10116530
Change-Id: If9ce878d71c1e1b12416014c433da03b3033e158
Dianne Hackborn [Mon, 5 Aug 2013 18:26:26 +0000 (11:26 -0700)]
Use explicit Intent for binding to service.
Change-Id: I51971a02532ad0ad8fafb0529e7adf83ed846cf4
Baligh Uddin [Wed, 31 Jul 2013 21:47:55 +0000 (14:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I047f7faa69a457bc442be97e59ef0cf84d04a738
Auto-generated-cl: translation import
Zhihai Xu [Fri, 26 Jul 2013 18:33:12 +0000 (18:33 +0000)]
Merge "Add debug menu to enable btsnoop"
Jay Shrauner [Mon, 10 Jun 2013 19:03:34 +0000 (12:03 -0700)]
Use new CallLog number presentation column
Switch to using new number presentation column in the CallLog table.
Bug:
6948882
Change-Id: I5df2969465c19f2357dbbc3266315e020e30476e
The Android Open Source Project [Wed, 12 Jun 2013 14:25:54 +0000 (07:25 -0700)]
am
ca70fd76: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
ca70fd763174361aa9ed25241f94d52f94ef6387':
ignore invlaid play position update from remote control client.
The Android Open Source Project [Wed, 12 Jun 2013 14:23:39 +0000 (07:23 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ie1d9fd280ad0b593e75ce17c11e45d34cf6df4ab
Zhihai Xu [Sat, 8 Jun 2013 01:12:21 +0000 (18:12 -0700)]
ignore invlaid play position update from remote control client.
differentiate between applications that use
the new RemoteControlClient APIs to pass a playback position but
don't have one yet, and applications that use the legacy API and
will never pass a position.
bug:
9294855
Change-Id: I015b9ded72497464352a9fbb6a605cedfffad373
Zhihai Xu [Tue, 11 Jun 2013 22:28:50 +0000 (15:28 -0700)]
am
7dc55aab: Merge "ignore invlaid play position update from remote control client." into jb-mr2-dev
* commit '
7dc55aab7b1e53f784ffc75d1e7e28c0ee42bb0c':
ignore invlaid play position update from remote control client.
Zhihai Xu [Tue, 11 Jun 2013 20:08:24 +0000 (13:08 -0700)]
Add debug menu to enable btsnoop
bug:
8059358
Change-Id: I2947b2b77955238410e2620489c2e0407ad8ae7b
Zhihai Xu [Tue, 11 Jun 2013 19:39:49 +0000 (19:39 +0000)]
Merge "ignore invlaid play position update from remote control client." into jb-mr2-dev
Zhihai Xu [Sat, 8 Jun 2013 01:12:21 +0000 (18:12 -0700)]
ignore invlaid play position update from remote control client.
differentiate between applications that use
the new RemoteControlClient APIs to pass a playback position but
don't have one yet, and applications that use the legacy API and
will never pass a position.
bug:
9294855
Change-Id: I015b9ded72497464352a9fbb6a605cedfffad373
Matthew Xie [Thu, 30 May 2013 22:16:12 +0000 (15:16 -0700)]
am
865b323b: Notify adapter state change from off to on when disable fails
* commit '
865b323bb1d0aa9581a9b6a2f5ed96fc0ee70b23':
Notify adapter state change from off to on when disable fails
Matthew Xie [Thu, 30 May 2013 19:14:37 +0000 (12:14 -0700)]
Notify adapter state change from off to on when disable fails
So that the settings app would not stuck at turning-off state
User can retry turning off.
bug
9164641
Change-Id: I6ae6d80c97673b4e548b7b5ab47c51f968342060
Matthew Xie [Fri, 24 May 2013 23:47:23 +0000 (16:47 -0700)]
am
3cedf3d5: Fix rssi handling as one of property change event
* commit '
3cedf3d57aff20e1876a5b450f41b05e975cb8e0':
Fix rssi handling as one of property change event
Matthew Xie [Fri, 24 May 2013 20:01:21 +0000 (13:01 -0700)]
Fix rssi handling as one of property change event
The rssi is encoded in one byte as int8_t in the stack.
JNI code copied in high byte without proper masking.
The converting is not needed. I am removing the uncessary converting.
bug
9110215
Change-Id: I50628b3a3c0bcf4a33775c6b62e9febd35bdc78d
Zhihai Xu [Wed, 22 May 2013 16:50:32 +0000 (09:50 -0700)]
am
0eea1282: Bluetooth Share has stopped / Secondary user setup / NullPointerException
* commit '
0eea1282dcb425c1ea9dc6aa08d323884a9a1655':
Bluetooth Share has stopped / Secondary user setup / NullPointerException
Zhihai Xu [Tue, 21 May 2013 23:07:22 +0000 (16:07 -0700)]
Bluetooth Share has stopped / Secondary user setup / NullPointerException
issue
9066070
Change-Id: Ie206eab374c6a8c255f1a6302249f81ac16fc333
YK Jeffrey Chao [Tue, 14 May 2013 23:23:11 +0000 (16:23 -0700)]
am
ad9fff21: Preload timeout and retry mechanism (2/3)
* commit '
ad9fff218081d2f49471487d37387c764d69ed29':
Preload timeout and retry mechanism (2/3)
Ravi Nagarajan [Thu, 2 May 2013 06:25:55 +0000 (23:25 -0700)]
Fix for roam indicator not updating correctly
Use telephony manager PhoneStateListener to update the roam indicator
bug
8781689
Change-Id: I7c06f162918a10d06d77fb302e99bd2db8b02874
YK Jeffrey Chao [Wed, 24 Apr 2013 18:55:23 +0000 (11:55 -0700)]
Preload timeout and retry mechanism (2/3)
If the Preload process was stuck due to unknown hardware init failure,
a 8-second ENABLE_TIMEOUT timeout would be eventually expired in Java layer
at AdapterState and attempted to set BT state back to STATE_OFF.
However BluetoothManagerService did not handle this case accordingly and led
to state mis-matching between Java layer and BTIF at the end.
Add the processing logic in AdapterState to handle the case when an explicit
STATE_OFF notification from BTIF was received in the TurningOn Pending state.
bug
7566317
Change-Id: I29c379cd453d05297ed382a5e8f862fa7d0f8881
Zhihai Xu [Tue, 7 May 2013 17:01:15 +0000 (10:01 -0700)]
am
bad49957: avoid null pointer in handlePanDeviceStateChange of PanService
* commit '
bad4995703f97fab3c7c84b297a8ca6df65191fa':
avoid null pointer in handlePanDeviceStateChange of PanService
Baligh Uddin [Mon, 6 May 2013 16:11:08 +0000 (09:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I218327cf32cf3aab5b00182dedd2f0710be449d8
Auto-generated-cl: translation import
Zhihai Xu [Sat, 4 May 2013 03:49:22 +0000 (20:49 -0700)]
avoid null pointer in handlePanDeviceStateChange of PanService
see the following null pointer exception
04-30 15:15:21.689 10890 10890 E AndroidRuntime: Caused by: java.lang.NullPointerException
04-30 15:15:21.689 10890 10890 E AndroidRuntime: at com.android.bluetooth.pan.PanService.handlePanDeviceStateChange(PanService.java:457)
which cause crash when disable BT
If the stop is called before the cleanup in PanService, Nullpointer may happen.
issue
8769031
Change-Id: Ia3fb1625c945c508771a697234e6ee18a120d72b
Baligh Uddin [Fri, 26 Apr 2013 14:45:52 +0000 (07:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: I480cc9513c2fed68c0231395bb3626816f85919a
Auto-generated-cl: translation import
Zhihai Xu [Fri, 26 Apr 2013 04:26:51 +0000 (21:26 -0700)]
am
00998973: Merge "Null pointer exception in SocketAcceptThread of BluetoothPbapService." into jb-mr2-dev
* commit '
009989730a294575c32295976c57af169523abe4':
Null pointer exception in SocketAcceptThread of BluetoothPbapService.
Zhihai Xu [Fri, 26 Apr 2013 01:31:50 +0000 (01:31 +0000)]
Merge "Null pointer exception in SocketAcceptThread of BluetoothPbapService." into jb-mr2-dev
Zhihai Xu [Tue, 23 Apr 2013 03:43:02 +0000 (20:43 -0700)]
Null pointer exception in SocketAcceptThread of BluetoothPbapService.
issue
7650255
Change-Id: Ied5c4ba2b34ffef9edaaa1ad7d8b4a9a0e73ef90
Matthew Xie [Thu, 25 Apr 2013 01:43:56 +0000 (18:43 -0700)]
am
0592109a: Merge "Enforcing bluetooth permissions for GATT api calls" into jb-mr2-dev
* commit '
0592109a75ca9e4e65489c04d6c5994cd7db45b2':
Enforcing bluetooth permissions for GATT api calls
Matthew Xie [Thu, 25 Apr 2013 01:41:55 +0000 (01:41 +0000)]
Merge "Enforcing bluetooth permissions for GATT api calls" into jb-mr2-dev
Matthew Xie [Thu, 25 Apr 2013 00:50:24 +0000 (17:50 -0700)]
Enforcing bluetooth permissions for GATT api calls
bug
8667898
Change-Id: I2100d402f6496271bf97fed03684bedd8d231da4
Priti Aghera [Wed, 24 Apr 2013 17:45:17 +0000 (10:45 -0700)]
am
86296657: HDP Single SDP fix
* commit '
8629665794ef845e945595040e4cf1ea2fa508d3':
HDP Single SDP fix
Priti Aghera [Fri, 5 Apr 2013 01:05:09 +0000 (18:05 -0700)]
HDP Single SDP fix
Modified the stack logic to create single
SDP record for all register call.
bug
8656462
Change-Id: If06193aecbe7555e6b1402275ee243fcd672c812
Zhihai Xu [Tue, 23 Apr 2013 22:02:07 +0000 (15:02 -0700)]
am
db367aa8: enable playback position sync for AVRCP remoteControlDisplay in audio manager
* commit '
db367aa803836ca5b80da6b07ea2ef8a4b0ca1d2':
enable playback position sync for AVRCP remoteControlDisplay in audio manager
Zhihai Xu [Tue, 23 Apr 2013 20:53:55 +0000 (13:53 -0700)]
enable playback position sync for AVRCP remoteControlDisplay in audio manager
issue
8698103
Change-Id: I3572b519c4181b21629c812ba91e46d977ec33fe
Priti Aghera [Thu, 18 Apr 2013 19:20:19 +0000 (12:20 -0700)]
Priti Aghera [Mon, 15 Apr 2013 21:16:04 +0000 (14:16 -0700)]
Fixed a NPE
Bluetooth share was crashing due to NPE. Included a check for
Inputstream in BluetoothOppSendFileInfo.
bug #
7924487
Change-Id: Iccceb607a46962f84538e912d62f407ad5ee2f21
Andre Eisenbach [Thu, 18 Apr 2013 18:40:35 +0000 (11:40 -0700)]
am
dbaf9cd4: LE (3/3): Add application ID to connection callback
* commit '
dbaf9cd41555de7e6101f368ac348bbeb2094809':
LE (3/3): Add application ID to connection callback
Baligh Uddin [Wed, 17 Apr 2013 14:50:30 +0000 (07:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iad66487373a02c1e475ab0f0317e351040586c21
Auto-generated-cl: translation import
Andre Eisenbach [Wed, 10 Apr 2013 18:21:26 +0000 (11:21 -0700)]
LE (3/3): Add application ID to connection callback
Bug:
8589393
Change-Id: Iff14aa568bac4d62920bc35ec1545384e200b53a
Zhihai Xu [Fri, 12 Apr 2013 17:38:41 +0000 (10:38 -0700)]
am
79d176b0: Resolve AVRCP IOP issues
* commit '
79d176b0f3d6cb33c7e52be6641fd4808ba87e93':
Resolve AVRCP IOP issues
Zhihai Xu [Fri, 12 Apr 2013 01:14:53 +0000 (18:14 -0700)]
Resolve AVRCP IOP issues
This patch has the following fixes
1. Track number should be 0xFFFFFFFF when no track is currently selected
2. When no track is currently selected set play state as stopped
3. Track number sent in the correct byte order
issue
8586495
Change-Id: I2be583d1e87a39015dff605c7442ca658a10b2e2
Ying Wang [Wed, 10 Apr 2013 06:25:16 +0000 (23:25 -0700)]
am
9311455a: Merge "Add liblog" into jb-mr2-dev
* commit '
9311455ac6cc5c7aebe9d355e508c4af86da3246':
Add liblog
Ying Wang [Wed, 10 Apr 2013 05:20:44 +0000 (05:20 +0000)]
Merge "Add liblog" into jb-mr2-dev
Ying Wang [Wed, 10 Apr 2013 05:02:05 +0000 (22:02 -0700)]
Add liblog
Bug:
8580410
Change-Id: I06b82e2424d63361364c223b1dd5b6006abe7ca8
Zhihai Xu [Tue, 9 Apr 2013 22:55:18 +0000 (15:55 -0700)]
am
aa1ffd5c: support playback position changed notification
* commit '
aa1ffd5c6bd4f016c6ed452b3551e65872eaea8e':
support playback position changed notification
Zhihai Xu [Thu, 4 Apr 2013 02:03:57 +0000 (19:03 -0700)]
support playback position changed notification
issue
8494369
Change-Id: Id468d34badac4c963d4e6df0e7e32bbd0c508938
Andre Eisenbach [Sat, 6 Apr 2013 01:04:26 +0000 (18:04 -0700)]
am
6af1f250: Add binder DeathRecipient to GATT service
* commit '
6af1f25031e4378efb1a4fc286974c1038a357ba':
Add binder DeathRecipient to GATT service
Andre Eisenbach [Fri, 5 Apr 2013 16:36:46 +0000 (09:36 -0700)]
Add binder DeathRecipient to GATT service
Bluetooth stack connections are now released if a GATT client or server
application closes unexpectedly.
Bug:
8362526
Change-Id: I13b0711f65dcc752f4ed5c5a6e469b6fea41de75
Matthew Xie [Thu, 4 Apr 2013 03:27:19 +0000 (20:27 -0700)]
am
4bcc3acd: Merge "Implement getRemoteType of IBluetooth.aidl" into jb-mr2-dev
* commit '
4bcc3acd9b6024ac53c5de7af08ce56079f20e86':
Implement getRemoteType of IBluetooth.aidl
Matthew Xie [Thu, 4 Apr 2013 03:18:00 +0000 (03:18 +0000)]
Merge "Implement getRemoteType of IBluetooth.aidl" into jb-mr2-dev
Jean-Michel Trivi [Wed, 3 Apr 2013 22:03:44 +0000 (15:03 -0700)]
am
0c61ad1d: Merge "Update IRemoteControlDisplay implementation to latest interface" into jb-mr2-dev
* commit '
0c61ad1d60fdf9738f9171acaa43f63a9a70d147':
Update IRemoteControlDisplay implementation to latest interface
Jean-Michel Trivi [Wed, 3 Apr 2013 21:12:08 +0000 (21:12 +0000)]
Merge "Update IRemoteControlDisplay implementation to latest interface" into jb-mr2-dev
Matthew Xie [Wed, 3 Apr 2013 07:36:37 +0000 (00:36 -0700)]
Implement getRemoteType of IBluetooth.aidl
Bring the device type from hal to app api
bug
8529188
Change-Id: Id4a9837afc7234cb50ab6abf73da4bdc010db392
Zhihai Xu [Tue, 2 Apr 2013 19:15:22 +0000 (12:15 -0700)]
am
bc10e7d5: keep one setPlaybackState function
* commit '
bc10e7d58aa55da25c18d8056a0254a2b736146a':
keep one setPlaybackState function
Zhihai Xu [Tue, 2 Apr 2013 18:55:12 +0000 (11:55 -0700)]
keep one setPlaybackState function
Change-Id: I4b6f4f17dadd542e890876a8b2fbf3c31badc003
Jean-Michel Trivi [Mon, 1 Apr 2013 18:28:43 +0000 (11:28 -0700)]
Update IRemoteControlDisplay implementation to latest interface
Changed method setTransportControlFlags(int, int)
to method setTransportControlInfo(int, int, int)
Bug
8120740
Change-Id: I35833384102949eb2a20b0f61e13d9d8573adf3e
Baligh Uddin [Sun, 31 Mar 2013 01:59:29 +0000 (01:59 +0000)]
Merge "Import translations. DO NOT MERGE"
Zhihai Xu [Sat, 30 Mar 2013 03:18:13 +0000 (20:18 -0700)]
am
6d5b7feb: fix compilation error for broadcom branch
* commit '
6d5b7febd705a33ab41459743d12623afcbf96bd':
fix compilation error for broadcom branch
Zhihai Xu [Sat, 30 Mar 2013 03:11:55 +0000 (20:11 -0700)]
fix compilation error for broadcom branch
Change-Id: I0ed2f039babccf59099c0c7cf0e3ad12392ecff4
Zhihai Xu [Sat, 30 Mar 2013 02:58:46 +0000 (02:58 +0000)]
Merge "Revert "fix the compilation error""
Zhihai Xu [Sat, 30 Mar 2013 02:55:34 +0000 (19:55 -0700)]
am
c6a2fb9e: Revert "Revert "fix the compilation error in broadcom partner branch""
* commit '
c6a2fb9e324208a48173877c70b13f2f1b01286e':
Revert "Revert "fix the compilation error in broadcom partner branch""
Zhihai Xu [Sat, 30 Mar 2013 02:52:02 +0000 (19:52 -0700)]
am
0e8131db: Revert "fix the compilation error in broadcom partner branch"
* commit '
0e8131db9994d36b7cf9b61bfccb5fb374e09a19':
Revert "fix the compilation error in broadcom partner branch"
Zhihai Xu [Sat, 30 Mar 2013 02:50:03 +0000 (02:50 +0000)]
Revert "Revert "fix the compilation error in broadcom partner branch""
This reverts commit
0e8131db9994d36b7cf9b61bfccb5fb374e09a19
Change-Id: Id91d545d2884022ba8f021cb22d710f4ed421464
Zhihai Xu [Sat, 30 Mar 2013 02:47:00 +0000 (02:47 +0000)]
Revert "fix the compilation error in broadcom partner branch"
This reverts commit
9c55356d9405187302a50aa2f9de8b29976645e5
Change-Id: Ife672e4b012a7745abf9d8ba9701fc46a0008539
Zhihai Xu [Sat, 30 Mar 2013 02:45:33 +0000 (19:45 -0700)]
am
9c55356d: fix the compilation error in broadcom partner branch
* commit '
9c55356d9405187302a50aa2f9de8b29976645e5':
fix the compilation error in broadcom partner branch
Zhihai Xu [Sat, 30 Mar 2013 02:38:46 +0000 (19:38 -0700)]
fix the compilation error in broadcom partner branch
Change-Id: I563742d29570095060c874b1b992cd1c3859dc58
Zhihai Xu [Sat, 30 Mar 2013 01:41:46 +0000 (01:41 +0000)]
Revert "fix the compilation error"
This reverts commit
ecde0072c36a719c95514ea069be5317e9306719
Change-Id: I79fdd720ac0ef20c2eb0ec1c17f129c743f113e3
Zhihai Xu [Sat, 30 Mar 2013 01:27:42 +0000 (18:27 -0700)]
fix the compilation error
Baligh Uddin [Fri, 29 Mar 2013 23:18:48 +0000 (16:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9ffbeef7f3ca0ac573d2ca5ef0b50f6f1d4cecfd
Auto-generated-cl: translation import
Brian Carlstrom [Fri, 29 Mar 2013 21:34:59 +0000 (14:34 -0700)]
am
4f362dfe: resolved conflicts for merge of
c508483d to jb-mr2-dev
* commit '
4f362dfe593f4c8638873c3e7f9a53041bf3edd2':
Cleanup Bluetooth AdapterService JNI
Jean-Michel Trivi [Fri, 29 Mar 2013 18:11:22 +0000 (11:11 -0700)]
am
252c3fd1: Merge "Update RemoteControlDisplay interface for playback position" into jb-mr2-dev
* commit '
252c3fd10c9da267c6c2c7772025b92bf1ec74e9':
Update RemoteControlDisplay interface for playback position
Brian Carlstrom [Fri, 29 Mar 2013 17:15:42 +0000 (10:15 -0700)]
resolved conflicts for merge of
c508483d to jb-mr2-dev
Change-Id: I15a1f2b2391a973645ef14c36bb3ddf71c815bc9
Jean-Michel Trivi [Fri, 29 Mar 2013 16:51:34 +0000 (16:51 +0000)]
Merge "Update RemoteControlDisplay interface for playback position" into jb-mr2-dev
OSDN Git Service
