Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
277,102 Commits 3 Branches 0 Tags
10f8f2e95cebe992c3df60340fb2a6705109b8f0
Commit Graph

277102 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad Ebinger
10f8f2e95c Merge "Modify AIDLs to include Session.Info" am: 78a63c1cf0 am: 9e4d4ee484 
am: 3030cd855b

Change-Id: I4d9b66c81f4f9fbebeacd9aede566f660c4b1bb8
 2016-10-31 17:22:46 +00:00
Brad Ebinger
3030cd855b Merge "Modify AIDLs to include Session.Info" am: 78a63c1cf0 
am: 9e4d4ee484

Change-Id: I9da7f4106bfec8ebba4515223a9dba40ffdaef20
 2016-10-31 17:17:57 +00:00
Brad Ebinger
9e4d4ee484 Merge "Modify AIDLs to include Session.Info" 
am: 78a63c1cf0

Change-Id: I0549ace3cc383bebac86a8b49cb87f631aecb552
 2016-10-31 17:12:26 +00:00
Brad Ebinger
78a63c1cf0 Merge "Modify AIDLs to include Session.Info" 2016-10-31 17:04:50 +00:00
Aga Madurska
5a5187edcd Update colors for the round scroll bar. am: 5177264735 
am: c78b695126

Change-Id: Iffaab844f7c0fab11cc429f06b450eb190737bc5
 2016-10-31 11:59:29 +00:00
Aga Madurska
c78b695126 Update colors for the round scroll bar. 
am: 5177264735

Change-Id: I576d9149292cc23ac72a734d5ac3986d199f7db8
 2016-10-31 11:53:51 +00:00
Aga Madurska
5177264735 Update colors for the round scroll bar. 
Bug:32536003

Change-Id: I35503c089bc918493aab3288580f81d7b780d671
 2016-10-31 10:55:07 +00:00
Sanket Agarwal
6b2b2a87f9 Merge "Use UUIDs for call management in Headset Client (HF)" am: 678ba24533 am: 958dab93cd 
am: 9527a19cbc

Change-Id: I9590f32bad7a3fccaf4479d3ffd004d2b7a91dad
 2016-10-28 20:28:50 +00:00
Brad Ebinger
5cf582e74d Merge "Modify AIDLs to include Session.Info" into stage-aosp-master am: aacbdf59d6 
am: ccd8315969

Change-Id: If1e6819430977bf3978bbbf23f0f32fcb1c460d4
 2016-10-28 20:26:51 +00:00
Brad Ebinger
e3f387fe3a Modify AIDLs to include Session.Info am: b32d4f8b5c 
am: 668a6fa227

Change-Id: I7afb3692f4f26c37b96c98d7a1e173576dd7620b
 2016-10-28 20:25:34 +00:00
Sanket Agarwal
9527a19cbc Merge "Use UUIDs for call management in Headset Client (HF)" am: 678ba24533 
am: 958dab93cd

Change-Id: Ie21c9be4b7177179ea4588d2832d0bbf72e7a3c1
 2016-10-28 20:19:14 +00:00
Brad Ebinger
ccd8315969 Merge "Modify AIDLs to include Session.Info" into stage-aosp-master 
am: aacbdf59d6

Change-Id: I272539ea7124fa18e42ee6f06c89d3ffca449934
 2016-10-28 20:17:15 +00:00
Brad Ebinger
668a6fa227 Modify AIDLs to include Session.Info 
am: b32d4f8b5c

Change-Id: Ibbac4c74b5a0c4fcd5524c97acef5fc078d80cb7
 2016-10-28 20:17:03 +00:00
Sanket Agarwal
958dab93cd Merge "Use UUIDs for call management in Headset Client (HF)" 
am: 678ba24533

Change-Id: I77553f45f3d5de04e9b443e425f15afb8946e237
 2016-10-28 20:13:57 +00:00
Brad Ebinger
aacbdf59d6 Merge "Modify AIDLs to include Session.Info" into stage-aosp-master 2016-10-28 20:09:55 +00:00
Sanket Agarwal
678ba24533 Merge "Use UUIDs for call management in Headset Client (HF)" 2016-10-28 20:01:59 +00:00
Brad Ebinger
b32d4f8b5c Modify AIDLs to include Session.Info 
Modifies the IConnectionService.aidl file to include Session.Info
information to pass from Telecom to Telephony, which is used to start
external Sessions in Telephony from Telecom.

Test: Manual testing and Unit Tests pass
Bug: 26571395
Change-Id: Ia09a0abfa13d5167542d4c67465ea9aa1930b58b
 2016-10-28 12:14:24 -07:00
Sanket Agarwal
52a04e4467 Use UUIDs for call management in Headset Client (HF) 
Using UUIDs that are managed by the service gives more control and error
handling in the service since it has control over assigning them.

