OSDN Git Service
Pankaj Kanwar [Thu, 27 Apr 2017 17:58:16 +0000 (17:58 +0000)]
Merge "RIL changes to allow the modem to query the framework for the key." am:
0c83ef2c72
am:
1dec74b78f
Change-Id: I6b15e49763d8e0cfa23238834a8056288de77176
Pankaj Kanwar [Thu, 27 Apr 2017 17:49:09 +0000 (17:49 +0000)]
Merge "RIL changes to allow the modem to query the framework for the key."
am:
0c83ef2c72
Change-Id: I8a326ac926e880d8095330638e54d56ad8c98485
Ajay Panicker [Thu, 27 Apr 2017 17:48:58 +0000 (17:48 +0000)]
Merge "Limit btsnoop file size (3/8)" am:
37cad12cb1
am:
e429211064
Change-Id: I9ce4924aba66c45425789dd16e477dfa99e6b74a
Pankaj Kanwar [Thu, 27 Apr 2017 17:41:56 +0000 (17:41 +0000)]
Merge "RIL changes to allow the modem to query the framework for the key."
Ajay Panicker [Thu, 27 Apr 2017 17:39:14 +0000 (17:39 +0000)]
Merge "Limit btsnoop file size (3/8)"
am:
37cad12cb1
Change-Id: I75129661ddb46e9975c7752ffb40e64d4430660b
Ajay Panicker [Thu, 27 Apr 2017 17:29:35 +0000 (17:29 +0000)]
Merge "Limit btsnoop file size (3/8)"
David Farrow [Thu, 27 Apr 2017 17:28:26 +0000 (17:28 +0000)]
Merge "documentation fixes" into nyc-mr1-dev am:
14826e5489 am:
b1e3d9ab26
am:
4ea763ad8a
Change-Id: Iecae5becb23a80e0b8322a655ce75125a33cbdc8
David Farrow [Thu, 27 Apr 2017 17:19:21 +0000 (17:19 +0000)]
Merge "documentation fixes" into nyc-mr1-dev am:
14826e5489
am:
b1e3d9ab26
Change-Id: I4f2682c11384a9f656054b95cfba56132085634a
David Farrow [Thu, 27 Apr 2017 17:09:26 +0000 (17:09 +0000)]
Merge "documentation fixes" into nyc-mr1-dev
am:
14826e5489
Change-Id: I18df5f88d8f72ec74e62b39a056459e4e715b9db
David Farrow [Thu, 27 Apr 2017 17:01:09 +0000 (17:01 +0000)]
Merge "documentation fixes" into nyc-mr1-dev
Mukesh Agrawal [Thu, 27 Apr 2017 16:56:56 +0000 (16:56 +0000)]
Merge "Log: increase visibility of Log.TerribleFailure" am:
5e253647ad
am:
f6328d6943
Change-Id: I171542c4fd7ec40a588e5ae9e6d5cf601a77aeed
Brad Ebinger [Thu, 27 Apr 2017 16:54:26 +0000 (16:54 +0000)]
Merge "Better handle MSIM DDS changed event" am:
4418eb4ddf
am:
8a3f025d71
Change-Id: Ib5c64fdc6bdb456c811e374c910bcc595e554b1b
Mukesh Agrawal [Thu, 27 Apr 2017 16:49:14 +0000 (16:49 +0000)]
Merge "Log: increase visibility of Log.TerribleFailure"
am:
5e253647ad
Change-Id: Ibe67ef79c9ac5de3cbfdb5f0252b058e39940c83
Brad Ebinger [Thu, 27 Apr 2017 16:46:54 +0000 (16:46 +0000)]
Merge "Better handle MSIM DDS changed event"
am:
4418eb4ddf
Change-Id: Ibadbaec61808e571ebbd1c0c2ac90cf3c5141a57
Mukesh Agrawal [Thu, 27 Apr 2017 16:40:48 +0000 (16:40 +0000)]
Merge "Log: increase visibility of Log.TerribleFailure"
Brad Ebinger [Thu, 27 Apr 2017 16:38:46 +0000 (16:38 +0000)]
Merge "Better handle MSIM DDS changed event"
pkanwar [Sun, 19 Mar 2017 19:14:34 +0000 (12:14 -0700)]
RIL changes to allow the modem to query the framework for the key.
In order to support IMSI encryption, the modem needs to request the
framework for the public key of the Carrier. The framework will pass
2 fields back, the public key and a string (which is a key value pair
to be defined by the carrier).
BUG:
35606429
Test: manual
Change-Id: I609e4505508aa6bb5b442c09eb4c346106492361
Merged-In: I609e4505508aa6bb5b442c09eb4c346106492361
Narayan Kamath [Thu, 27 Apr 2017 15:40:19 +0000 (15:40 +0000)]
Merge "AndroidRuntime: pipe down dalvik.vm.stack-trace-dir" am:
0b711e2c86
am:
aab168b7cc
Change-Id: Iceab938d11cc334c8ffaa4321623f72b9f7cfaa8
Narayan Kamath [Thu, 27 Apr 2017 15:35:46 +0000 (15:35 +0000)]
Merge "AndroidRuntime: pipe down dalvik.vm.stack-trace-dir"
am:
0b711e2c86
Change-Id: I35050e29b7de414aa60a920d20c677028102d8ca
Narayan Kamath [Thu, 27 Apr 2017 15:26:50 +0000 (15:26 +0000)]
Merge "AndroidRuntime: pipe down dalvik.vm.stack-trace-dir"
Hugo Benichi [Thu, 27 Apr 2017 12:49:36 +0000 (12:49 +0000)]
Merge "NsdManager: unit tests for argument validation" am:
3cff7deecb
am:
d97e358f7a
Change-Id: Ibd6090d57908da159409bd1e886914446e6ba2da
Hugo Benichi [Thu, 27 Apr 2017 12:44:37 +0000 (12:44 +0000)]
Merge "NsdService: disentangle NativeDaemonConnector from ctor" am:
fa97f11b20
am:
47748b754c
Change-Id: Ie66587e82e13957d4a802699f78c41a1bce378b2
Hugo Benichi [Thu, 27 Apr 2017 12:44:35 +0000 (12:44 +0000)]
Merge "NsdManager: unit tests for argument validation"
am:
3cff7deecb
Change-Id: I24d3bda00236fe8c49df0ea7f53109625b3b4f9d
Hugo Benichi [Thu, 27 Apr 2017 12:39:00 +0000 (12:39 +0000)]
Merge "NsdService: disentangle NativeDaemonConnector from ctor"
am:
fa97f11b20
Change-Id: I4e5dc9df1f4de256b34c0140ea5ae7ec1bb6fce6
Hugo Benichi [Thu, 27 Apr 2017 12:36:41 +0000 (12:36 +0000)]
Merge "NsdManager: unit tests for argument validation"
Hugo Benichi [Thu, 27 Apr 2017 12:30:20 +0000 (12:30 +0000)]
Merge "NsdService: disentangle NativeDaemonConnector from ctor"
Nicolas Geoffray [Thu, 27 Apr 2017 11:57:54 +0000 (11:57 +0000)]
Merge "Update frameworks/base to new compiler filters." am:
431bc34096
am:
fee9c65f40
Change-Id: I19bfb0fff74e9660029f8a6eee4dd010d2f6c702
Nicolas Geoffray [Thu, 27 Apr 2017 11:51:02 +0000 (11:51 +0000)]
Merge "Update frameworks/base to new compiler filters."
am:
431bc34096
Change-Id: I2eb42fb2aad718f71c8c0a7a81ca4e17d0aaa9c5
Nicolas Geoffray [Thu, 27 Apr 2017 11:40:05 +0000 (11:40 +0000)]
Merge "Update frameworks/base to new compiler filters."
Hugo Benichi [Tue, 25 Apr 2017 06:04:10 +0000 (15:04 +0900)]
NsdManager: unit tests for argument validation
Test: new tests pass.
Bug:
37013369,
33298084
Change-Id: Ia514d2bbd967d46fed54e379f319b572ade22c62
Hugo Benichi [Mon, 24 Apr 2017 07:19:58 +0000 (16:19 +0900)]
NsdService: disentangle NativeDaemonConnector from ctor
This patch disentangles the creation of NativeDaemonConnector from the
creation of NsdService by introducing a wrapper type DaemonConnection.
This allows to mock this dependency in unit tests.
Test: enhanced previously introduced new tests.
Bug:
37013369,
33298084
Change-Id: I894b7cddfc509f86d0134d214c88c063b81b5e0a
Hugo Benichi [Thu, 27 Apr 2017 05:42:36 +0000 (05:42 +0000)]
Merge "NsdService: bootstrap unit tests" am:
7ca060aa95
am:
dd53c962b2
Change-Id: If2782297ecd3b6bef8d8be5b1427aed8fcdb7aee
Hugo Benichi [Thu, 27 Apr 2017 05:34:05 +0000 (05:34 +0000)]
Merge "NsdService: bootstrap unit tests"
am:
7ca060aa95
Change-Id: I3ce2d85afb5e085c8c49731f3d18a96d17542271
Hugo Benichi [Thu, 27 Apr 2017 05:22:52 +0000 (05:22 +0000)]
Merge "NsdService: bootstrap unit tests"
Philip Cuadra [Thu, 27 Apr 2017 00:26:39 +0000 (00:26 +0000)]
Merge "Allow Bluetooth CAP_SYS_NICE" am:
ebc94ecac9
am:
dedc04978e
Change-Id: I5fa80631fe566771525a94c54d8cbbe543b783e0
Erik Kline [Thu, 27 Apr 2017 00:23:55 +0000 (00:23 +0000)]
Merge "Clarify some IpManager/ApfFilter debugging output." am:
ce94c07ffd
am:
3cc7ccfc69
Change-Id: I85ba7fe2da509c4581a27400170a537accd844ee
Philip Cuadra [Thu, 27 Apr 2017 00:17:06 +0000 (00:17 +0000)]
Merge "Allow Bluetooth CAP_SYS_NICE"
am:
ebc94ecac9
Change-Id: Ibf14ca3ac79d2e522584ad80dc5bf3ffc32c48bc
Erik Kline [Thu, 27 Apr 2017 00:14:50 +0000 (00:14 +0000)]
Merge "Clarify some IpManager/ApfFilter debugging output."
am:
ce94c07ffd
Change-Id: If5e0628c3e8ec5c918fe29fea25c24d0fae53614
Ajay Panicker [Tue, 18 Apr 2017 03:42:22 +0000 (20:42 -0700)]
Limit btsnoop file size (3/8)
Limit btsnoop file size by rotating between snoop files. The rotation occurrs
when a fixed number of packets have been logged and will start overwriting
the older file.
Bug:
35998031
Test: Enable snoop logs from developer options and let logs get large
Merged-In: I40d5da4c1b1c9b45908e5790d130f1c5e804c773
Change-Id: I40d5da4c1b1c9b45908e5790d130f1c5e804c773
Treehugger Robot [Thu, 27 Apr 2017 00:01:53 +0000 (00:01 +0000)]
Merge "Allow Bluetooth CAP_SYS_NICE"
Erik Kline [Wed, 26 Apr 2017 23:56:58 +0000 (23:56 +0000)]
Merge "Clarify some IpManager/ApfFilter debugging output."
Suprabh Shukla [Wed, 26 Apr 2017 22:11:17 +0000 (22:11 +0000)]
Merge "Fix the notification issue shown on startForeground" am:
ea86140ba4
am:
3b498d1c56
Change-Id: Ibd6d57617c6d7d8ad2bffebb6f72337e7d11e9af
Suprabh Shukla [Wed, 26 Apr 2017 22:05:07 +0000 (22:05 +0000)]
Merge "Fix the notification issue shown on startForeground"
am:
ea86140ba4
Change-Id: Ic95c9c78b05c4f4920c04a654296d2a6e4283eea
Suprabh Shukla [Wed, 26 Apr 2017 21:56:23 +0000 (21:56 +0000)]
Merge "Fix the notification issue shown on startForeground"
Philip Cuadra [Wed, 26 Apr 2017 20:49:37 +0000 (13:49 -0700)]
Allow Bluetooth CAP_SYS_NICE
Bluetooth needs CAP_SYS_NICE in order to make important threads use RT
scheduling policy.
Bug
37518404
Test: Play Bluetooth audio, confirm RT priority in systrace
Change-Id: I388ef78d1aaf3f5fe1aa901b48d76c5c992acacc
Merged-In: I0ee55a2f2cfd80cbb066d9c034bb85d8d85ba470
Android Build Merger (Role) [Wed, 26 Apr 2017 21:14:17 +0000 (21:14 +0000)]
Merge "Merge "WifiManager: add updateInterfaceIpState" am:
2dbd137795 am:
6f69ea87e7" into nyc-mr2-dev-plus-aosp
Rebecca Silberstein [Wed, 26 Apr 2017 21:11:13 +0000 (21:11 +0000)]
Merge "WifiManager: add updateInterfaceIpState" am:
2dbd137795
am:
6f69ea87e7
Change-Id: Ie3223fd22b37f12da2bc5b2bea539a28c9c74b77
Rebecca Silberstein [Wed, 26 Apr 2017 21:06:29 +0000 (21:06 +0000)]
Merge "WifiManager: add updateInterfaceIpState" am:
2dbd137795
am:
6f69ea87e7
Change-Id: I55d0e265488a67d0c379f19e47fbadff5ba51671
Rebecca Silberstein [Wed, 26 Apr 2017 20:58:25 +0000 (20:58 +0000)]
Merge "WifiManager: add updateInterfaceIpState"
am:
2dbd137795
Change-Id: I46b408b2c11e23946ab933b6c780a122ce1b2761
Julius D'souza [Wed, 26 Apr 2017 20:53:38 +0000 (20:53 +0000)]
DO NOT MERGE: change SET_DISPLAY_OFFSET namespace to com.android.permission.* This is to avoid API Level 25 CTS issues. am:
31add96517
am:
a701205315
Change-Id: Ic524f1c10de53d0a9974afc4033c334ad871de4a
Rebecca Silberstein [Wed, 26 Apr 2017 20:49:04 +0000 (20:49 +0000)]
Merge "WifiManager: add updateInterfaceIpState"
Julius D'souza [Wed, 26 Apr 2017 20:47:26 +0000 (20:47 +0000)]
DO NOT MERGE: change SET_DISPLAY_OFFSET namespace to com.android.permission.* This is to avoid API Level 25 CTS issues.
am:
31add96517
Change-Id: Id12dd73ed18fee0b874af364bad954d39384287f
luozhanwei [Wed, 5 Apr 2017 05:30:53 +0000 (13:30 +0800)]
Fix the notification issue shown on startForeground
Install single APP in any user space except Owner user.
The APP will show a notification when call startForeground in Service Component with
Notification which without SmallIcon.
But when you click the notificaiton ,you can't go to the InstalledAppDetails Activity.
Bug:https://code.google.com/p/android/issues/detail?id=330486
Change-Id: I9545c37bf1a36515813cbf1124c82c1c0fc3ad21
Signed-off-by: luozhanwei <luozhanwei@xiaomi.com>
Julius D'souza [Wed, 26 Apr 2017 18:14:00 +0000 (11:14 -0700)]
DO NOT MERGE: change SET_DISPLAY_OFFSET namespace to com.android.permission.*
This is to avoid API Level 25 CTS issues.
Bug:
37646165
Change-Id: I1fec4dc0b7497eb3dafb9c2f704bb02b8ecde1a9
nharold [Wed, 26 Apr 2017 17:31:23 +0000 (17:31 +0000)]
Merge "Hide IpSecManager, IpSecTransform, and IpSecAlgorithm" am:
01e368f26d
am:
939528045a
Change-Id: Ic415f9f6d45f8c2477c3708c87af31ef725aa224
nharold [Wed, 26 Apr 2017 17:21:52 +0000 (17:21 +0000)]
Merge "Hide IpSecManager, IpSecTransform, and IpSecAlgorithm"
am:
01e368f26d
Change-Id: I82c0bf9fe401accd6928e411739f658966ac87a6
nharold [Wed, 26 Apr 2017 17:10:32 +0000 (17:10 +0000)]
Merge "Hide IpSecManager, IpSecTransform, and IpSecAlgorithm"
Chen Xu [Wed, 26 Apr 2017 16:58:07 +0000 (16:58 +0000)]
Merge "Extend carrier configs for visual voicemail" am:
f4db619b0b
am:
e701b7ab34
Change-Id: I76289584e478c2e287c6fc66f75d3771cd502729
Chen Xu [Wed, 26 Apr 2017 16:51:22 +0000 (16:51 +0000)]
Merge "Extend carrier configs for visual voicemail"
am:
f4db619b0b
Change-Id: I0ae8f81fde3ca866c6be897311243b6225341296
Chen Xu [Wed, 26 Apr 2017 16:42:09 +0000 (16:42 +0000)]
Merge "Extend carrier configs for visual voicemail"
Nicolas Geoffray [Tue, 25 Apr 2017 11:29:07 +0000 (12:29 +0100)]
Update frameworks/base to new compiler filters.
Also fix a merge issue with duplicated code.
bug:
34715556
Test: build and boot aosp bullhead
Change-Id: I3b913878c83f708e752ec06f79bada1873213823
Narayan Kamath [Wed, 26 Apr 2017 12:18:05 +0000 (12:18 +0000)]
Merge "Improvements to ActivityManagerService stack dumping" am:
2529f65e87
am:
9e9270ee3d
Change-Id: I273b307256c3bf6d2255a7c092c4985c90d26942
Narayan Kamath [Wed, 26 Apr 2017 12:12:29 +0000 (12:12 +0000)]
Merge "Improvements to ActivityManagerService stack dumping"
am:
2529f65e87
Change-Id: Iabbf138719296a882aa98261fb2c4da8bbf027cc
Narayan Kamath [Tue, 25 Apr 2017 13:24:07 +0000 (14:24 +0100)]
AndroidRuntime: pipe down dalvik.vm.stack-trace-dir
Fall back to dalvik.vm.stack-trace-file if it doesn't exist.
Test: make
Test: manual testing with the property set / empty
Bug:
32064548
Change-Id: I23b4c7b26eda5d0fcaf6b976bf1e973a872555c7
Narayan Kamath [Wed, 26 Apr 2017 12:01:15 +0000 (12:01 +0000)]
Merge "Improvements to ActivityManagerService stack dumping"
Erik Kline [Fri, 21 Apr 2017 08:56:55 +0000 (17:56 +0900)]
Clarify some IpManager/ApfFilter debugging output.
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
- "adb shell dumpsys wifi ipmanager" shows updated output
Bug:
34793131
Change-Id: I6dec135b97343943efb421ef7b2e84c4751dd5ea
Nathan Harold [Tue, 25 Apr 2017 21:21:52 +0000 (14:21 -0700)]
Hide IpSecManager, IpSecTransform, and IpSecAlgorithm
These classes, originally planned to be part of the
public API, are not ready for public consumption.
They are planned to be un-hidden in a future release.
Bug:
37681043
Test: make update-api and make
Change-Id: I8caccd3f8455341cb56a2256354eacbadedff047
Rebecca Silberstein [Fri, 21 Apr 2017 18:20:56 +0000 (11:20 -0700)]
WifiManager: add updateInterfaceIpState
Add a call to WifiManager that allows ConnectivityService to
provide interface mode change updates. Mode variables are also
added in this CL.
A corresponding CL will be added to WifiServiceImpl.
Fixed two checkstyle errors on imports.
Bug:
31466854
Test: make
Change-Id: Iccccd2643515a09fadb29f7b7e82697aaf994189
mukesh agrawal [Mon, 17 Apr 2017 21:26:40 +0000 (14:26 -0700)]
Log: increase visibility of Log.TerribleFailure
The Log.setWtfHandler() provides a way to override
the default TerribleFailureHandler, so that we can
test that a piece of code reports as terrible
failure as expected.
Unfortunately, we can't actual use setWtfHandler()
at the moment. The problem is as follows:
1. The Log.setWtfHandler() method requires a
Log.TerribleFailureHandler instance.
2. The Log.TerribleFailureHandler interface requires
subclasses to implement a onTerribleFailure()
method. The method requires a Log.TerribleFailure
argument.
3. Log.TerribleFailure is a private inner class.
Given the above, classes outside of Log can't create
an appropriate argument to pass to Log.setWtfHandler().
To resolve this, we update the visibility of
Log.TerribleFailure to be the same as that of
Log.setWtfHandler(), and Log.TerribleFailureHandler.
Test: m -j32
Bug:
37425059
Change-Id: Ie646b931869582398d61495e367e0d36e767a3e3
Pankaj Kanwar [Tue, 25 Apr 2017 23:46:17 +0000 (23:46 +0000)]
Merge "Create Public API which exposes if the device is in a state where simultaneous voice and data are possible." am:
3a8ad81ab4
am:
a086824e5a
Change-Id: I2a918e4d56cbb6147c95737d7f6b156903dc5ec5
Pankaj Kanwar [Tue, 25 Apr 2017 23:40:54 +0000 (23:40 +0000)]
Merge "Create Public API which exposes if the device is in a state where simultaneous voice and data are possible."
am:
3a8ad81ab4
Change-Id: I54d5ac5a02b4bb0e0bd9d3f3eb2428613c40c1ec
Pankaj Kanwar [Tue, 25 Apr 2017 23:30:51 +0000 (23:30 +0000)]
Merge "Create Public API which exposes if the device is in a state where simultaneous voice and data are possible."
Hall Liu [Tue, 25 Apr 2017 22:32:02 +0000 (22:32 +0000)]
Merge "Add Error specifiers to the API." am:
4c4a55a67b
am:
f729fccde9
Change-Id: I91d077af7f001853df99d4ae4ba7da611c1dea09
Hall Liu [Tue, 25 Apr 2017 22:17:14 +0000 (22:17 +0000)]
Merge "Add Error specifiers to the API."
am:
4c4a55a67b
Change-Id: Ia720a230e0f7f7070ca7194dbcfce294a66a3574
Chen Xu [Tue, 25 Apr 2017 22:10:21 +0000 (22:10 +0000)]
Merge "Add VisualVoicemailService" am:
8c6925a88f
am:
ac78d9ae25
Change-Id: I541ad952ccab5a466e9d26c11478cc18fa69ddc0
Chen Xu [Tue, 25 Apr 2017 22:04:07 +0000 (22:04 +0000)]
Merge "Add VisualVoicemailService"
am:
8c6925a88f
Change-Id: I248baea501c4e1a47981e3aecfe476f89440f0af
Hall Liu [Tue, 25 Apr 2017 22:03:41 +0000 (22:03 +0000)]
Merge "Add Error specifiers to the API."
Chen Xu [Tue, 25 Apr 2017 21:54:51 +0000 (21:54 +0000)]
Merge "Add VisualVoicemailService"
Brad Ebinger [Tue, 18 Apr 2017 18:43:42 +0000 (11:43 -0700)]
Better handle MSIM DDS changed event
On DSDS MSIM devices, when Default Data Subscription event
is received, the ImsService may choose to switch which
Slot ID is active.
This change better handles that switch and removes a
crash that was happening due to
ImsServiceProxy#getFeatureStatus getting called
circularly.
Bug:
37361882
Test: Run Telephony unit tests
Change-Id: Iaa29bba25f82e699c96b951b3b110568163e12d8
pkanwar [Thu, 19 Jan 2017 20:24:19 +0000 (12:24 -0800)]
Create Public API which exposes if the device is in a state where simultaneous
voice and data are possible.
BUG:
32912296
Test: Not required.
Change-Id: If603aa37c774157f0a3af12ca4ac6bafad94340d
Merged-In: If603aa37c774157f0a3af12ca4ac6bafad94340d
Jakub Pawlowski [Tue, 25 Apr 2017 19:56:43 +0000 (19:56 +0000)]
Merge "Bluetooth: expand comments on new PHY constants" am:
bdeb8539e8
am:
3e56fdba72
Change-Id: I092b69b4e9f3ebd9a29b5c31e76de37035d20843
Jakub Pawlowski [Tue, 25 Apr 2017 19:54:54 +0000 (19:54 +0000)]
Merge "Bluetooth: Add handler parameter to connectGatt" am:
1f4e111808
am:
41eae807ef
Change-Id: I5192fa676a27f6627c94984d5e689dc1ddd1d000
Jakub Pawlowski [Tue, 25 Apr 2017 19:50:30 +0000 (19:50 +0000)]
Merge "Bluetooth: expand comments on new PHY constants"
am:
bdeb8539e8
Change-Id: I5c2308f357ec419d5644ec57a014b2237e22e0aa
Jakub Pawlowski [Tue, 25 Apr 2017 19:48:19 +0000 (19:48 +0000)]
Merge "Bluetooth: Add handler parameter to connectGatt"
am:
1f4e111808
Change-Id: I878bfa78c10de91b3b1b83c00bc94ccc4aa77a27
Jakub Pawlowski [Tue, 25 Apr 2017 19:41:54 +0000 (19:41 +0000)]
Merge "Bluetooth: document status value in PHY read/update" am:
06abc2c404
am:
3d95c68d2e
Change-Id: I765bbeb4e21ef1102f92c708e93a339f928ee5e3
Treehugger Robot [Tue, 25 Apr 2017 19:36:35 +0000 (19:36 +0000)]
Merge "Bluetooth: expand comments on new PHY constants"
Treehugger Robot [Tue, 25 Apr 2017 19:36:20 +0000 (19:36 +0000)]
Merge "Bluetooth: Add handler parameter to connectGatt"
Jakub Pawlowski [Tue, 25 Apr 2017 19:32:15 +0000 (19:32 +0000)]
Merge "Bluetooth: document status value in PHY read/update"
am:
06abc2c404
Change-Id: I758c26a86e9f0f5b8c80bb946682ad0eb865b152
Treehugger Robot [Tue, 25 Apr 2017 19:20:40 +0000 (19:20 +0000)]
Merge "Bluetooth: document status value in PHY read/update"
Jakub Pawlowski [Fri, 21 Apr 2017 11:26:12 +0000 (04:26 -0700)]
Bluetooth: expand comments on new PHY constants
Bug:
37544152
Test: the all-knowing eyes of the reviewers
Change-Id: I8f5a756a204fe90960700e1dc42f64824d3b844a
Jakub Pawlowski [Tue, 25 Apr 2017 15:07:11 +0000 (08:07 -0700)]
Bluetooth: document status value in PHY read/update
Bug:
37544152
Test: none
Change-Id: I2bac468f833c73cd282b1dac80b6553917996604
Jakub Pawlowski [Fri, 21 Apr 2017 10:49:00 +0000 (03:49 -0700)]
Bluetooth: Add handler parameter to connectGatt
Bug:
37544152
Test: sl4a GattReadTest GattWriteTest
Change-Id: I043dfefaafe9f3700418f2c855c52aac3644310f
Pankaj Kanwar [Tue, 25 Apr 2017 16:20:51 +0000 (16:20 +0000)]
Merge "Provide an API to make USSD calls and read the responses." am:
41f48e3f18
am:
d6465983f1
Change-Id: I0660aab378b2deee3f52e710a0a413b806dd0792
Pankaj Kanwar [Tue, 25 Apr 2017 16:14:14 +0000 (16:14 +0000)]
Merge "Provide an API to make USSD calls and read the responses."
am:
41f48e3f18
Change-Id: Ia3244783e5df300ae6f8a4ad553e15e7e72f7965
Pankaj Kanwar [Tue, 25 Apr 2017 16:08:25 +0000 (16:08 +0000)]
Merge "Provide an API to make USSD calls and read the responses."
Brian Carlstrom [Mon, 20 Mar 2017 00:43:12 +0000 (17:43 -0700)]
Improvements to ActivityManagerService stack dumping
- Deduplicate code in DumpStackFileObserver, ensure consistent behavior at addition use site
- Fix bug in DumpStackFileObserver where closed state was not reset
- Align TRACE_DUMP_TIMEOUT_MS with frameworks/native/cmds/dumpstate/utils.cpp
- Fallback to Debug.dumpNativeBacktraceToFileTimeout on timeout
- Share timeout constant with other Debug.dumpNativeBacktraceToFileTimeout caller
Test: Insert 1s sleep in system/bt/btif/src/bluetooth.cc is_profile to trigger ANR
Test: Insert hang into art/runtime/signal_catcher.cc after "reacting to signal"
Bug:
35962833
(cherry picked from commit
beed965c25d6996ed0f7947bf8a569ca4489f79e)
Merged-In: I6b5cc3f106f1e2b49400e382b8ad71ddbd4685f3
Change-Id: Ia2024bfa54a15a57821958d69b442d0bc9985eb6
Etan Cohen [Tue, 25 Apr 2017 13:34:06 +0000 (13:34 +0000)]
Merge "[AWARE] Add UID checking to WifiAwareNetworkSpecifier" am:
2fd19ffa06
am:
3c6305cc55
Change-Id: I4e2461f68db983292c167a11746b8cfe47995e77
Etan Cohen [Tue, 25 Apr 2017 13:27:22 +0000 (13:27 +0000)]
Merge "[AWARE] Add UID checking to WifiAwareNetworkSpecifier"
am:
2fd19ffa06
Change-Id: I8e4a38b113d6e8f81bc382715dda5c279771e454
Etan Cohen [Tue, 25 Apr 2017 13:21:35 +0000 (13:21 +0000)]
Merge "[AWARE] Add UID checking to WifiAwareNetworkSpecifier"
Hugo Benichi [Mon, 24 Apr 2017 02:35:06 +0000 (11:35 +0900)]
NsdService: bootstrap unit tests
Test: new tests part of $ runtest frameworks-net
Bug:
37013369,
33298084
Change-Id: Ief45f838268380b4b2a128390fbf34d55a3b922b