1263 Commits

Author SHA1 Message Date
Jeremy Joslin
005224f27d Merge "Make REQUEST_NETWORK_SCORES signature only." am: 1f89f3d1da am: 99b73c61f2
am: 542f906448

Change-Id: I55dc42d95816e0edd2c570fe96dc724c180a3cd1
2017-01-09 21:18:26 +00:00
Jeremy Joslin
542f906448 Merge "Make REQUEST_NETWORK_SCORES signature only." am: 1f89f3d1da
am: 99b73c61f2

Change-Id: I5959ba9a45dd3c895421b131fd34db6b37c6e405
2017-01-09 21:09:09 +00:00
Jeremy Joslin
85fcf96e99 Make REQUEST_NETWORK_SCORES signature only.
There are no use cases where it's needed by a privileged app today.

Test: Built and ran
BUG: 33752149
Change-Id: Ia63a86eca1f60644d25f037d395a08c541a06a08
Merged-In: Iae689e878fdb60b506536c918079a4fcff527a71
2017-01-09 11:31:21 -08:00
Jeremy Joslin
afc31dfe0f Merge "Defining a new REQUEST_NETWORK_SCORES permission." am: a54d76a81f am: 84fd1e1120
am: 195ac87578

Change-Id: I1f6de46c521a232c1a218e3e6b50883ea6e150b0
2017-01-04 23:20:17 +00:00
Jeremy Joslin
195ac87578 Merge "Defining a new REQUEST_NETWORK_SCORES permission." am: a54d76a81f
am: 84fd1e1120

Change-Id: I85279a0185d9191bf81e1088d68f86827fe2d103
2017-01-04 23:16:38 +00:00
Treehugger Robot
a54d76a81f Merge "Defining a new REQUEST_NETWORK_SCORES permission." 2017-01-04 23:04:47 +00:00
Jeremy Joslin
6a848fdf09 Merge "Use the new BIND_NETWORK_RECOMMENDATION_SERVICE." am: 34d46ca94c am: acbf592683
am: cb3f75cca7

Change-Id: I0da58029bb854a7df7bc286a0bd6a22c61d5daee
2017-01-04 21:52:11 +00:00
Jeremy Joslin
cb3f75cca7 Merge "Use the new BIND_NETWORK_RECOMMENDATION_SERVICE." am: 34d46ca94c
am: acbf592683

Change-Id: Ic488962a47eecea4c2ed522596549ef088bfbfc3
2017-01-04 21:47:42 +00:00
Jeremy Joslin
97e711139d Defining a new REQUEST_NETWORK_SCORES permission.
This is intended to be a drop-in replacement for the existing
BROADCAST_NETWORK_PRIVILEGED with a more appropriate name.

Test: Built, ran.
BUG: 33752149
Change-Id: Iebe9d1c12f159bd91953ef094d9866eba9ff925a
Merged-In: I12bdba9694fdf2a2e39990736265919edafd865e
2017-01-04 13:30:07 -08:00
Jeremy Joslin
c02fd4ea78 Use the new BIND_NETWORK_RECOMMENDATION_SERVICE.
Declare that the system uses the new
BIND_NETWORK_RECOMMENDATION_SERVICE permission.

Test: Built & ran
BUG: 33897544
Change-Id: I43424642a631f58da3a065f8221e351180f4f221
Merged-In: I41c7550adf0d1f81ed9a12068ba569e6a57f3b42
2017-01-04 11:46:06 -08:00
Jeremy Joslin
a1a9676317 Merge "New permission - BIND_NETWORK_RECOMMENDATION_SERVICE." am: 871beedc6d am: a169fc3494
am: 8be80273b8

Change-Id: I4930b2d6145e5d7f4e08d267629f40517cbeae34
2017-01-04 15:38:43 +00:00
Jeremy Joslin
8be80273b8 Merge "New permission - BIND_NETWORK_RECOMMENDATION_SERVICE." am: 871beedc6d
am: a169fc3494

Change-Id: I25f816c0ee3df784a02be58a042c505f2c839394
2017-01-04 15:34:16 +00:00
Treehugger Robot
871beedc6d Merge "New permission - BIND_NETWORK_RECOMMENDATION_SERVICE." 2017-01-04 15:24:30 +00:00
Pavlin Radoslavov
62c5226e9c Merge "Add a mechanism for configuring the A2DP Source codecs" am: 63270f2b96 am: 8b46f87e7e
am: da3de76bdb

Change-Id: If62a29812dad856d262c38804f3d88a5406ef79e
2017-01-04 03:49:09 +00:00
Pavlin Radoslavov
da3de76bdb Merge "Add a mechanism for configuring the A2DP Source codecs" am: 63270f2b96
am: 8b46f87e7e

