Commit Graph

255075 Commits

Author SHA1 Message Date
Marie Janssen
dbb8ffc47d Fix setPairingConfirmation permissions issue (2/2) am: 93326cfd9f am: 3106e3ae27 am: e3812fc048 am: 532d2b11a3
am: 6f514cc82b

Change-Id: I88928de86c08a148b3124c616b309862da1a1c24
2016-09-21 01:59:29 +00:00
Jaewan Kim
c282c4f106 DO NOT MERGE Check caller for sending media key to global priority session
Prevent sending media key events from the non-system app to the global
priority session through the MediaSessionManager.dispatchMediaKeyEvent().
Note that any app can use the API indirectly with
the public API AudioManager.dispatchMediaKeyEvent().

Bug: 29833954
Tested: Installed malicious apps and confirmed that they don't work.
Tested: Run CtsTelecomTestCases and CtsMediaTestCases
Change-Id: I2a9e78196ba7455324e485f098f095d03b47ee15
2016-09-21 10:50:19 +09:00
Jaewan Kim
4e9af38ec4 DO NOT MERGE Check caller for sending media key to global priority session
Prevent sending media key events from the non-system app to the global
priority session through the MediaSessionManager.dispatchMediaKeyEvent().
Note that any app can use the API indirectly with
the public API AudioManager.dispatchMediaKeyEvent().

Bug: 29833954
Tested: Installed malicious apps and confirmed that they don't work.
Tested: Run CtsTelecomTestCases and CtsMediaTestCases
Change-Id: I2a9e78196ba7455324e485f098f095d03b47ee15
2016-09-21 10:44:09 +09:00
Jaewan Kim
6a1567c267 DO NOT MERGE Check caller for sending media key to global priority session
Prevent sending media key events from the non-system app to the global
priority session through the MediaSessionManager.dispatchMediaKeyEvent().
Note that any app can use the API indirectly with
the public API AudioManager.dispatchMediaKeyEvent().

Bug: 29833954
Tested: Installed malicious apps and confirmed that they don't work.
Tested: Run CtsTelecomTestCases and CtsMediaTestCases
Change-Id: I2a9e78196ba7455324e485f098f095d03b47ee15
2016-09-21 10:42:53 +09:00
Jaewan Kim
09c3df004b DO NOT MERGE Check caller for sending media key to global priority session
Prevent sending media key events from the non-system app to the global
priority session through the MediaSessionManager.dispatchMediaKeyEvent().
Note that any app can use the API indirectly with
the public API AudioManager.dispatchMediaKeyEvent().

Bug: 29833954
Tested: Installed malicious apps and confirmed that they don't work.
Tested: Run CtsTelecomTestCases and CtsMediaTestCases
Change-Id: I2a9e78196ba7455324e485f098f095d03b47ee15
2016-09-21 10:39:42 +09:00
Marie Janssen
9013d67f0c Merge "Fix setPairingConfirmation permissions issue (2/2)" into mnc-dev am: 22046e7323 am: e4f60787f3 am: ce8032ebbb
am: 0ed17e5c8d

Change-Id: Ie2b6d2008be82b8413ed01e1a51b88ea66ad9f48
2016-09-21 01:04:28 +00:00
Marie Janssen
6f514cc82b Fix setPairingConfirmation permissions issue (2/2) am: 93326cfd9f am: 3106e3ae27 am: e3812fc048
am: 532d2b11a3

Change-Id: Iee468d3bcfd72b33475e9bf1d51865f3c5e8a4a2
2016-09-21 01:02:29 +00:00
Ajay Panicker
cc4fd13113 [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)
am: bb9b38b957

Change-Id: I8083cdc24b838d235c83360372afc198c2f9f6c5
2016-09-21 01:02:28 +00:00
Ajay Panicker
dcb78c9cf1 Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am: 19b09dd0d3 -s ours am: 5977c8b5bc am: cdff42091b
am: 9a66565324  -s ours