Bug: b/29788044
Change-Id: I8483f8e61a33302ba95d544828947d7fb4a21be9
(cherry picked from commit dbeab2c6e12693fe9b06b6a680677da5325c9230)
(cherry picked from commit 40bb6f3f8f)
 2016-10-28 18:16:53 +00:00
Igor Murashkin
7ab062fd66 Merge "app_process: Forward -cp/-classpath to ART." am: 4a4a8f1555 am: d0d99d8a3d 
am: 4aa38633fe

Change-Id: I5016b537d38a03b494fb3c4a3952af8c054302d3
 2016-10-28 18:00:11 +00:00
Igor Murashkin
4aa38633fe Merge "app_process: Forward -cp/-classpath to ART." am: 4a4a8f1555 
am: d0d99d8a3d

Change-Id: Ia7bea2370daeb77ab23a797546f8f7c437902516
 2016-10-28 17:55:12 +00:00
Igor Murashkin
d0d99d8a3d Merge "app_process: Forward -cp/-classpath to ART." 
am: 4a4a8f1555

Change-Id: If7773d6bae3f4f13aa7f0c883b1c20319d85c747
 2016-10-28 17:48:15 +00:00
Treehugger Robot
4a4a8f1555 Merge "app_process: Forward -cp/-classpath to ART." 2016-10-28 17:34:47 +00:00
Przemyslaw Szczepaniak
4ffbf4e72f Merge "Track libcore change 16fa17012b56e990ced91cd023dee33f96deedf9" am: ec3e884e88 am: 29d6af7fe7 
am: 0cf19a9a27

Change-Id: I2e87d2f2a7484b6720152083299b1521f9c517bc
 2016-10-28 12:19:57 +00:00
Przemyslaw Szczepaniak
0cf19a9a27 Merge "Track libcore change 16fa17012b56e990ced91cd023dee33f96deedf9" am: ec3e884e88 
am: 29d6af7fe7

Change-Id: I6693fe79836e88d022d393d2bee5d811cb2dcdfc
 2016-10-28 12:15:19 +00:00
Przemyslaw Szczepaniak
29d6af7fe7 Merge "Track libcore change 16fa17012b56e990ced91cd023dee33f96deedf9" 
am: ec3e884e88

Change-Id: Ibf708f685bf8cb8e5f88423b48ed05986c223651
 2016-10-28 12:05:56 +00:00
Przemyslaw Szczepaniak
ec3e884e88 Merge "Track libcore change 16fa17012b56e990ced91cd023dee33f96deedf9" 2016-10-28 11:57:07 +00:00
Mitchell Wills
010384868d Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework"" 
am: a657136264

Change-Id: Ib597a86f8c79bca3c7db66736bf2cbcd11b29f48
 2016-10-28 06:35:28 +00:00
Mitchell Wills
3d4833bfb8 Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework"" 
This reverts commit 6a80a4b05a.

Change-Id: I21fc6802fd3eeca42492e07437bb71d54f015593
(cherry picked from commit b38028128b)
 2016-10-28 06:20:34 +00:00
Mitchell Wills
a657136264 Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework"" 
This reverts commit 6a80a4b05a.

Change-Id: I21fc6802fd3eeca42492e07437bb71d54f015593
(cherry picked from commit b38028128b)
 2016-10-28 06:19:56 +00:00
Mitchell Wills
f452432e2c Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework"" am: 77281bbaf4 -s ours 
am: e1d1740534

Change-Id: I9b2080a5ea044c1f444b77d4c1d9309fe306f5c8
 2016-10-28 05:04:31 +00:00
Mitchell Wills
e1d1740534 Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework"" 
am: 77281bbaf4  -s ours

Change-Id: I85645a2301cba10b1612c5ec851412d4e1c6d947
 2016-10-28 04:58:50 +00:00
Mitchell Wills
77281bbaf4 Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework"" 
This reverts commit 6a80a4b05a.

Change-Id: I21fc6802fd3eeca42492e07437bb71d54f015593
(cherry picked from commit b38028128b)
 2016-10-28 03:52:58 +00:00
Jakub Pawlowski
e582ab854d Merge "Separate LE scanner from GATT client (1/4)" am: 87c997ca21 am: 81d5ecb7a6 
am: 61d0088923

Change-Id: I83c82b17064ee958fff6a98d90a0b351205ccf54
 2016-10-28 03:01:56 +00:00
Jakub Pawlowski
61d0088923 Merge "Separate LE scanner from GATT client (1/4)" am: 87c997ca21 
am: 81d5ecb7a6

Change-Id: If7688706be45e72e3ab98a35d3712ddae9d508a6
 2016-10-28 02:56:54 +00:00
Marie Janssen
41319ff65f Merge "Add Bluetooth toggle prompts - framework" am: a062ce698b -s ours am: 98f664b903 
am: 7ad32238f6

Change-Id: If8fa652d1e8607e801f668a3987c0019064472a6
 2016-10-28 02:56:54 +00:00