Change-Id: I39e4b90491f646887200649954b652d9f5439925
2017-01-04 03:44:40 +00:00
Pavlin Radoslavov
44a4ef0aa9 Add a mechanism for configuring the A2DP Source codecs
* Added a new class BluetoothCodecConfig that contains codec-related
  configuration or capabilities: codec type, priority, sample rate,
  bits per sample, channel mode, and codec specific fields.

* Extended the Bluetooth A2DP AIDL interface to get/set the current
  codec configuration

* Added new call handleBluetoothA2dpDeviceConfigChange() to the Media
  Framework that is called when there are changes in the
  Bluetooth A2DP device configuration - e.g., the A2DP codec is changed.

Test: A2DP streaming to headsets, TestPlans/71390
Bug: 30958229
Change-Id: I9a82716cbc2a5efbe77352a031ac80c88f6a2459
2017-01-03 17:52:52 -08:00
Jeremy Joslin
b9a61979cc New permission - BIND_NETWORK_RECOMMENDATION_SERVICE.
Used to protect exported network recommendation services.

Test: Built & ran
BUG:33897544
Change-Id: Icfc566275a8d832449f6358e576784199ab0f7b2
Merged-In: I4f163fb965be6a25201bc3ba5e0032e7652c8f20
2017-01-03 14:19:51 -08:00
Ivan Podogov
48738f5ad0 Rename the Bluetooth profile classes for HID Device role. am: 0afe190af5 am: 94e3d3f499
am: 91ab2e2f98

Change-Id: If0e072e96491020191a7742928cc90adff151342
2016-12-29 20:00:09 +00:00
Ivan Podogov
91ab2e2f98 Rename the Bluetooth profile classes for HID Device role. am: 0afe190af5
am: 94e3d3f499

Change-Id: I97ff93fd2564bd76d90095f8086f79c6c6086aff
2016-12-29 19:46:55 +00:00
Ivan Podogov
0afe190af5 Rename the Bluetooth profile classes for HID Device role.
We already have BluetoothInputDevice class, so adding something
called BluetoothHidDevice seems confusing. On the other hand,
the new class is designed to connect to HID Host devices, so
naming it BluetoothInputHost makes sense and goes in line with
the existing BluetoothInputDevice.

The same goes for the new constant HID_DEVICE that is just as
confusing to have together with the INPUT_DEVICE one.

This CL also renames the "connection state changed" broadcast
(for the same reasons), declares it as an SDK constant, and also
adds some javadoc to it.

Note that BluetoothHidDeviceApp* classes remained unchanged, as
those correspond to the app that implements the Device (and
connects to the Host).