Change-Id: I4b7cfdd5cad8ab054bb1e03279eb27a302c6acc2
2016-09-21 01:00:49 +00:00
TreeHugger Robot
60bf672485 Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev 2016-09-21 00:52:50 +00:00
Ajay Panicker
0f464f9d77 [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: 0ea21bc70e -s ours am: 050b9170db am: b367200be4
am: ef74f3b079  -s ours

Change-Id: I0273945795e743e3508b9691c388b7fd3a32cdbc
2016-09-21 00:50:07 +00:00
Ajay Panicker
2ef2d90eaa Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e am: a278a1e660 am: 3d995d6f5f -s ours am: 4f77ca16e4 -s ours am: 959b1aa5b9 am: 7caccc107f
am: 1dcec33349  -s ours

Change-Id: Ibc2d0fd88e89b0553cf5c9542457172692271318
2016-09-21 00:48:28 +00:00
Marie Janssen
0ed17e5c8d Merge "Fix setPairingConfirmation permissions issue (2/2)" into mnc-dev am: 22046e7323 am: e4f60787f3
am: ce8032ebbb

Change-Id: I2e48e99c2e0cd3f1990cb17a4fc672fe312576bd
2016-09-21 00:47:29 +00:00
Ajay Panicker
afafdff50e [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a am: 271e34dbd5 am: 3758253ae8 -s ours am: cb970f408e -s ours am: fafa73a8ac am: 0639d05e55
am: a701b1b6f6  -s ours

Change-Id: Ie8be52ca401883516b0e746ee9211c4a44460e1c
2016-09-21 00:47:16 +00:00
Marie Janssen
532d2b11a3 Fix setPairingConfirmation permissions issue (2/2) am: 93326cfd9f am: 3106e3ae27
am: e3812fc048

Change-Id: I6119aa9db2792a149202c16d63de205ba32423e8
2016-09-21 00:46:01 +00:00
Ajay Panicker
9a66565324 Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am: 19b09dd0d3 -s ours am: 5977c8b5bc
am: cdff42091b

Change-Id: Ib97d5a470acde585ea27a1a3d0050871f644428e
2016-09-21 00:44:57 +00:00
Ajay Panicker
ef74f3b079 [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: 0ea21bc70e -s ours am: 050b9170db
am: b367200be4

Change-Id: I3e9a492bbdecc5335047c1687d2a7a6e8c33025f
2016-09-21 00:40:01 +00:00
Ajay Panicker
1dcec33349 Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e am: a278a1e660 am: 3d995d6f5f -s ours am: 4f77ca16e4 -s ours am: 959b1aa5b9
am: 7caccc107f

Change-Id: I8587341bb8ec9e42103e4082dfa249e56b773bbb
2016-09-21 00:39:03 +00:00
Marie Janssen
ce8032ebbb Merge "Fix setPairingConfirmation permissions issue (2/2)" into mnc-dev am: 22046e7323
am: e4f60787f3

Change-Id: I598f7cbaa4ff2bddaeb1e08e5eaa062c28ab7c60
2016-09-21 00:38:59 +00:00
Ajay Panicker
a701b1b6f6 [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a am: 271e34dbd5 am: 3758253ae8 -s ours am: cb970f408e -s ours am: fafa73a8ac
am: 0639d05e55

Change-Id: Ic57c43dcd18e09ad860407c16a77662bdd68268b
2016-09-21 00:37:11 +00:00
Marie Janssen
e3812fc048 Fix setPairingConfirmation permissions issue (2/2) am: 93326cfd9f
am: 3106e3ae27

Change-Id: I0748eed7b884294d993b4538e4e65397b6f0dbb2
2016-09-21 00:37:07 +00:00
Ajay Panicker
cdff42091b Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am: 19b09dd0d3 -s ours
am: 5977c8b5bc

Change-Id: Ia362dd16d6a58e6c9c617fec169ed86b8eea8e50
2016-09-21 00:36:25 +00:00
Ajay Panicker
b367200be4 [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: 0ea21bc70e -s ours
am: 050b9170db

Change-Id: If64625b574530db5f9d3ce01871fb8ea38ad9ca3
2016-09-21 00:21:20 +00:00
Ajay Panicker
7caccc107f Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e am: a278a1e660 am: 3d995d6f5f -s ours am: 4f77ca16e4 -s ours
am: 959b1aa5b9

Change-Id: I8a13167984a898e726953d6a80694786d120015b
2016-09-21 00:20:21 +00:00
Marie Janssen
e4f60787f3 Merge "Fix setPairingConfirmation permissions issue (2/2)" into mnc-dev
am: 22046e7323

Change-Id: I06e960bef8fc2fdacfe9f6e4ecb1e970eb1e7cb4
2016-09-21 00:19:16 +00:00
Marie Janssen
3106e3ae27 Fix setPairingConfirmation permissions issue (2/2)
am: 93326cfd9f

Change-Id: If8fdb8c3f5c167e1b6465c67cf64b8310d55b80b
2016-09-21 00:19:12 +00:00
Ajay Panicker
0639d05e55 [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a am: 271e34dbd5 am: 3758253ae8 -s ours am: cb970f408e -s ours
am: fafa73a8ac

Change-Id: Icecb73a1309bb45994889756f8e421dc6fda76a4
2016-09-21 00:19:02 +00:00
Ajay Panicker
5977c8b5bc Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev
am: 19b09dd0d3  -s ours

Change-Id: Id030cd83f6759c255c1a5cfbea8b90a92610a02d
2016-09-21 00:17:48 +00:00
Ajay Panicker
050b9170db [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)
am: 0ea21bc70e  -s ours

Change-Id: I24d8a2df435e4df43cc39d0e0314796e53e30429
2016-09-21 00:13:03 +00:00
Ajay Panicker
959b1aa5b9 Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e am: a278a1e660 am: 3d995d6f5f -s ours
am: 4f77ca16e4  -s ours

Change-Id: I6be29367b410ffc98e61d49450bb1d9905fbf3f8
2016-09-21 00:12:20 +00:00
Elliot Waite
28d87163e1 Fix some at links.
Change-Id: Ia455e7edff115e9c5b8e531c3fe430114aeb3d8e
2016-09-20 17:12:13 -07:00
TreeHugger Robot
22046e7323 Merge "Fix setPairingConfirmation permissions issue (2/2)" into mnc-dev 2016-09-21 00:12:07 +00:00
Ajay Panicker
fafa73a8ac [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a am: 271e34dbd5 am: 3758253ae8 -s ours
am: cb970f408e  -s ours

Change-Id: I385bc1700aebf53fb2846a149995925dcb00b5e8
2016-09-21 00:10:52 +00:00
TreeHugger Robot
19b09dd0d3 Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev 2016-09-21 00:07:38 +00:00
Ajay Panicker
4f77ca16e4 Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e am: a278a1e660
am: 3d995d6f5f  -s ours

Change-Id: I9e410ce2d5302eda87aea9628cb58ca203a212c5
2016-09-21 00:04:35 +00:00
Ajay Panicker
cb970f408e [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a am: 271e34dbd5
am: 3758253ae8  -s ours

Change-Id: I0836ddb1649084a6814c461bccc41135cb475337
2016-09-21 00:03:23 +00:00
Ajay Panicker
3d995d6f5f Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e
am: a278a1e660

Change-Id: I22838d21bdd289ca34b78260ade59adafbdc408a
2016-09-20 23:56:48 +00:00
Ajay Panicker
3758253ae8 [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a
am: 271e34dbd5

Change-Id: I954b8f2d9333fa6bb549dc812733d2b8f71220b9
2016-09-20 23:55:44 +00:00
Ajay Panicker
a278a1e660 Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev
am: 204da8aa9e

Change-Id: I0ff3b20fc2f3318070e343dfe6dc29b2979284ef
2016-09-20 23:49:13 +00:00
Ajay Panicker
271e34dbd5 [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)
am: edae39d59a

Change-Id: I2bdf5c6fc24fd370e2555585e8492558040c0d10
2016-09-20 23:49:05 +00:00
Ajay Panicker
bb9b38b957 [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/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: Iddc935f0b02f5ff56e930914b4b664377e786184
2016-09-20 23:47:09 +00:00
TreeHugger Robot
204da8aa9e Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev 2016-09-20 23:45:00 +00:00
Ajay Panicker
35cb698a88 Remove net_bt_stack group and replace it with bluetooth
Bug: 31549206
Change-Id: I4da37bef5cff0e6054e952e6755905a5cc1e2e68
2016-09-20 23:05:50 +00:00
Josh Horwich
373812e7ee Merge "Docs: Fix manifest example for ARC" into nyc-dev
am: 7980e4522e

Change-Id: I650c4c1a58914fd88dcf9eb8066b5c1a19050e9e
2016-09-20 23:00:39 +00:00
Josh Horwich
30b30e5927 Docs: Fix manifest example for ARC
am: 8960d0a712

Change-Id: I42400d5ac69d78c8909bda48b81971f520f23e6a
2016-09-20 23:00:29 +00:00
TreeHugger Robot
7980e4522e Merge "Docs: Fix manifest example for ARC" into nyc-dev 2016-09-20 22:54:31 +00:00
Adarsh Fernando
d0922de0a4 Temporary redirect for CMake Variables list.
am: c9905d9184

Change-Id: I3541265376fcdd8695677ed33e456c515d3a8fe6
2016-09-20 22:34:27 +00:00
Christopher Wiley
93ce63760d Remove ability to set frequency from WifiAssociationTest
This is no longer a supported API.

Bug: 31148223
Test: This code would no longer compile
Change-Id: I2d8ee6a40eda7e0f1a266cb0579aff2e504f29a7
2016-09-20 15:33:49 -07:00
Christopher Wiley
79ec1736be Remove WifiManager#get/setFrequencyBand
These methods are marked @hide and only partially implemented by
the WifiService.  In general, it seems wrong to strictly prefer
one WiFi band over another for all WiFi operations.  To reduce
implementation complexity, cause setFrequencyBand to become a noop
and getFrequencyBand to reflect the underlying reality, which is
that we will always operate on all supported bands.

Bug: 31148223
Test: Compiles
Change-Id: Iccff517915f7d5ed7e96bf56e4f195b2cda80f0a
2016-09-20 15:33:38 -07:00
Christopher Wiley
5df6ed4a87 Implement untetherAll as calls to stopTethering
Calling untether() on an interface name leaves the system
in an inconsistent state, since this is an API for use by
network subsystems to start or stop the tethering of a prepared
downstream network interface.  The proper way to disable tethering
is to call stopTethering() with an appropriate technology.

untetherAll() is called in parts of the system UI to disable
all tethering on system state changes (e.g. on the enabling
of data saver).

Bug: 31405407
Test: Enabling data saver now correctly disables tethering
Change-Id: I8e5724a31e015721910a8d278e100daf697c34d7
2016-09-20 15:23:06 -07:00