OSDN Git Service

android-x86/packages-apps-Bluetooth.git
7 years agoresolve merge conflicts of f606637 to mnc-dev
Ajay Panicker [Tue, 6 Dec 2016 03:23:49 +0000 (19:23 -0800)]
resolve merge conflicts of f606637 to mnc-dev

Change-Id: I2e516b0eb36973e097d7837479377a7063b16765

7 years agoRemove MANAGE_DOCUMENTS permission as it isn't needed am: c37f27194b
Ajay Panicker [Tue, 6 Dec 2016 02:52:26 +0000 (02:52 +0000)]
Remove MANAGE_DOCUMENTS permission as it isn't needed am: c37f27194b
am: 2f1531712d

Change-Id: I7544a341b02cb6a6820d0f16d9d7ba0011f263ee

7 years agoRemove MANAGE_DOCUMENTS permission as it isn't needed
Ajay Panicker [Tue, 6 Dec 2016 02:49:56 +0000 (02:49 +0000)]
Remove MANAGE_DOCUMENTS permission as it isn't needed
am: c37f27194b

Change-Id: I60c7f1ac1f5263751882b93bd20635bca05aba10

7 years agoRemove MANAGE_DOCUMENTS permission as it isn't needed
Ajay Panicker [Thu, 17 Nov 2016 23:50:36 +0000 (15:50 -0800)]
Remove MANAGE_DOCUMENTS permission as it isn't needed

Bug: 32612586
Change-Id: Iebe7dc9b198ce99d5921f5a349ba9d5d4424d156