Test: make
Change-Id: I5075ca5b97db3c1dd403c2e9660eecc7380cffe2
2016-12-29 14:30:40 +00:00
Andrew Solovay
88addedb34 [DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported. am: 40ba793b33 am: 2891357f4d
am: ff501e5e5f

Change-Id: I8e7bf9b66c92ed5db45007084075fca36ccaa0c8
2016-12-28 20:37:36 +00:00
Andrew Solovay
23473e8851 [DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported. am: 40ba793b33
am: 2891357f4d

Change-Id: Id95f2f8c11a98b56f656b3688accd632fe6da43d
2016-12-28 20:31:08 +00:00
Andrew Solovay
ff501e5e5f [DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported. am: 40ba793b33
am: 2891357f4d

Change-Id: I9b15c8787d6f6aa6c2d362de46ab06a583d3283c
2016-12-28 20:31:02 +00:00
Andrew Solovay
2891357f4d [DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported.
am: 40ba793b33

Change-Id: I5d15df8192fee8362dca8dcc53d84b75af29a13f
2016-12-28 20:24:30 +00:00
Daniel Nishi
f1312cd68e Augment diskstats dumpsys to have categorization and apps.
am: 090b2d9d6c

Change-Id: I2c923293a1baf91b14ab50e25c880bfeb191403d
2016-12-21 02:23:50 +00:00
Daniel Nishi
090b2d9d6c Augment diskstats dumpsys to have categorization and apps.
This adds a new service which opportunistically saves the
file system categorization information and the app sizes. This
information is fetched during a diskstats dumpsys call from a file
stored on the disk. This allows us to keep the dumpsys running quickly
while adding information which is costly to calculate.

Bug: 32207207
Test: System server instrumentation tests
Change-Id: Id59e84b9ad38a9debf3e46e5133ef06f7353829d
2016-12-20 13:32:51 -08:00
phweiss
dee7669fd2 DO NOT MERGE Show notification when network logging is enabled
am: 923d2cc9d9

Change-Id: Ia5839248361a7d7fbb0c73cdb569ada62a96c286
2016-12-20 20:01:33 +00:00
phweiss
923d2cc9d9 DO NOT MERGE Show notification when network logging is enabled
A notification is shown after network logging is enabled
and after the next three reboots that are at least one day apart.

Clicking it sends an intent to quick settings to shown its device monitoring
dialog.

Cherry-picked from master.

Bug: 29748723
Bug: 33126577

(cherry-picked from commit a0cb251ca6a8ea8df17ff8089573bc50f2f1849f)

Test: Manual, CTS-Verifier tests will be added later
Change-Id: I2bf517bd27ab23ad3f66270602dbf062efab8cbb
2016-12-20 19:23:58 +01:00
Michal Karpinski
d1c710d5cf DO NOT MERGE [DPM] Management and retrieval of network logs
am: 4c47adef60

Change-Id: I39486c9d6116023f1ee9bd576b7fcd0fe20023a1
2016-12-14 10:51:33 +00:00
Michal Karpinski
4c47adef60 DO NOT MERGE [DPM] Management and retrieval of network logs
This CL follows up on ag/1530343 and adds:
1) Various network events.
2) Retrieval method in DPM and APIs in DeviceAdminReceiver.
3) Extension of NetworkLogger and it's NetworkLoggingHandler.

Test: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/NetworkEventTest.java
Bug: 29748723
Change-Id: I42a1a477e7c75c109a3982f809c22732b814e8b2
2016-12-13 17:19:22 +00:00
Felipe Leme
519cb74e92 Added label for REQUEST_IGNORE_BATTERY_OPTIMIZATIONS permission.
am: 965f4265c5

Change-Id: Ib7380a343f55e262c2df61d7ad9fc9e8e959a7b7
2016-12-07 02:31:41 +00:00
Felipe Leme
965f4265c5 Added label for REQUEST_IGNORE_BATTERY_OPTIMIZATIONS permission.
Change-Id: I84dc652f7297c2b8c9351e737074ddf43754718d
Fixes: 32950329
Test: manually verified it
2016-12-07 00:08:40 +00:00
Jack He
7ef7e18636 Merge "Protect broadcast emitted by Bluetooth mapmce and pbap profile" am: 7dd909684f
am: 33f0cf1267

Change-Id: I1cb33a340524aeb579330bd49affd02670e89c5a
2016-12-02 04:58:34 +00:00
Jack He
33f0cf1267 Merge "Protect broadcast emitted by Bluetooth mapmce and pbap profile"
am: 7dd909684f

Change-Id: Ib90b23ef7b4271e2adc8a3c66963aaeb5c70a66f
2016-12-02 04:49:39 +00:00
Jack He
1ac34e3657 Protect broadcast emitted by Bluetooth mapmce and pbap profile
Bug: 33281228
Test: mm -j 40
Change-Id: I273e9e3c02f431ba7006bcf5d230a6c30eb67843
2016-12-01 18:55:31 -08:00
Baligh Uddin
b1df48d326 Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger
Bug: 32849428

* goog/cw-f-dev: (98 commits)
  Revert "Catch KeyStoreException for setting profile lock"
  Fix createConfirmDeviceCredentialIntent for wear for CTS.
  Fix default dialog background colour for watch devices.
  Catch KeyStoreException for setting profile lock
  Add cross-links between FINE and COARSE location permissions. bug: 25371600
  Fixed a bug with the emergency affordance in multi user
  Zygote: Additional whitelists for runtime overlay / other static resources.
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Zygote : Block SIGCHLD during fork.
  colors: add missing accent_material_{700,50} resources.
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Zygote : Block SIGCHLD during fork.
  DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"
  ...

Change-Id: I63468da5bfa21ed9ac5985bbdbf3a61d4c389aa0
2016-11-22 17:19:45 -08:00
Andrew Solovay
40ba793b33 [DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported.
Per b/25487830, this permission is no longer supported. I don't think
I can remove it from the manifest file, so unless someone has a better
idea, I'm just replacing the existing doc with a comment saying that
it's not supported.

Doc is staged to:
http://go/dac-stage/reference/android/Manifest.permission.html#UNINSTALL_SHORTCUT

bug: 25487830
Change-Id: Ib564fb49536626df6f92bd2b97a11ffec41e9a90
2016-11-18 19:42:33 +00:00
Scott Main
97be8864e5 Add cross-links between FINE and COARSE location permissions. bug: 25371600 am: 3fef783359 am: c8b11fb7cb
am: 192a8c4973

Change-Id: Ib54b2bafcf87a4f27e6a541a4cde0b01c41780b0
2016-11-18 15:30:06 +00:00
Scott Main
192a8c4973 Add cross-links between FINE and COARSE location permissions. bug: 25371600 am: 3fef783359
am: c8b11fb7cb

Change-Id: I6db78aa2008d2bdd675a87daeae132e5f5c09371
2016-11-18 15:24:18 +00:00
Scott Main
3fef783359 Add cross-links between FINE and COARSE location permissions.
bug: 25371600

Change-Id: I7af21b063533085ce20c51d18f118c7752fd77f0
(cherry picked from commit b18745616f9dd6b79202168b648edcef382ea967)
2016-11-16 04:08:16 +00:00
Etan Cohen
6571007101 Merge "[NAN-AWARE] Rename NAN to Aware"
am: 74b1131cc8

Change-Id: I2e788e19a11f2709f2e542dbdc4b58433a3574bf
2016-11-06 03:13:31 +00:00
Etan Cohen
0849ded008 [NAN-AWARE] Rename NAN to Aware
~Rename only (and any reformatting needed to pass lint) - no
functional changes!

Remove android.net.wifi.nan.STATE_CHANGED from manifest:
redundant/remnant of an older configuration.

(cherry-pick of commit a61b9fb569153917a650f1d48efa20ba8846a9f3)

Bug: 32263750
Test: All unit tests and integration (sl4a) tests pass.
Merged-In: Ie4ff675fa61041e8fcf6a9bf9900ea835d0a7614
Change-Id: I4206d2fd722dc7dec9df4aee5c818101d7f9dccc
2016-11-05 09:41:38 -07:00
Svetoslav Ganov
ebdcd873ec Allow SetupWizard to do WiFi scans if location off am: b2457c3704
am: ff484bbfeb

Change-Id: I7f6cda2da22347375507a0364e976bbb01066ccc
2016-10-13 20:19:45 +00:00
Svetoslav Ganov
ff484bbfeb Allow SetupWizard to do WiFi scans if location off
am: b2457c3704

Change-Id: I3afe3d8628e8af5806b03b86ea5c866fd454cddd
2016-10-13 20:15:16 +00:00
Svetoslav Ganov
cba436b312 Merge "Allow SetupWizard to do WiFi scans if location off" into nyc-mr1-dev 2016-10-13 20:06:02 +00:00
Svetoslav Ganov
c573661f4c Allow SetupWizard to do WiFi scans if location off
Location permission is needed for apps to do WiFi scans
and if location is globally off no app can scan too. It
is possible that an OEM does not want location to be on
until the user agrees to that or a device owner can turn
location off before setup. As a result setup wizard
cannot show the WiFi networks preventing the user form
logging in. This change allows the setup wizard component
to perform WiFi scans even if location is globally off.

bug:29577364

Change-Id: I6b7c5dca76b8c8ee6051ea2dad3cec6879683524
2016-10-12 02:58:26 +00:00
Svetoslav Ganov
b2457c3704 Allow SetupWizard to do WiFi scans if location off
Location permission is needed for apps to do WiFi scans
and if location is globally off no app can scan too. It
is possible that an OEM does not want location to be on
until the user agrees to that or a device owner can turn
location off before setup. As a result setup wizard
cannot show the WiFi networks preventing the user form
logging in. This change allows the setup wizard component
to perform WiFi scans even if location is globally off.

bug:29577364

Change-Id: Ic56bfb7fb3818658a843d309b67ef37324045f67
2016-10-12 02:43:43 +00:00
Jack He
df2bc4958d List HF_INDICATORS_VALUE_CHANGED broadcast as protected am: 0bba1c620b
am: 4d74ff91aa

Change-Id: I44f5abb2476c10e8e7971ea1ff28832c66768fa8
2016-10-11 03:33:09 +00:00
Jack He
0bba1c620b List HF_INDICATORS_VALUE_CHANGED broadcast as protected
android.bluetooth.headset.action.HF_INDICATORS_VALUE_CHANGED
notification should be protected.

Bug: 32059227
Test: manual
Change-Id: I06d4a7e3aa3a5586eb09d2538b4b526a5d073f9a
(cherry picked from commit b798f79ba26e057531fb51e65824e0deee445f26)
2016-10-10 19:08:13 -07:00
Jack He
b798f79ba2 List HF_INDICATORS_VALUE_CHANGED broadcast as protected
android.bluetooth.headset.action.HF_INDICATORS_VALUE_CHANGED
notification should be protected.

Bug: 32059227
Test: manual
Change-Id: I06d4a7e3aa3a5586eb09d2538b4b526a5d073f9a
2016-10-10 21:24:55 +00:00