Marie Janssen
7ad32238f6 Merge "Add Bluetooth toggle prompts - framework" am: a062ce698b -s ours 
am: 98f664b903

Change-Id: I6dabd16f5334e78bc05e6b5ffb95a0177a3cd4d7
 2016-10-28 02:52:00 +00:00
Jakub Pawlowski
81d5ecb7a6 Merge "Separate LE scanner from GATT client (1/4)" 
am: 87c997ca21

Change-Id: I8fdf97a457d7566b4e0048624d47a6cfea693f13
 2016-10-28 02:50:54 +00:00
Marie Janssen
98f664b903 Merge "Add Bluetooth toggle prompts - framework" 
am: a062ce698b  -s ours

Change-Id: I426b2378c9153286557498fe80c2469caa6a4888
 2016-10-28 02:45:26 +00:00
Fyodor Kupolov
8b44db55d3 Merge "[DO NOT MERGE] Only setSize if -s arg is specified" into nyc-mr1-dev am: e97969b4d0 am: 74bd9b1f56 
am: 9b006e28f9

Change-Id: Icc26dab845ded7813abea322dd3898364a96f4c3
 2016-10-28 00:40:22 +00:00
Fyodor Kupolov
f4fba91b5f [DO NOT MERGE] Only setSize if -s arg is specified am: b87a491de6 am: 7c9a91094d 
am: c9102f2ae2

Change-Id: I28e06c6345e847ade9a89824675302fdf58e1ba9
 2016-10-28 00:39:12 +00:00
Fyodor Kupolov
9b006e28f9 Merge "[DO NOT MERGE] Only setSize if -s arg is specified" into nyc-mr1-dev am: e97969b4d0 
am: 74bd9b1f56

Change-Id: I56b83ec38059af3d15d3ad123ebe96bf7330dbbe
 2016-10-28 00:31:47 +00:00
Fyodor Kupolov
c9102f2ae2 [DO NOT MERGE] Only setSize if -s arg is specified am: b87a491de6 
am: 7c9a91094d

Change-Id: I386176cef3812d13a0b5e1583e55b470e4fc312d
 2016-10-28 00:30:43 +00:00
Fyodor Kupolov
74bd9b1f56 Merge "[DO NOT MERGE] Only setSize if -s arg is specified" into nyc-mr1-dev 
am: e97969b4d0

Change-Id: I0888cc3e628cd004887ecf0cac5fa718dc1d0f15
 2016-10-28 00:21:12 +00:00
Fyodor Kupolov
7c9a91094d [DO NOT MERGE] Only setSize if -s arg is specified 
am: b87a491de6

Change-Id: I33afbd12925a1afb79ed9b444948372ebbaf5e95
 2016-10-28 00:21:10 +00:00
TreeHugger Robot
e97969b4d0 Merge "[DO NOT MERGE] Only setSize if -s arg is specified" into nyc-mr1-dev 2016-10-28 00:11:14 +00:00
Jakub Pawlowski
87c997ca21 Merge "Separate LE scanner from GATT client (1/4)" 2016-10-27 23:18:54 +00:00
Brad Ebinger
3445f82907 Modify AIDLs to include Session.Info 
Modifies the IConnectionService.aidl file to include Session.Info
information to pass from Telecom to Telephony, which is used to start
external Sessions in Telephony from Telecom.

Test: Manual testing and Unit Tests pass
Bug: 26571395
Change-Id: Ia09a0abfa13d5167542d4c67465ea9aa1930b58b
 2016-10-27 16:11:18 -07:00
Jakub Pawlowski
1b49e6eb04 Separate LE scanner from GATT client (1/4) 
Right now, LE scanning functionality is combined with the GATT client.
This is the source of various bugs, like scans suddenly stoppinging when
a GATT client is killed. It also increases memory consumption, because
we associate many structures with a GATT client, which are not necessary
when just scanning.

Test: sl4a BleScanApiTest ConcurrentBleScanTest
Change-Id: I0c25bd4a58bb430eb0ee4100d5f2bbab194f9621
 2016-10-27 23:09:35 +00:00
Marie Janssen
a062ce698b Merge "Add Bluetooth toggle prompts - framework" 2016-10-27 23:07:32 +00:00
Svetoslav Ganov
f9e2ad0b3c Add Bluetooth toggle prompts - framework 
If permission review is enabled toggling bluetoth on or off
results in a user prompt to collect consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.

Also added a configuration resource which controls whether
permission review mode is enabled. By default it is not and
an OEM can change this via an overlay. For now we also keep
the old mechanism to toggle review mode via a build property
which is still used and will be removed when clients have
transitioned.

bug:28715749

Change-Id: I94c5828ad6c8aa6b363622a26ff9da4fc2e2fac7
(cherry picked from commit ac69be543f)
 2016-10-27 22:49:11 +00:00