OSDN Git Service
Andre Eisenbach [Tue, 12 Jan 2016 19:00:00 +0000 (19:00 +0000)]
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue am:
abb54d6d36 am:
6e9165b908 -s ours am:
44c3652b4c
am:
5a1ae16f4e
* commit '
5a1ae16f4ee61b1686e178389485ef65001ed167':
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
Andre Eisenbach [Tue, 12 Jan 2016 18:56:46 +0000 (18:56 +0000)]
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue am:
abb54d6d36 am:
6e9165b908 -s ours
am:
44c3652b4c
* commit '
44c3652b4cb824089768112a5a5614cb4346cd0f':
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
Andre Eisenbach [Tue, 12 Jan 2016 18:52:47 +0000 (18:52 +0000)]
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue am:
abb54d6d36
am:
6e9165b908 -s ours
* commit '
6e9165b90881581d1c58eb974b304465340b08e7':
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
Andre Eisenbach [Tue, 12 Jan 2016 18:46:52 +0000 (18:46 +0000)]
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
am:
abb54d6d36
* commit '
abb54d6d3614cd86a6349303400b9cf2f83af4c7':
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
Andre Eisenbach [Tue, 29 Dec 2015 21:37:08 +0000 (13:37 -0800)]
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
Receive and handle ACTION_MESSAGE_SENT intent for SMS type
message to move it to SENT folder when pushMessage request
from MCE is processed and SMS delivered successfully.
Bug:
22343270
CRs-Fixed: 903561
Change-Id: I9dafffc737a34233ede2d10e22cd969f520a12cf
Miao Chou [Sat, 8 Aug 2015 00:56:14 +0000 (00:56 +0000)]
am
89cdf16b: am
2816b2cb: am
0a268209: am
6b58105c: am
75d042a4: (-s ours) am
ef9b774c: am
0f6aaa5a: DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
* commit '
89cdf16b01a296857ea57801476f642cf0b4f1ec':
DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
Miao Chou [Sat, 8 Aug 2015 00:51:39 +0000 (00:51 +0000)]
am
2816b2cb: am
0a268209: am
6b58105c: am
75d042a4: (-s ours) am
ef9b774c: am
0f6aaa5a: DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
* commit '
2816b2cba06edb93b353b42087aec7f689035e6e':
DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
Miao Chou [Sat, 8 Aug 2015 00:44:53 +0000 (00:44 +0000)]
am
0a268209: am
6b58105c: am
75d042a4: (-s ours) am
ef9b774c: am
0f6aaa5a: DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
* commit '
0a268209aec6f988b1ef2a60c1e7a2c0130c7ee0':
DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
Miao Chou [Sat, 8 Aug 2015 00:36:53 +0000 (00:36 +0000)]
am
6b58105c: am
75d042a4: (-s ours) am
ef9b774c: am
0f6aaa5a: DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
* commit '
6b58105c04abdfb2e8aa0f198b41c4c5a9f35d20':
DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
Miao Chou [Sat, 8 Aug 2015 00:35:40 +0000 (00:35 +0000)]
am
1267abe1: am
b117219a: am
46f1dd6d: am
19004c75: DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
* commit '
1267abe1e7b71de43625087d4e28e2101268000e':
DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
Miao Chou [Sat, 8 Aug 2015 00:29:05 +0000 (00:29 +0000)]
am
b117219a: am
46f1dd6d: am
19004c75: DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
* commit '
b117219a842d3aacaf0ee4e790a01417aaf05213':
DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
Miao Chou [Sat, 8 Aug 2015 00:27:52 +0000 (00:27 +0000)]
am
75d042a4: (-s ours) am
ef9b774c: am
0f6aaa5a: DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
* commit '
75d042a4c53c09f82b4a95cf82ded21ffbcb017f':
DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
Miao Chou [Sat, 8 Aug 2015 00:23:30 +0000 (00:23 +0000)]
am
ef9b774c: am
0f6aaa5a: DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
* commit '
ef9b774c992cbff61502a3eb6c680862db26a468':
DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
Miao Chou [Sat, 8 Aug 2015 00:23:15 +0000 (00:23 +0000)]
am
46f1dd6d: am
19004c75: DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
* commit '
46f1dd6d20d4108a44f06137a176d6548c6a0ac6':
DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
Miao Chou [Sat, 8 Aug 2015 00:17:47 +0000 (00:17 +0000)]
am
0f6aaa5a: DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
* commit '
0f6aaa5a945345b273bce16429c5ac56f3d1e7a9':
DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
Miao Chou [Sat, 8 Aug 2015 00:16:42 +0000 (00:16 +0000)]
am
19004c75: DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
* commit '
19004c751f36aa2b01d3e03d4f761d8897542bd2':
DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
Miao Chou [Mon, 20 Jul 2015 19:14:25 +0000 (12:14 -0700)]
DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
This CL adds permission check to avoid unauthorized deletion of any MMS/SMS
messages in BluetoothMapContentObserver.actionMessageSentDisconnected
function.
Bug:
22343270
Change-Id: I30254036309733be4d54db17a8ef17a571cd1c5a
Miao Chou [Mon, 20 Jul 2015 19:14:25 +0000 (12:14 -0700)]
DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
This CL adds permission check to avoid unauthorized deletion of any MMS/SMS
messages in BluetoothMapContentObserver.actionMessageSentDisconnected
function.
Bug:
22343270
Change-Id: I30254036309733be4d54db17a8ef17a571cd1c5a
Sharvil Nanavati [Tue, 16 Jun 2015 21:40:13 +0000 (21:40 +0000)]
am
6675e069: Disable Bluetooth profiles that are not used on Clockwork.
* commit '
6675e069ec19582de75a754d57a0ff78306752dd':
Disable Bluetooth profiles that are not used on Clockwork.
Sharvil Nanavati [Fri, 12 Jun 2015 18:19:18 +0000 (11:19 -0700)]
Disable Bluetooth profiles that are not used on Clockwork.
Change-Id: Ib46a5f6882712f6d5598e6d1a7165fc7737da832
Ed Heyl [Sat, 25 Apr 2015 23:50:00 +0000 (23:50 +0000)]
am
d42ebb24: Merge "OnFound/OnLost feature JNI changes based on BLE spec v0.90."
* commit '
d42ebb241d264158499cb963c1d4cc0e3b02264c':
OnFound/OnLost feature JNI changes based on BLE spec v0.90.
Elliott Hughes [Sat, 25 Apr 2015 23:49:59 +0000 (23:49 +0000)]
am
2bc6e65d: Merge "Add hwp MIME type to transfer/receive over bluetooth"
* commit '
2bc6e65d7ac443ac976aa7aac8c84bf601f85eaa':
Add hwp MIME type to transfer/receive over bluetooth
Ed Heyl [Sat, 25 Apr 2015 23:26:39 +0000 (23:26 +0000)]
Merge "OnFound/OnLost feature JNI changes based on BLE spec v0.90."
Satya Calloji [Tue, 10 Feb 2015 17:18:49 +0000 (09:18 -0800)]
OnFound/OnLost feature JNI changes based on BLE spec v0.90.
Bug:
19609671
Change-Id: I2ac0687ea53616287d82fe47f256686619c0998a
Elliott Hughes [Thu, 2 Apr 2015 01:26:26 +0000 (01:26 +0000)]
Merge "Add hwp MIME type to transfer/receive over bluetooth"
Lorenzo Colitti [Wed, 11 Mar 2015 15:24:59 +0000 (15:24 +0000)]
am
c73c92b4: Merge "Remove dead code, mostly DataStateTracker."
* commit '
c73c92b49cc7b974b31e933bbd15ee2e20771a5f':
Remove dead code, mostly DataStateTracker.
Lorenzo Colitti [Wed, 11 Mar 2015 15:11:45 +0000 (15:11 +0000)]
Merge "Remove dead code, mostly DataStateTracker."
Paul Jensen [Fri, 21 Nov 2014 15:29:20 +0000 (10:29 -0500)]
Remove dead code, mostly DataStateTracker.
Change-Id: I1433937bffdb29bd42fb1adbfcf0a50ceffac7dd
Andre Eisenbach [Thu, 5 Mar 2015 00:23:08 +0000 (00:23 +0000)]
am
f3e29dfd: (-s ours) DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (4/4)
* commit '
f3e29dfdf507603bd6215c686527031721a54813':
DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (4/4)
Andre Eisenbach [Fri, 5 Dec 2014 17:35:40 +0000 (09:35 -0800)]
DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (4/4)
Bug:
18508263
Change-Id: Ib9546ff2cf64d2e085e27e691032749e869e0795
Geoff Mendal [Fri, 27 Feb 2015 16:34:11 +0000 (16:34 +0000)]
am
bc8b2d4d: (-s ours) Import translations. DO NOT MERGE
* commit '
bc8b2d4dd816d29943c6b50c1936b42e9f77cf63':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 27 Feb 2015 01:23:48 +0000 (17:23 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iab3e409ac94ad8e7581e046e9fecf40ae87d1ce3
Auto-generated-cl: translation import
Amit Mahajan [Thu, 19 Feb 2015 04:26:47 +0000 (04:26 +0000)]
am
f53939e3: am
15354c93: am
a1c94c68: Adding a new param to calculateLength for SMS to indicate if called for a segment of multipart msg.
* commit '
f53939e3c742e4bdba81ff2796312aa9904530ca':
Adding a new param to calculateLength for SMS to indicate if called for a segment of multipart msg.
Amit Mahajan [Thu, 19 Feb 2015 04:20:45 +0000 (04:20 +0000)]
am
15354c93: am
a1c94c68: Adding a new param to calculateLength for SMS to indicate if called for a segment of multipart msg.
* commit '
15354c939b43dfdf623c038a3c9583fbeca27d79':
Adding a new param to calculateLength for SMS to indicate if called for a segment of multipart msg.
Amit Mahajan [Thu, 19 Feb 2015 04:16:55 +0000 (04:16 +0000)]
am
a1c94c68: Adding a new param to calculateLength for SMS to indicate if called for a segment of multipart msg.
* commit '
a1c94c681b7064a22ba7d6331af62e175767695c':
Adding a new param to calculateLength for SMS to indicate if called for a segment of multipart msg.
Amit Mahajan [Thu, 19 Feb 2015 02:39:40 +0000 (18:39 -0800)]
Adding a new param to calculateLength for SMS to indicate if called for a
segment of multipart msg.
Encoding type is calculated separately for entire msg vs individual
segments. Change is to avoid overwriting the calculated value for
individual segment based.
Bug:
19399335
Change-Id: I8e89b7596e9c7440ace0486eceb1252094c373fa
Geoff Mendal [Thu, 12 Feb 2015 18:23:14 +0000 (18:23 +0000)]
am
08f66263: (-s ours) Import translations. DO NOT MERGE
* commit '
08f6626311047466ee7d27457dd070e70184bcc3':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 12 Feb 2015 18:16:51 +0000 (10:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: I85f8cce2785af411374b4b7056b580714424c7af
Auto-generated-cl: translation import
Andre Eisenbach [Tue, 10 Feb 2015 00:43:00 +0000 (00:43 +0000)]
am
c9d93376: am
1e3e1ddf: Add API to check if a Bluetooth connection is encrypted (2/2)
* commit '
c9d93376d13cb682c30fbfd7c2ad2c725d96b41d':
Add API to check if a Bluetooth connection is encrypted (2/2)
Andre Eisenbach [Tue, 10 Feb 2015 00:26:56 +0000 (00:26 +0000)]
am
1e3e1ddf: Add API to check if a Bluetooth connection is encrypted (2/2)
* commit '
1e3e1ddf939bf71616245e1e100964568053d665':
Add API to check if a Bluetooth connection is encrypted (2/2)
Andre Eisenbach [Fri, 6 Feb 2015 04:07:50 +0000 (20:07 -0800)]
Add API to check if a Bluetooth connection is encrypted (2/2)
Bug:
19186961
Change-Id: Ied8dbe60995ebe8759c2a4ce21f373b597ed3afe
Matthew Xie [Tue, 27 Jan 2015 01:37:10 +0000 (01:37 +0000)]
am
7c38b7f0: am
9b017745: Use LTE signal level when under LTE
* commit '
7c38b7f0dddd18dd652866f5764b506be2f6f46f':
Use LTE signal level when under LTE
Matthew Xie [Tue, 27 Jan 2015 01:13:06 +0000 (01:13 +0000)]
am
9b017745: Use LTE signal level when under LTE
* commit '
9b0177459ddc1412c4e9d44af53a1badb476bdd9':
Use LTE signal level when under LTE
Matthew Xie [Fri, 23 Jan 2015 22:51:46 +0000 (14:51 -0800)]
Use LTE signal level when under LTE
Bug:
17898918
Change-Id: I9f3bb8d874e24440c2b8de85a6a0d7dbdadb3935
Andre Eisenbach [Tue, 20 Jan 2015 23:58:06 +0000 (23:58 +0000)]
am
dc8fecc2: am
0e3af27d: Merge "Remove GATT context if client registration did not succeed" into lmp-mr1-dev
* commit '
dc8fecc2d6f3b43c9fcde39bfbd69ac2ff7539fc':
Remove GATT context if client registration did not succeed
Andre Eisenbach [Tue, 20 Jan 2015 23:25:08 +0000 (23:25 +0000)]
am
0e3af27d: Merge "Remove GATT context if client registration did not succeed" into lmp-mr1-dev
* commit '
0e3af27dd1acd8034efb9b53bdb824fc342e7c7b':
Remove GATT context if client registration did not succeed
Andre Eisenbach [Tue, 20 Jan 2015 23:18:19 +0000 (23:18 +0000)]
Merge "Remove GATT context if client registration did not succeed" into lmp-mr1-dev
Andre Eisenbach [Fri, 16 Jan 2015 21:02:48 +0000 (13:02 -0800)]
Remove GATT context if client registration did not succeed
Bug:
19028495
Change-Id: I25827e365621fa9b3ef6e85ef9c103cf03654b7c
Andre Eisenbach [Thu, 15 Jan 2015 23:47:44 +0000 (23:47 +0000)]
am
e2aaf550: am
45f25f7b: Merge "Improve VCARD filter logic and reduce log spam" into lmp-mr1-dev
* commit '
e2aaf5500f317bab75c0548610251d86a7ab3d6a':
Improve VCARD filter logic and reduce log spam
Andre Eisenbach [Thu, 15 Jan 2015 23:41:55 +0000 (23:41 +0000)]
am
45f25f7b: Merge "Improve VCARD filter logic and reduce log spam" into lmp-mr1-dev
* commit '
45f25f7ba5aca87e8709b4901ca7057dbb4a3ccf':
Improve VCARD filter logic and reduce log spam
Andre Eisenbach [Thu, 15 Jan 2015 23:36:55 +0000 (23:36 +0000)]
Merge "Improve VCARD filter logic and reduce log spam" into lmp-mr1-dev
Wink Saville [Tue, 13 Jan 2015 19:21:27 +0000 (19:21 +0000)]
am
c40ed4d7: am
8dae225b: Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev
* commit '
c40ed4d76a7ce8b36e14ef00b25e2189f90c35f5':
Rename reg/unreg OnSubscriptionsChangedListener.
Wink Saville [Tue, 13 Jan 2015 19:09:55 +0000 (19:09 +0000)]
am
8dae225b: Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev
* commit '
8dae225b378f250f7a0348e923bade61895171d6':
Rename reg/unreg OnSubscriptionsChangedListener.
Wink Saville [Tue, 13 Jan 2015 19:02:24 +0000 (19:02 +0000)]
Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev
Wei Wang [Tue, 13 Jan 2015 18:56:25 +0000 (18:56 +0000)]
am
a9b2d01f: am
a8f9e639: Fix Bluetooth crash when all filters are used.
* commit '
a9b2d01fbd0839d44c9505b84a6b00f1621e58b6':
Fix Bluetooth crash when all filters are used.
Wei Wang [Tue, 13 Jan 2015 18:49:50 +0000 (18:49 +0000)]
am
a8f9e639: Fix Bluetooth crash when all filters are used.
* commit '
a8f9e6399874fa392e12d82409281da04607d64d':
Fix Bluetooth crash when all filters are used.
Wink Saville [Tue, 13 Jan 2015 00:50:32 +0000 (16:50 -0800)]
Rename reg/unreg OnSubscriptionsChangedListener.
To addOnSubscriptionsChangedListener and
removeOnSubscriptionsChangedListener.
Bug:
18984103
Change-Id: I6636905093812af89c1c3702840e44c8c5ea891f
Andre Eisenbach [Wed, 7 Jan 2015 22:25:19 +0000 (14:25 -0800)]
Improve VCARD filter logic and reduce log spam
Remove a stray log message in VCardFilter.applyFilter() function that
leads to high-frequency log spam during phone book synchronization. Also
refactored the logic to avoid multiple loops & loop iterations causing
higher CPU load.
Bug:
18913091
Change-Id: I3c6d3c3373d4a74a930d182ee2641959461b0556
Wei Wang [Fri, 9 Jan 2015 22:39:35 +0000 (14:39 -0800)]
Fix Bluetooth crash when all filters are used.
Bug:
18963121
Change-Id: Ia69ad697d5be5b0a5e076f33e513aa2698a7468c
Andre Eisenbach [Thu, 18 Dec 2014 22:44:19 +0000 (22:44 +0000)]
am
a4774d88: am
cd1091ef: Merge "Add EventLog for configHciSnoopLog() security check" into lmp-mr1-dev
* commit '
a4774d8857beabf477f5093060bda2ca0356632d':
Add EventLog for configHciSnoopLog() security check
Andre Eisenbach [Thu, 18 Dec 2014 22:40:35 +0000 (22:40 +0000)]
am
cd1091ef: Merge "Add EventLog for configHciSnoopLog() security check" into lmp-mr1-dev
* commit '
cd1091ef948a708bd5ce83f6dc2921710a217684':
Add EventLog for configHciSnoopLog() security check
Andre Eisenbach [Thu, 18 Dec 2014 22:33:38 +0000 (22:33 +0000)]
Merge "Add EventLog for configHciSnoopLog() security check" into lmp-mr1-dev
Sungmin Choi [Thu, 18 Dec 2014 06:42:20 +0000 (15:42 +0900)]
Add hwp MIME type to transfer/receive over bluetooth
Bug:
18788282
Change-Id: I2f67cf7b492d3e22d09dbe002a2a93d653db7736
Andre Eisenbach [Wed, 17 Dec 2014 21:45:18 +0000 (13:45 -0800)]
Add EventLog for configHciSnoopLog() security check
Bug:
18643224
Change-Id: I9c3f5e0880310e02a187d88349c5624bdade42eb
Andre Eisenbach [Wed, 17 Dec 2014 17:05:58 +0000 (17:05 +0000)]
am
b8a3025b: am
da70d245: Merge "Enforce BLUETOOTH_PRIVILEGED permission for HID-over-GATT" into lmp-mr1-dev
* commit '
b8a3025ba9c8bd166496e7683613402d302323e5':
Enforce BLUETOOTH_PRIVILEGED permission for HID-over-GATT
Andre Eisenbach [Wed, 17 Dec 2014 17:00:29 +0000 (17:00 +0000)]
am
da70d245: Merge "Enforce BLUETOOTH_PRIVILEGED permission for HID-over-GATT" into lmp-mr1-dev
* commit '
da70d245699bdf2d6c9ffcf409ce3213804de81a':
Enforce BLUETOOTH_PRIVILEGED permission for HID-over-GATT
Andre Eisenbach [Wed, 17 Dec 2014 16:55:57 +0000 (16:55 +0000)]
Merge "Enforce BLUETOOTH_PRIVILEGED permission for HID-over-GATT" into lmp-mr1-dev
Santos Cordon [Wed, 17 Dec 2014 16:46:52 +0000 (16:46 +0000)]
am
dd7ad56b: am
17adc53c: Merge "Allow system process to interact with Bluetooth across users." into lmp-mr1-dev
* commit '
dd7ad56b9bd470c7312136e91d6d803287c3a3cc':
Allow system process to interact with Bluetooth across users.
Santos Cordon [Wed, 17 Dec 2014 16:41:19 +0000 (16:41 +0000)]
am
17adc53c: Merge "Allow system process to interact with Bluetooth across users." into lmp-mr1-dev
* commit '
17adc53c8583e7cadbdfbe39f6a989ff2b98c521':
Allow system process to interact with Bluetooth across users.
Santos Cordon [Wed, 17 Dec 2014 16:21:05 +0000 (16:21 +0000)]
Merge "Allow system process to interact with Bluetooth across users." into lmp-mr1-dev
Andre Eisenbach [Tue, 16 Dec 2014 21:43:52 +0000 (13:43 -0800)]
Enforce BLUETOOTH_PRIVILEGED permission for HID-over-GATT
Bug:
18359172
Change-Id: I06ed22af9dab8129ba7668dadd5b988d63c8a527
Santos Cordon [Tue, 16 Dec 2014 18:02:44 +0000 (10:02 -0800)]
Allow system process to interact with Bluetooth across users.
Bug:
18688307
Change-Id: If31703fbe515baa40c242f99a61479a1ec8152b1
Andre Eisenbach [Tue, 16 Dec 2014 19:56:48 +0000 (19:56 +0000)]
am
b8997ce7: am
561f8821: Merge "Prevent possible NullPointerException when service is destroyed" into lmp-mr1-dev
* commit '
b8997ce7ac3c917edf71a2880b68541678c5fec3':
Prevent possible NullPointerException when service is destroyed
Andre Eisenbach [Tue, 16 Dec 2014 19:52:24 +0000 (19:52 +0000)]
am
561f8821: Merge "Prevent possible NullPointerException when service is destroyed" into lmp-mr1-dev
* commit '
561f8821e976cfcdd5503e1b645417ef6506a995':
Prevent possible NullPointerException when service is destroyed
Andre Eisenbach [Tue, 16 Dec 2014 19:46:34 +0000 (19:46 +0000)]
Merge "Prevent possible NullPointerException when service is destroyed" into lmp-mr1-dev
Andre Eisenbach [Tue, 16 Dec 2014 16:58:43 +0000 (08:58 -0800)]
Prevent possible NullPointerException when service is destroyed
Bug:
18757778
Change-Id: Iaf2c8e41a5733379d171f58a35d09c506080fe5d
Andre Eisenbach [Tue, 16 Dec 2014 17:05:12 +0000 (17:05 +0000)]
am
64c4e01e: am
ff125cce: Merge "Prevent duplicate OPP permission request dialogs" into lmp-mr1-dev
* commit '
64c4e01e7d4c0257f074ad03e149474a4f19d086':
Prevent duplicate OPP permission request dialogs
Andre Eisenbach [Tue, 16 Dec 2014 17:05:11 +0000 (17:05 +0000)]
am
8959f11b: am
79606a97: Prevent non-system users from enabling Bluetooth HCI logging
* commit '
8959f11b523a4418f3ec2b46c7c50199c0d4de86':
Prevent non-system users from enabling Bluetooth HCI logging
Andre Eisenbach [Tue, 16 Dec 2014 16:59:48 +0000 (16:59 +0000)]
am
ff125cce: Merge "Prevent duplicate OPP permission request dialogs" into lmp-mr1-dev
* commit '
ff125cce1a5689a64e0eb4810851c3ef4304a1d3':
Prevent duplicate OPP permission request dialogs
Andre Eisenbach [Tue, 16 Dec 2014 16:59:48 +0000 (16:59 +0000)]
am
79606a97: Prevent non-system users from enabling Bluetooth HCI logging
* commit '
79606a976b1ba0399ef94798b82e180c8376ecaf':
Prevent non-system users from enabling Bluetooth HCI logging
Andre Eisenbach [Tue, 16 Dec 2014 16:43:23 +0000 (16:43 +0000)]
Merge "Prevent duplicate OPP permission request dialogs" into lmp-mr1-dev
Andre Eisenbach [Tue, 16 Dec 2014 01:59:25 +0000 (17:59 -0800)]
Prevent non-system users from enabling Bluetooth HCI logging
Bug:
18643224
Change-Id: I990aa3dac478d332f565496d0353c9677ea85d46
Narayan Kamath [Mon, 15 Dec 2014 16:33:19 +0000 (16:33 +0000)]
am
a4a61b09: Merge "Remove bogus apache-http dependency."
* commit '
a4a61b09975d8cefbc7baa7313376c87a585b476':
Remove bogus apache-http dependency.
Narayan Kamath [Mon, 15 Dec 2014 14:25:31 +0000 (14:25 +0000)]
Merge "Remove bogus apache-http dependency."
Andre Eisenbach [Sun, 14 Dec 2014 20:22:31 +0000 (12:22 -0800)]
Prevent duplicate OPP permission request dialogs
When multiple files are sent in a single OPP session, the user should be
prompted to accept/reject only once.
Bug:
17770561
Change-Id: I438116915883c5fdc2d743f13456006f66511c0f
Narayan Kamath [Fri, 12 Dec 2014 16:19:52 +0000 (16:19 +0000)]
Remove bogus apache-http dependency.
Wasn't really being used for much of anything.
bug:
18027885
Change-Id: I714eaa0e066301c32a23fe46858a33f656106cfa
Wink Saville [Fri, 12 Dec 2014 14:42:51 +0000 (14:42 +0000)]
am
fc659040: am
75f77e99: Merge "Rename isValidSubId to isValidSubscriptionid." into lmp-mr1-dev
* commit '
fc65904080390e0ce02f8c0cc2d4033ed0f61494':
Rename isValidSubId to isValidSubscriptionid.
Kim Schulz [Fri, 12 Dec 2014 14:42:04 +0000 (14:42 +0000)]
am
ac3708eb: am
28446a56: Prevent Cursor leakage in Bluetooth MAP
* commit '
ac3708eb8c12d68feac636487db01f06acaf7681':
Prevent Cursor leakage in Bluetooth MAP
Wink Saville [Fri, 12 Dec 2014 04:37:48 +0000 (04:37 +0000)]
am
75f77e99: Merge "Rename isValidSubId to isValidSubscriptionid." into lmp-mr1-dev
* commit '
75f77e9970a4b4492e025257fccefcce612bc501':
Rename isValidSubId to isValidSubscriptionid.
Wink Saville [Fri, 12 Dec 2014 04:23:13 +0000 (04:23 +0000)]
Merge "Rename isValidSubId to isValidSubscriptionid." into lmp-mr1-dev
Kim Schulz [Fri, 12 Dec 2014 00:09:08 +0000 (00:09 +0000)]
am
28446a56: Prevent Cursor leakage in Bluetooth MAP
* commit '
28446a56718e80574ba7b81901fc5a1368bf5839':
Prevent Cursor leakage in Bluetooth MAP
Kim Schulz [Wed, 10 Dec 2014 20:51:46 +0000 (12:51 -0800)]
Prevent Cursor leakage in Bluetooth MAP
Bug:
18415378
Change-Id: Id513ee848dd21c641d77be38bdc6be85b5ef87a8
Wink Saville [Thu, 11 Dec 2014 18:09:43 +0000 (10:09 -0800)]
Rename isValidSubId to isValidSubscriptionid.
Bug:
18668873
Change-Id: Ie709a62bbb74e0a767daeb9e3fb3aecd4c45df44
Andre Eisenbach [Tue, 9 Dec 2014 17:15:11 +0000 (17:15 +0000)]
am
1c0e2f0a: am
95ada143: Merge "Remove missing object to avoid NPE" into lmp-mr1-dev
* commit '
1c0e2f0af82c2dedb4919e935e911edb9d0f6830':
Remove missing object to avoid NPE
Andre Eisenbach [Tue, 9 Dec 2014 17:07:52 +0000 (17:07 +0000)]
am
95ada143: Merge "Remove missing object to avoid NPE" into lmp-mr1-dev
* commit '
95ada14315a8ed5650508342a673710b3504af7e':
Remove missing object to avoid NPE
Andre Eisenbach [Tue, 9 Dec 2014 17:02:53 +0000 (17:02 +0000)]
Merge "Remove missing object to avoid NPE" into lmp-mr1-dev
Wei Wang [Tue, 9 Dec 2014 00:18:17 +0000 (00:18 +0000)]
am
4dd91650: am
4bb5e13f: Fix timestamp parsing issue for full scan results.
* commit '
4dd916507f692ca52a67fd9cc150d805e36055eb':
Fix timestamp parsing issue for full scan results.
Wei Wang [Tue, 9 Dec 2014 00:07:59 +0000 (00:07 +0000)]
am
4bb5e13f: Fix timestamp parsing issue for full scan results.
* commit '
4bb5e13f2902dc78048ede782996e78e7314afd5':
Fix timestamp parsing issue for full scan results.
Jason Monk [Mon, 8 Dec 2014 19:42:19 +0000 (19:42 +0000)]
am
7d8cf021: am
c493bf36: Merge "Allow SystemUI access to bluetooth from user 0" into lmp-mr1-dev
* commit '
7d8cf02125e4589270a2a6952ea068660e34e743':
Allow SystemUI access to bluetooth from user 0
Prem Kumar [Mon, 8 Dec 2014 19:41:14 +0000 (19:41 +0000)]
am
608d17e9: am
fa9d2030: Merge "Revert "Bluetooth: Added Shared Preferences to restore tethering preference"" into lmp-mr1-dev
* commit '
608d17e9c62c36c900259cd16fe41e1b02e93664':
Revert "Bluetooth: Added Shared Preferences to restore tethering preference"