7 years agoMerge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" into lmp...
Ajay Panicker [Wed, 21 Sep 2016 02:09:12 +0000 (02:09 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" into lmp-mr1-dev am: 0ccca8ac62 am: 56fc3a7642
am: 5bc4962e53  -s ours

Change-Id: Ibd76e7968c99b10e21ecfe313fb584a64ac41951

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3dd11d0a34...
Ajay Panicker [Wed, 21 Sep 2016 02:09:11 +0000 (02:09 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3dd11d0a34 am: 28dc531ac7
am: 460561cb28  -s ours

Change-Id: I44a2426109e19eb972b1cd57563dfb40d3b91561

7 years agoMerge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" into lmp...
Ajay Panicker [Wed, 21 Sep 2016 02:00:31 +0000 (02:00 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" into lmp-mr1-dev am: 0ccca8ac62
am: 56fc3a7642

Change-Id: Ief8c3e89f7c31045239e6f60d801a30525a68874

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3dd11d0a34
Ajay Panicker [Wed, 21 Sep 2016 01:59:20 +0000 (01:59 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3dd11d0a34
am: 28dc531ac7

Change-Id: I0066914efcd0dd741b4d27d3633d49248180578e

7 years agoMerge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668f...
Ajay Panicker [Wed, 21 Sep 2016 01:03:20 +0000 (01:03 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8 am: 2c3e8b5898 am: 77a38cb641  -s ours" into lmp-dev am: 60b2ea959d  -s ours am: fcc8d6c900 am: 64998914de
am: 0d4475fc01  -s ours

Change-Id: Ib1f79cd0b3498aef5a1d797cc5c8b485ac6e2f23

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8...
Ajay Panicker [Wed, 21 Sep 2016 01:03:17 +0000 (01:03 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8 am: 2c3e8b5898 am: 77a38cb641  -s ours am: 1a3a6accdc  -s ours am: 05a136ed33 am: 285c44140c
am: 2f7e244816  -s ours

Change-Id: I3e1ca8cdfa6a0072fe6db1b913a6f3330da39edf

7 years agoMerge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" into lmp...
Ajay Panicker [Wed, 21 Sep 2016 01:02:29 +0000 (01:02 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" into lmp-mr1-dev
am: 0ccca8ac62

Change-Id: I58afc49fbbd9d1308323b9947edd21f56c87b812

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)
Ajay Panicker [Wed, 21 Sep 2016 01:01:43 +0000 (01:01 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)
am: 3dd11d0a34

Change-Id: I983bc5c8ff9cf7249f9da14ac33595b4e6666a65

7 years agoMerge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" into lmp...
TreeHugger Robot [Wed, 21 Sep 2016 00:52:46 +0000 (00:52 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" into lmp-mr1-dev

7 years agoMerge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668f...
Ajay Panicker [Wed, 21 Sep 2016 00:47:56 +0000 (00:47 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8 am: 2c3e8b5898 am: 77a38cb641  -s ours" into lmp-dev am: 60b2ea959d  -s ours am: fcc8d6c900
am: 64998914de

Change-Id: I90fbf86ed01f1b22bc3bc251241250d1df900332

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8...
Ajay Panicker [Wed, 21 Sep 2016 00:47:54 +0000 (00:47 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8 am: 2c3e8b5898 am: 77a38cb641  -s ours am: 1a3a6accdc  -s ours am: 05a136ed33
am: 285c44140c

Change-Id: I13eaddb2db3073e4a1de8c63480a069cd0b78170

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 554f13336e...
Ajay Panicker [Wed, 21 Sep 2016 00:45:32 +0000 (00:45 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 554f13336e  -s ours am: 8fe2b32637 am: 0c98432a94
am: 5ff155974f  -s ours

Change-Id: Ib4c5f26da7912161d7cad1b23d9172379bf899ba

7 years agoMerge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668f...
Ajay Panicker [Wed, 21 Sep 2016 00:42:07 +0000 (00:42 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8 am: 2c3e8b5898 am: 77a38cb641  -s ours" into lmp-dev am: 60b2ea959d  -s ours
am: fcc8d6c900

Change-Id: I0422c6b824af052ba01bec484f400a2ff91d9890

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8...
Ajay Panicker [Wed, 21 Sep 2016 00:42:06 +0000 (00:42 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8 am: 2c3e8b5898 am: 77a38cb641  -s ours am: 1a3a6accdc  -s ours
am: 05a136ed33

Change-Id: I791af270ae6d542f72c2751159289082ac49df7f

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 554f13336e...
Ajay Panicker [Wed, 21 Sep 2016 00:40:04 +0000 (00:40 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 554f13336e  -s ours am: 8fe2b32637
am: 0c98432a94

Change-Id: If2baba2e684084a0ca5b74606675d5f0934a2833

7 years agoMerge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668f...
Ajay Panicker [Wed, 21 Sep 2016 00:37:40 +0000 (00:37 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8 am: 2c3e8b5898 am: 77a38cb641  -s ours" into lmp-dev
am: 60b2ea959d  -s ours

Change-Id: Id90024c2155db8b9da83feecf4dddf370e3c610f

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8...
Ajay Panicker [Wed, 21 Sep 2016 00:36:35 +0000 (00:36 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8 am: 2c3e8b5898 am: 77a38cb641  -s ours
am: 1a3a6accdc  -s ours

Change-Id: I031461f1073654ffa42a7c2e1fb934631374bc88

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 554f13336e...
Ajay Panicker [Wed, 21 Sep 2016 00:21:21 +0000 (00:21 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 554f13336e  -s ours
am: 8fe2b32637

Change-Id: I37ccabcb68fbf3f09ec8114493fddceae90a6a23

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)
Ajay Panicker [Wed, 21 Sep 2016 00:12:22 +0000 (00:12 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)
am: 554f13336e  -s ours

Change-Id: I3eafa8236429c8ba5ba54ee5464e3f0fd1622bb7

7 years agoMerge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668f...
Android Build Merger (Role) [Wed, 21 Sep 2016 00:05:40 +0000 (00:05 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8 am: 2c3e8b5898 am: 77a38cb641  -s ours" into lmp-dev

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8...
Ajay Panicker [Wed, 21 Sep 2016 00:04:38 +0000 (00:04 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8 am: 2c3e8b5898
am: 77a38cb641  -s ours

Change-Id: I93e490e6f7ff7ca24e0ef5a321565db21a08f9a4

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8
Ajay Panicker [Tue, 20 Sep 2016 23:56:57 +0000 (23:56 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8
am: 2c3e8b5898

Change-Id: Iddbee8b99be3c4e5c4305d9172ef7f23880a12f6

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)
Ajay Panicker [Thu, 8 Sep 2016 17:55:51 +0000 (10:55 -0700)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)

setPairingConfirmation was set to only require BLUETOOTH_ADMIN
permission which shouldn't be able to set the confirmation itself.

This is restricted to BLUETOOTH_PRIVILEGED permission.

Bug: 29043989
Change-Id: Iae8e31b25795989446265fdcc5eb27e6ffaf29aa

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)
Ajay Panicker [Tue, 20 Sep 2016 23:49:08 +0000 (23:49 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)
am: 3ccc668ff8

Change-Id: I5932ce563c8858824a6aa8732f13aecb00d9099e

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)
Ajay Panicker [Thu, 8 Sep 2016 17:55:51 +0000 (10:55 -0700)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)

setPairingConfirmation was set to only require BLUETOOTH_ADMIN
permission which shouldn't be able to set the confirmation itself.

This is restricted to BLUETOOTH_PRIVILEGED permission.

Bug: 29043989
Change-Id: Iae8e31b25795989446265fdcc5eb27e6ffaf29aa

7 years agoFix setPairingConfirmation permissions issue (1/2)
Ajay Panicker [Thu, 8 Sep 2016 17:55:51 +0000 (10:55 -0700)]
Fix setPairingConfirmation permissions issue (1/2)

setPairingConfirmation was set to only require BLUETOOTH_ADMIN
permission which shouldn't be able to set the confirmation itself.

This is restricted to BLUETOOTH_PRIVILEGED permission.

Bug: 29043989
Change-Id: Iae8e31b25795989446265fdcc5eb27e6ffaf29aa

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)
Ajay Panicker [Thu, 8 Sep 2016 17:55:51 +0000 (10:55 -0700)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)

setPairingConfirmation was set to only require BLUETOOTH_ADMIN
permission which shouldn't be able to set the confirmation itself.

This is restricted to BLUETOOTH_PRIVILEGED permission.

Bug: 29043989
Change-Id: Iae8e31b25795989446265fdcc5eb27e6ffaf29aa

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 15 Aug 2016 17:18:53 +0000 (10:18 -0700)]
Import translations. DO NOT MERGE

Change-Id: If36a280cdc94dde060283230bc797125baeebc72
Auto-generated-cl: translation import

8 years agoAdd guest mode functionality (3/3) am: e1ca5cccd6 am: 480b762641 am: b01d679002
Ajay Panicker [Tue, 24 May 2016 22:13:11 +0000 (22:13 +0000)]
Add guest mode functionality (3/3) am: e1ca5cccd6 am: 480b762641 am: b01d679002
am: 0b2a403b82  -s ours

* commit '0b2a403b821149b8d0c6ec3ab28db46beff3d75e':
  Add guest mode functionality (3/3)

Change-Id: Ic32d37360b9a73b10b27bed3a73d9fdf865db346

8 years agoAdd guest mode functionality (3/3) am: e1ca5cccd6 am: 480b762641
Ajay Panicker [Tue, 24 May 2016 22:07:27 +0000 (22:07 +0000)]
Add guest mode functionality (3/3) am: e1ca5cccd6 am: 480b762641
am: b01d679002

* commit 'b01d6790028caf2ba951d5c6eeacf7d4f8ecbbd3':
  Add guest mode functionality (3/3)

Change-Id: I98de45cdc87a200c4ff32ccfac88d42edac767a5

8 years agoAdd guest mode functionality (3/3) am: e1ca5cccd6
Ajay Panicker [Tue, 24 May 2016 22:05:26 +0000 (22:05 +0000)]
Add guest mode functionality (3/3) am: e1ca5cccd6
am: 480b762641

* commit '480b76264134b6a44aef6948f32b4bd6a62fcd0f':
  Add guest mode functionality (3/3)

Change-Id: I512cef0d0c23d4702cf9de61be4bf8f47c164bac

8 years agoAdd guest mode functionality (3/3)
Ajay Panicker [Tue, 24 May 2016 22:02:02 +0000 (22:02 +0000)]
Add guest mode functionality (3/3)
am: e1ca5cccd6

* commit 'e1ca5cccd6c2b37f783aa0ee2d9371108ad5c855':
  Add guest mode functionality (3/3)

Change-Id: I9f3c034215aadf5e5ebd77e4a3265c7fbcf21fe3

8 years agoAdd guest mode functionality (3/3)
Ajay Panicker [Fri, 18 Mar 2016 00:12:08 +0000 (17:12 -0700)]
Add guest mode functionality (3/3)

Add a flag to enable() to start Bluetooth in restricted
mode. In restricted mode, all devices that are paired during
restricted mode are deleted upon leaving restricted mode.
Right now restricted mode is only entered while a guest
user is active.

Bug: 27410683
Change-Id: If4a8855faf362d7f6de509d7ddc7197d1ac75cee

8 years agoAdd guest mode functionality (3/3)
Ajay Panicker [Fri, 18 Mar 2016 00:12:08 +0000 (17:12 -0700)]
Add guest mode functionality (3/3)

Add a flag to enable() to start Bluetooth in restricted
mode. In restricted mode, all devices that are paired during
restricted mode are deleted upon leaving restricted mode.
Right now restricted mode is only entered while a guest
user is active.

Bug: 27410683
Change-Id: If4a8855faf362d7f6de509d7ddc7197d1ac75cee

8 years ago"DO NOT MERGE" Add write SMS protection am: fd7a794 -s ours am: daa8d67 am: 5eee2cd
Ajay Panicker [Tue, 19 Apr 2016 20:33:14 +0000 (20:33 +0000)]
"DO NOT MERGE" Add write SMS protection am: fd7a794  -s ours am: daa8d67 am: 5eee2cd
am: 48115bb  -s ours

* commit '48115bb85ee7c7692b9c70afaa8b0d6a32c24a95':
  "DO NOT MERGE" Add write SMS protection

Change-Id: I39546ac3a880b12ddeb33c383184967e90209349

8 years ago"DO NOT MERGE" Add write SMS protection am: fd7a794 -s ours am: daa8d67
Ajay Panicker [Tue, 19 Apr 2016 20:30:02 +0000 (20:30 +0000)]
"DO NOT MERGE" Add write SMS protection am: fd7a794  -s ours am: daa8d67
am: 5eee2cd

* commit '5eee2cd8453f5990d1202d010df01eca724e1010':
  "DO NOT MERGE" Add write SMS protection

Change-Id: Id83f27fd2d8b2431cea51c8eb5a4ca152a872647

8 years ago"DO NOT MERGE" Add write SMS protection am: fd7a794 -s ours
Ajay Panicker [Tue, 19 Apr 2016 20:26:39 +0000 (20:26 +0000)]
"DO NOT MERGE" Add write SMS protection am: fd7a794  -s ours
am: daa8d67

* commit 'daa8d67fe2e26eb9d5282006eb7ec17306b7e277':
  "DO NOT MERGE" Add write SMS protection

Change-Id: Ia8f55d6ba4a5d008b107673d8830208c3eefd30a

8 years ago"DO NOT MERGE" Add write SMS protection
Ajay Panicker [Tue, 19 Apr 2016 20:23:20 +0000 (20:23 +0000)]
"DO NOT MERGE" Add write SMS protection
am: fd7a794  -s ours

* commit 'fd7a794fc57e06606244b9fc1673c9c549cce5c4':
  "DO NOT MERGE" Add write SMS protection

Change-Id: I3dcb78c9213b10ad354c72ab756af773c04213c7

8 years ago"DO NOT MERGE" Add write SMS protection
Seven Shen [Wed, 6 Apr 2016 19:25:17 +0000 (12:25 -0700)]
"DO NOT MERGE" Add write SMS protection

Bug: 25138326
Change-Id: I9f418370b8725d49e3734406b6f435107bcff021

8 years ago"DO NOT MERGE" Add write SMS protection
Ajay Panicker [Wed, 6 Apr 2016 22:55:15 +0000 (15:55 -0700)]
"DO NOT MERGE" Add write SMS protection

Bug: 25138326
Change-Id: I494db57e9291fac108e2abae85db367992ad81a1

8 years agoDO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue am: abb54d6d36...
Andre Eisenbach [Tue, 12 Jan 2016 19:02:36 +0000 (19:02 +0000)]
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue am: abb54d6d36 am: 6e9165b908  -s ours am: 44c3652b4c am: 5a1ae16f4e
am: d59eb61a3e  -s ours

* commit 'd59eb61a3ef94ef69bbbcf8e039895d0fb2fd379':
  DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue

8 years agoDO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue am: abb54d6d36...
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

8 years agoDO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue am: abb54d6d36...
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

8 years agoDO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue am: abb54d6d36
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

8 years agoDO 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

8 years agoDO 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

8 years agoDO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
Ashwini Munigala [Mon, 7 Sep 2015 16:08:09 +0000 (21:38 +0530)]
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

9 years agoFix column ID for PBAP name lookup
Andre Eisenbach [Tue, 1 Sep 2015 00:17:42 +0000 (17:17 -0700)]
Fix column ID for PBAP name lookup

When a phonebook lookup is performed to resolve a phone number into a
name, the wrong column ID is used to retrieve the value from the cursor,
causing an un-caught exception and a failed lookup.

Bug: 22953958
Change-Id: I1f826412916012382903fdf30d43d5cb3516432c

9 years agoHFP/A2DP: Remove pending auto-connect messages when connected
Ajay Panicker [Wed, 26 Aug 2015 20:58:38 +0000 (13:58 -0700)]
HFP/A2DP: Remove pending auto-connect messages when connected

Fixes a bug in which being paired with multiple headsets causes
previously connected headsets to disconnect. This fix removes
pending connect attemps once one device is successfully connected.

Bug: 23111466
Change-Id: Id471189d92643b9626e63197c00e76defd0a72bf

9 years agoMake location enabled check configurable when returning scan results.
Sharvil Nanavati [Wed, 19 Aug 2015 18:17:31 +0000 (11:17 -0700)]
Make location enabled check configurable when returning scan results.

Some device classes (e.g. Wear) don't allow location to be enabled but
would still like to allow LE scanning to take place. This patch allows
the location enabled check to be bypassed if the platform is so configured.
Even if the location check is disabled, the calling app must still have
one of the location permissions.

Bug: 21852542
Change-Id: I206366ce262776d4668c0c42e066f0e20f5fdfeb

9 years agoBlock results if location is disabled in Settings
Fyodor Kupolov [Fri, 10 Jul 2015 01:40:51 +0000 (18:40 -0700)]
Block results if location is disabled in Settings

Apps holding PEERS_MAC_ADDRESS permission can still access scan results.

Bug: 21852542
Change-Id: I75fc289e8965df64efb7ff84fe5a4204904724ab

9 years agoRevert "Bluetooth-OPP: Enable support to send same file multiple times"
Pavlin Radoslavov [Sat, 8 Aug 2015 01:13:07 +0000 (18:13 -0700)]
Revert "Bluetooth-OPP: Enable support to send same file multiple times"

This reverts commit 86449ac4bc7a8f4b2afeab4da420ae4f980c850a.

The revert is needed to address an issue that crashes Bluetooth.

Bug: 22836458
Change-Id: I8c8b51544637dd1c2250eb91e86cb2ca1bbc9fe7

9 years agoam 38b70dd3: (-s ours) am 89cdf16b: am 2816b2cb: am 0a268209: am 6b58105c: am 75d042a...
Miao Chou [Sat, 8 Aug 2015 01:02:32 +0000 (01:02 +0000)]
am 38b70dd3: (-s ours) 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 '38b70dd36255415c1a9fa638122ad4689846f393':
  DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS

9 years agoam 89cdf16b: am 2816b2cb: am 0a268209: am 6b58105c: am 75d042a4: (-s ours) am ef9b774...
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

9 years agoam 2816b2cb: am 0a268209: am 6b58105c: am 75d042a4: (-s ours) am ef9b774c: am 0f6aaa5...
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

9 years agoam 0a268209: am 6b58105c: am 75d042a4: (-s ours) am ef9b774c: am 0f6aaa5a: DO NOT...
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

9 years agoam 2c7ffe6b: (-s ours) am 1267abe1: am b117219a: am 46f1dd6d: am 19004c75: DO NOT...
Miao Chou [Sat, 8 Aug 2015 00:41:30 +0000 (00:41 +0000)]
am 2c7ffe6b: (-s ours) am 1267abe1: am b117219a: am 46f1dd6d: am 19004c75: DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS

* commit '2c7ffe6b2dd6dbc9fb53c548401da46a9068bef1':
  DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS

9 years agoam 6b58105c: am 75d042a4: (-s ours) am ef9b774c: am 0f6aaa5a: DO NOT MERGE Fix securi...
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

9 years agoam 1267abe1: am b117219a: am 46f1dd6d: am 19004c75: DO NOT MERGE Fix security vulnera...
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

9 years agoam b117219a: am 46f1dd6d: am 19004c75: DO NOT MERGE Fix security vulnerabilities...
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

9 years agoam 75d042a4: (-s ours) am ef9b774c: am 0f6aaa5a: DO NOT MERGE Fix security vulnerabil...
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

9 years agoam ef9b774c: am 0f6aaa5a: DO NOT MERGE Fix security vulnerabilities in permission...
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

9 years agoam 46f1dd6d: am 19004c75: DO NOT MERGE Fix security vulnerabilities in permission...
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

9 years agoam 0f6aaa5a: DO NOT MERGE Fix security vulnerabilities in permission of deleting...
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

9 years agoam 19004c75: DO NOT MERGE Fix security vulnerabilities in permission of deleting...
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

9 years agoDO 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

9 years agoDO 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

9 years agoImplement Bluetooth settings factory reset (1/5)
Ajay Panicker [Tue, 28 Jul 2015 23:47:54 +0000 (16:47 -0700)]
Implement Bluetooth settings factory reset (1/5)

Implemented the factory reset function to be used to reset all bluetooth
settings on device to factory default

Bug: 16161518

9 years agoMerge "Change MNC codename to just M." into mnc-dev
Dianne Hackborn [Fri, 31 Jul 2015 17:12:00 +0000 (17:12 +0000)]
Merge "Change MNC codename to just M." into mnc-dev

9 years agoChange MNC codename to just M.
Dianne Hackborn [Wed, 29 Jul 2015 22:22:43 +0000 (15:22 -0700)]
Change MNC codename to just M.

Change-Id: I1e5989dbc73f89bd292465142560952bc8e44f59

9 years agoLegacy foreground apps should continue getting scan results
Fyodor Kupolov [Wed, 29 Jul 2015 21:32:54 +0000 (14:32 -0700)]
Legacy foreground apps should continue getting scan results

Pre-M apps running in the foreground now get scan results. For legacy apps
running in the background, no results are returned and the error is logged.

Bug: 21852542
Change-Id: Ic7a91f34c6718c26f0dae30dade6a436fe1061af

9 years agoFix security vulnerabilities in permission of deleting MMS/SMS
Miao Chou [Mon, 20 Jul 2015 19:14:25 +0000 (12:14 -0700)]
Fix security vulnerabilities in permission of deleting MMS/SMS

This CL adds permission and PID checks to avoid unauthorized deletion of any
MMS/SMS messages in BluetoothMapContentObserver.actionMessageSentDisconnected
function.

Bug: 22343270
Change-Id: I30254036309733be4d54db17a8ef17a571cd1c5a

9 years agoAdd ACCESS_COARSE_LOCATION to Bluetooth.
tturney [Thu, 23 Jul 2015 19:50:32 +0000 (12:50 -0700)]
Add ACCESS_COARSE_LOCATION to Bluetooth.

Bug: 22713866
Change-Id: Idb53b0e9e877221cea3e4af3c8c7c4db51616105

9 years agoReturn no track selected if no track is currently selected.
beryl hou [Fri, 3 Jul 2015 11:39:29 +0000 (19:39 +0800)]
Return no track selected if no track is currently selected.

Fix to satisfy AVRCP 1.4 spec.
In EVENT_TRACK_CHANGED response request,
if a track is selected , then return 0x0 in the response.
if no track currently selected,then return 0xFFFFFFFFFFFFFFFF in the INTERIN response.

Bug: 22519285

Change-Id: Iaaae1d4acf918049d99c27d9ad98bde15242ade1

9 years agoMerge "Enforce location permission for apps targeting M" into mnc-dev
Fyodor Kupolov [Thu, 23 Jul 2015 17:22:30 +0000 (17:22 +0000)]
Merge "Enforce location permission for apps targeting M" into mnc-dev

9 years agoPBAP: Fixes for proper working of filter functionality.
Hemant Gupta [Wed, 24 Jun 2015 14:55:27 +0000 (20:25 +0530)]
PBAP: Fixes for proper working of filter functionality.

The change consists of fixes required for the filter to work properly.

Without this change the API isFilteredOut() was basically removing those
attributes which are set in the filter while the expected behaviour is other
way round, so renamed the API to isFilteredIn().
This patch also adds provision for filtering call log date and time when
it is not been asked as per the filter since it is not a mandatory attribute
as per the PBAP specification.
This patch also renames "NOTES" to "NOTE" which was incorrect property for
vcards.

Bug: 20077258
Change-Id: Ifbe57706b86031cbb9656556843da1bab700ef5d

9 years agoEnforce location permission for apps targeting M
Fyodor Kupolov [Wed, 22 Jul 2015 01:41:45 +0000 (18:41 -0700)]
Enforce location permission for apps targeting M

Enforce location permission for apps targeting M, for legacy apps, log an
error.

Bug: 21852542
Change-Id: Ic406df1727eb0939531a22b76c2df9b13f03ec81

9 years agoMerge "Remove extra logging with privacy info" into mnc-dev
Chenjie Luo [Wed, 15 Jul 2015 17:16:03 +0000 (17:16 +0000)]
Merge "Remove extra logging with privacy info" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 16:13:32 +0000 (09:13 -0700)]
Import translations. DO NOT MERGE

Change-Id: I88014ec98dbf4bde9445536af89fe148617a3b55
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 14:24:31 +0000 (07:24 -0700)]
Import translations. DO NOT MERGE

Change-Id: I9edf401971f0d22103afd16054344412d9f69e07
Auto-generated-cl: translation import

9 years agoMerge "Fix String alignment in BT Settings in Hebrew locale." into mnc-dev
Sanket Padawe [Wed, 15 Jul 2015 02:01:48 +0000 (02:01 +0000)]
Merge "Fix String alignment in BT Settings in Hebrew locale." into mnc-dev

9 years agoMerge "Require ACCESS_COARSE_LOCATION for ACTION_FOUND broadcast" into mnc-dev
Fyodor Kupolov [Wed, 15 Jul 2015 01:34:37 +0000 (01:34 +0000)]
Merge "Require ACCESS_COARSE_LOCATION for ACTION_FOUND broadcast" into mnc-dev

9 years agoRequire ACCESS_COARSE_LOCATION for ACTION_FOUND broadcast
Fyodor Kupolov [Tue, 14 Jul 2015 18:31:28 +0000 (11:31 -0700)]
Require ACCESS_COARSE_LOCATION for ACTION_FOUND broadcast

Receivers of ACTION_FOUND intent are now required to have
ACCESS_COARSE_LOCATION permission.

Bug: 21852542
Change-Id: Ia3bca7e9cd117536a3eb4f4d1fe405604b2ff40f

9 years agoRemove extra logging with privacy info
Chenjie Luo [Tue, 14 Jul 2015 23:51:19 +0000 (16:51 -0700)]
Remove extra logging with privacy info

Bug: 22075764
Change-Id: Id2f1c0d1660abd0c18de46c64596fc1a17b974ce

9 years agoFix String alignment in BT Settings in Hebrew locale.
Sanket Padawe [Tue, 14 Jul 2015 21:16:41 +0000 (14:16 -0700)]
Fix String alignment in BT Settings in Hebrew locale.

Bug: 22213885
Change-Id: I3ce35487fff306fad2554e5f9980dfde509eeb84

9 years agoMerge "Removing READ_PHONE_STATE perm since PRIVILEGED_PHONE_STATE is also used"...
Amit Mahajan [Mon, 13 Jul 2015 22:06:03 +0000 (22:06 +0000)]
Merge "Removing READ_PHONE_STATE perm since PRIVILEGED_PHONE_STATE is also used" into mnc-dev

9 years agoDisable SAP profile by default
Andre Eisenbach [Mon, 13 Jul 2015 15:42:02 +0000 (08:42 -0700)]
Disable SAP profile by default

Enable profile support in platform specific overlays.

Bug: 22436494
Change-Id: I09ce4460043da9746e45d384abe11d8d5eed4a2f

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 11 Jul 2015 14:05:57 +0000 (07:05 -0700)]
Import translations. DO NOT MERGE

Change-Id: I97edd1d88109a65ad3f7a80d2ed275ab6947e0a8
Auto-generated-cl: translation import

9 years agoRemoving READ_PHONE_STATE perm since PRIVILEGED_PHONE_STATE is also used
Amit Mahajan [Sat, 11 Jul 2015 00:17:51 +0000 (17:17 -0700)]
Removing READ_PHONE_STATE perm since PRIVILEGED_PHONE_STATE is also used

Bug: 22376654
Change-Id: I437f9bf324950cb70bae5be76699824da5897a6f

9 years agoPBAP: New Missed calls parameter not set correctly
kschulz [Wed, 19 Feb 2014 07:39:51 +0000 (08:39 +0100)]
PBAP: New Missed calls parameter not set correctly

When a PCE pull the missed-calls-phonebook (mch.vcf) from the PSE, a parameter
stating the number of _new_ missed calls must be included in the reply.
Currently the parameter is included but it is always set to zero, which is
incorrect.
This fix corrects the variable used for new missed calls

Bug: 13022843
Change-Id: I6094c50a76711cfff9347596d70ac2300cfbb543

9 years agoMerge "Do not return devices when caller has no location permission" into mnc-dev
Fyodor Kupolov [Thu, 9 Jul 2015 21:43:01 +0000 (21:43 +0000)]
Merge "Do not return devices when caller has no location permission" into mnc-dev

9 years agoMerge "Make string to plurals in BT inbound/outbound notification." into mnc-dev
Sanket Padawe [Thu, 9 Jul 2015 20:48:46 +0000 (20:48 +0000)]
Merge "Make string to plurals in BT inbound/outbound notification." into mnc-dev

9 years agoMerge "Make some BT screens RTL aligned in RTL context." into mnc-dev
Sanket Padawe [Thu, 9 Jul 2015 20:47:47 +0000 (20:47 +0000)]
Merge "Make some BT screens RTL aligned in RTL context." into mnc-dev

9 years agoMake string to plurals in BT inbound/outbound notification.
Sanket Padawe [Thu, 9 Jul 2015 18:42:42 +0000 (11:42 -0700)]
Make string to plurals in BT inbound/outbound notification.

Bug: 22215773
Change-Id: I21d06ec7839fdb4e1ba9b5a70c6ac7791788eb4f

9 years agoSet the Bluetooth state to OFF if there is disable timeout error
Pavlin Radoslavov [Wed, 8 Jul 2015 01:08:46 +0000 (18:08 -0700)]
Set the Bluetooth state to OFF if there is disable timeout error

Previously, if there was "disable timeout" error during Bluetooth
shutdown, the Bluetooth state was set back to ON. However, the
internal Bluetooth stack runtime state was cleaned-up and
practically unusable.

The solution is not to re-enable Bluetooth if there is a
"disable timeout" error.

Bug: 21873347
Change-Id: I561683fa391f7bacbb1aa8f80d8f6583c7d3099c

9 years agoMake some BT screens RTL aligned in RTL context.
Sanket Padawe [Thu, 9 Jul 2015 01:50:29 +0000 (18:50 -0700)]
Make some BT screens RTL aligned in RTL context.

Bug: 22288056
Bug: 22285480
Change-Id: I9be944e8d28c93dc1eabe6b03cd6b69692d0c105