OSDN Git Service
Pulkit Bhuwalka [Wed, 27 Sep 2017 20:12:09 +0000 (20:12 +0000)]
Merge "Modify Bluetooth Class of Device from Android stack" am:
f4ec2ab706
am:
c037004fd9
Change-Id: I06831c086920b93f0c1c076e255ce404769b8691
Pulkit Bhuwalka [Wed, 27 Sep 2017 20:04:32 +0000 (20:04 +0000)]
Merge "Modify Bluetooth Class of Device from Android stack"
am:
f4ec2ab706
Change-Id: I9a0b06f44d2fe7be343fc38ce240d82f1b309d7d
Treehugger Robot [Wed, 27 Sep 2017 19:43:17 +0000 (19:43 +0000)]
Merge "Modify Bluetooth Class of Device from Android stack"
Lorenzo Colitti [Wed, 27 Sep 2017 10:59:13 +0000 (10:59 +0000)]
Merge "Delete the legacy framework code for manipulating ND offload." am:
d1ae268081
am:
53eb9d359a
Change-Id: If4b3dcf4c1bf03a1d105ad4dfdd007fa371f4472
Lorenzo Colitti [Wed, 27 Sep 2017 10:53:05 +0000 (10:53 +0000)]
Merge "Delete the legacy framework code for manipulating ND offload."
am:
d1ae268081
Change-Id: I060bd7632b809d89224d250c697ac9d2e89d5c2d
Lorenzo Colitti [Wed, 27 Sep 2017 10:46:36 +0000 (10:46 +0000)]
Merge "Delete the legacy framework code for manipulating ND offload."
Jean Chalard [Wed, 27 Sep 2017 10:06:52 +0000 (10:06 +0000)]
Merge "Adds necessary permissions to system apis" am:
b4a5933a62
am:
f3b169c8e6
Change-Id: If10e10963cedfe4b19e57d3b26a6c4113985757f
Jean Chalard [Wed, 27 Sep 2017 09:58:51 +0000 (09:58 +0000)]
Merge "Adds necessary permissions to system apis"
am:
b4a5933a62
Change-Id: Ifa5d94cdd883c3e1b983c985c0c17fe61e864352
Jean Chalard [Wed, 27 Sep 2017 09:50:42 +0000 (09:50 +0000)]
Merge "Adds necessary permissions to system apis"
Lorenzo Colitti [Wed, 27 Sep 2017 08:40:53 +0000 (08:40 +0000)]
Merge "Declare support for Ethernet if the service is running." am:
0d3d35b30b
am:
5ada8e56f8
Change-Id: I8cbd09623b419f14a52f722740580c6ae6de7613
Lorenzo Colitti [Wed, 27 Sep 2017 08:32:43 +0000 (08:32 +0000)]
Merge "Declare support for Ethernet if the service is running."
am:
0d3d35b30b
Change-Id: Ie0a0190da53571c6f4b466840b7878eb54b5e136
Treehugger Robot [Wed, 27 Sep 2017 08:23:34 +0000 (08:23 +0000)]
Merge "Declare support for Ethernet if the service is running."
Lorenzo Colitti [Wed, 27 Sep 2017 04:17:47 +0000 (13:17 +0900)]
Delete the legacy framework code for manipulating ND offload.
This only worked on broadcom devices, and was superseded in
M by a wifi HAL call made by IpManager.
Test: bullhead builds, boots
Change-Id: I711cae7dafe171c2c8b4e84a229adbcad27f3d14
Lorenzo Colitti [Thu, 24 Aug 2017 13:35:10 +0000 (22:35 +0900)]
Declare support for Ethernet if the service is running.
On some devices, support for TYPE_ETHERNET is not specified in
the networkAttributes config resource, even though the device is
capable of supporting Ethernet (e.g., via USB host adapters).
This leads to Ethernet working but various connectivity APIs
behaving as if it was not - for example, no CONNECTIVITY_ACTION
broadcasts will be issues when it connects or disconnects.
Ensure that ConnectivityService always treats Ethernet as
available if the service is running. Currently the service is
started if the device supports FEATURE_ETHERNET or
FEATURE_USB_HOST.
Bug:
37359230
Test: bullhead builds, boots
Test: ConnectivityServiceTest passes
Test: Ethernet is available even if removed from networkAttributes resource
Test: ConnectivityManagerTest CTS test passes
Change-Id: I58801bf4f0bbdc3ff6345ec6bfdc911ce045c8ab
Udam Saini [Wed, 7 Jun 2017 19:06:28 +0000 (12:06 -0700)]
Adds necessary permissions to system apis
adds privileged permission for getCaptivePortalServerUrl
adds tether privileged permission for
startTethering,isTetheringSupported
bug:
62348162
Test: make and manual testing
Change-Id: I8eb8e3c9dcd7201abe9ea303ee57fe99073d67eb
Fyodor Kupolov [Wed, 27 Sep 2017 00:46:29 +0000 (00:46 +0000)]
Merge "[DO NOT MERGE] Fix another AddAccountSettings memory leak" am:
bff14ae56f -s ours
am:
602aa57cb9 -s ours
Change-Id: I62c9c5e8edec52feb8bbd680a2206feda172e133
Fyodor Kupolov [Wed, 27 Sep 2017 00:34:37 +0000 (00:34 +0000)]
Merge "[DO NOT MERGE] Fix another AddAccountSettings memory leak"
am:
bff14ae56f -s ours
Change-Id: I4737fa1dd54600f276ce90d3a04dbbd7cebe7f54
Fyodor Kupolov [Wed, 27 Sep 2017 00:25:16 +0000 (00:25 +0000)]
Merge "[DO NOT MERGE] Fix another AddAccountSettings memory leak"
nharold [Tue, 26 Sep 2017 22:24:02 +0000 (22:24 +0000)]
Merge changes from topic "re-enable-ipsec" am:
680525c742
am:
8d306cd78a
Change-Id: I4e712a0d17618ca93cf6032b59ce8be0c8e0bfee
Nathan Harold [Tue, 26 Sep 2017 22:22:42 +0000 (22:22 +0000)]
Re-Enable Starting of the IpSecService am:
b72821747c
am:
f434a6d308
Change-Id: I328841b57df6f216c0e4b0aa0c1df923c606a885
tiansiming [Wed, 20 Sep 2017 05:59:13 +0000 (13:59 +0800)]
[DO NOT MERGE] Fix another AddAccountSettings memory leak
The memory leak will always occur in AddAccoutSettings
when Bundle with an invalid intent returned in the addAccount we implement.
Bug:https://issuetracker.google.com/issues/
66088681
Test:Install the app through the github offered in above link,
then press the "Test" item in ChooseAccountActivity (adb shell am start -n
'com.android.settings/.accounts.ChooseAccountActivity') serveal times.
Check the activity number by "adb shell dumpsys meminfo com.android.settings".
Change-Id: Id15fc73521d0ddc6ca891b6029ad04cd4427dbfe
Signed-off-by: tiansiming <tiansiming@xiaomi.com>
nharold [Tue, 26 Sep 2017 22:13:20 +0000 (22:13 +0000)]
Merge changes from topic "re-enable-ipsec"
am:
680525c742
Change-Id: Ia1d1f3981a9dd1eb8f60631d318211daf135d575
Nathan Harold [Tue, 26 Sep 2017 22:11:58 +0000 (22:11 +0000)]
Re-Enable Starting of the IpSecService
am:
b72821747c
Change-Id: I1f64aa2fdf1cce6dea91427eda65c4b8ee6f6b02
nharold [Tue, 26 Sep 2017 21:46:39 +0000 (21:46 +0000)]
Merge changes from topic "re-enable-ipsec"
* changes:
Re-Expose IpSecService API Surface
Re-Enable Starting of the IpSecService
Bill Yi [Tue, 26 Sep 2017 19:04:06 +0000 (19:04 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
4414109220 -s ours
am:
46181531ec -s ours
Change-Id: Ic283086745e42fe4351c3817782e46ac9c93f1dd
Bill Yi [Tue, 26 Sep 2017 18:55:20 +0000 (18:55 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
4414109220 -s ours
Change-Id: I3820c0c5decca7f1a839a40a65e9021fa6e999d1
TreeHugger Robot [Tue, 26 Sep 2017 18:42:25 +0000 (18:42 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Tue, 26 Sep 2017 18:20:20 +0000 (18:20 +0000)]
Import translations. DO NOT MERGE am:
1df9bbaafe -s ours am:
6cc2a9cdc2 -s ours am:
5cf5642cbd -s ours
am:
7b3e838ec1 -s ours
Change-Id: Ied87a01867e75220346a2ea6d628b9b086ee58b3
Bill Yi [Tue, 26 Sep 2017 18:13:03 +0000 (18:13 +0000)]
Import translations. DO NOT MERGE am:
1df9bbaafe -s ours am:
6cc2a9cdc2 -s ours
am:
5cf5642cbd -s ours
Change-Id: Ie5c5a0ddabdc8dc0bfd081c48c3c279425cc2682
Bill Yi [Tue, 26 Sep 2017 18:03:49 +0000 (18:03 +0000)]
Import translations. DO NOT MERGE am:
1df9bbaafe -s ours
am:
6cc2a9cdc2 -s ours
Change-Id: I4d3d9da8dcdc0c898c49856cae530c14f6aa915e
Bill Yi [Tue, 26 Sep 2017 17:53:44 +0000 (17:53 +0000)]
Import translations. DO NOT MERGE
am:
1df9bbaafe -s ours
Change-Id: I2bf2ceaea1279df64cf7409c57c75039caaa7879
Bill Yi [Tue, 26 Sep 2017 13:58:36 +0000 (06:58 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I348ab7ada9d98e745fe4716beadb6857d39705ec
Hugo Benichi [Tue, 26 Sep 2017 12:43:28 +0000 (12:43 +0000)]
Merge changes Ia47e566b,Ib94d79a9 am:
b9e2ddfc10
am:
a2161c5ccb
Change-Id: If1125419d50b8291bcb056dd4bc7ecd6ea2b5342
Jack Yu [Tue, 26 Sep 2017 12:34:42 +0000 (12:34 +0000)]
Merge "Fixed that telephony registry service reference incorrectly assigned" am:
b0510407da
am:
aeb6820f11
Change-Id: Ie788700dfe65037d80fb1a42ff3dae1030b37405
Nicolas Geoffray [Tue, 26 Sep 2017 12:30:43 +0000 (12:30 +0000)]
Merge "Move code around for deleting oat artifacts." am:
a7bf2a21d9
am:
69fbdcae71
Change-Id: If5e92c3b0499f3d2f69975596678581dfc090733
Nicolas Geoffray [Tue, 26 Sep 2017 12:26:51 +0000 (12:26 +0000)]
Merge "Special handling of priv-apps in PMS." am:
107899c599
am:
15b0493360
Change-Id: I30c573bccf1f0e483d0881062c5b83a56b5080fe
Hans Boehm [Tue, 26 Sep 2017 12:23:12 +0000 (12:23 +0000)]
Merge "Naming fix and add comments" am:
3c03d5bd2b
am:
24b9851605
Change-Id: Ib2f4ade384b33efc5d54374ce13e26e256f4c8d3
Peng Xu [Tue, 26 Sep 2017 12:17:39 +0000 (12:17 +0000)]
Merge changes from topic "equalizer_1" am:
1ba697e29b
am:
46f2249f46
Change-Id: Icd3c715dfed772d05b8314a394aad2725a9937e0
Peng Xu [Tue, 26 Sep 2017 12:16:35 +0000 (12:16 +0000)]
Add sensor HAL process into dump list am:
ee5164ef5b
am:
2398607cc7
Change-Id: I625a84f4f5c235c06e90fe4f8b44aa41979c8b5b
Peng Xu [Tue, 26 Sep 2017 12:13:04 +0000 (12:13 +0000)]
Merge changes from topic "equalizer" am:
aad139a2d3 -s ours
am:
2c292120aa -s ours
Change-Id: I7d40f3964fd312fe645dba2b05cc324fea079321
Peng Xu [Tue, 26 Sep 2017 11:56:01 +0000 (11:56 +0000)]
Update Java doc of SensorManager.createDirectChannel am:
9ee042efa8
am:
1c2b555ad9
Change-Id: If2ca73b4b7ba4c1e6778061739ce3689a1341746
Hugo Benichi [Tue, 26 Sep 2017 11:46:30 +0000 (11:46 +0000)]
Merge changes Ia47e566b,Ib94d79a9
am:
b9e2ddfc10
Change-Id: I0cac456f778db78d76d2225b79ce42526a6d2d19
Jack Yu [Tue, 26 Sep 2017 11:33:16 +0000 (11:33 +0000)]
Merge "Fixed that telephony registry service reference incorrectly assigned"
am:
b0510407da
Change-Id: I0d65bc2cc843ce49a10cf6fdebfc4e1f602edaea
Nicolas Geoffray [Tue, 26 Sep 2017 11:25:41 +0000 (11:25 +0000)]
Merge "Move code around for deleting oat artifacts."
am:
a7bf2a21d9
Change-Id: I63ef9f2a730dbe6ad37ce750be3a6a47636c14d6
Nicolas Geoffray [Tue, 26 Sep 2017 11:22:00 +0000 (11:22 +0000)]
Merge "Special handling of priv-apps in PMS."
am:
107899c599
Change-Id: I43de972b520dcfab7d103ce77ea1539e341825b3
Hans Boehm [Tue, 26 Sep 2017 11:12:19 +0000 (11:12 +0000)]
Merge "Naming fix and add comments"
am:
3c03d5bd2b
Change-Id: Ib35c874f56f87757904553ceeffb4d363eff196e
Peng Xu [Tue, 26 Sep 2017 11:07:28 +0000 (11:07 +0000)]
Merge changes from topic "equalizer_1"
am:
1ba697e29b
Change-Id: I0b5dabe42c0ab59fab63ea653392dd4d99b7d967
Peng Xu [Tue, 26 Sep 2017 11:05:54 +0000 (11:05 +0000)]
Add sensor HAL process into dump list
am:
ee5164ef5b
Change-Id: I2d13c8d5a871e00cbe96d42b2f8779f5d323223f
Peng Xu [Tue, 26 Sep 2017 11:01:14 +0000 (11:01 +0000)]
Merge changes from topic "equalizer"
am:
aad139a2d3 -s ours
Change-Id: Id283ea5e7ad3620f9c6488aadcca8bb216aea482
Hugo Benichi [Tue, 26 Sep 2017 09:48:10 +0000 (09:48 +0000)]
Merge changes Ia47e566b,Ib94d79a9
* changes:
Separate connectivity event buffer for bug reports
Extract RingBuffer class from NetdEventListenerService
Bill Yi [Tue, 26 Sep 2017 05:29:40 +0000 (22:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3bce312584c61d6bc31d4e7c4068b757336fbe25
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Hugo Benichi [Fri, 15 Sep 2017 05:18:57 +0000 (14:18 +0900)]
Separate connectivity event buffer for bug reports
This patch uses the RingBuffer class previously extracted out of
NetdEventListenerService for buffering connectivity events in two
independent buffers:
- the current existing buffer used for metrics reporting
- a new rolling buffer, used for bug report dumpsys.
This improves the suefulness of connectivity metrics for bug reports
by solving these three issues tied to the usage of the existing metrics
reporting buffer:
- the buffer is always cleared when metrics reporting happens. If a bug
report is taken shortly after, there is no past connectivity event
added to that bug report.
- the buffer has a max capacity and starts dropping new events when it
saturates, until metrics reporting happens. When this happens, a bug
report will not contain recent connectivity events.
- some types of event are rate limited to avoid flooding the metrics
buffer. events dropped due to rate limits never appears in the bug
report, but the new bug report buffer ignores rate limiting.
Bug:
65164242
Bug:
65700460
Test: runtest frameworks-net,
manually inspecting ouput of $ adb shell dumpsys connmetrics -a
Change-Id: Ia47e566b0c9a6629a26afb7067d5a8efadc25aef
Hugo Benichi [Thu, 14 Sep 2017 07:31:38 +0000 (16:31 +0900)]
Extract RingBuffer class from NetdEventListenerService
This patch takes out the ring buffer array added for NFLOG wakeup packet
events logging and extract it into its own class for reuse. This new
RingBuffer class has the two minimal useful functions append() and
toArray().
Bug:
65164242
Bug:
65700460
Test: runtest frameworks-net, with new unit test
Change-Id: Ib94d79a93f4e99661b7d0fac67117b91d57af980
Peng Xu [Mon, 25 Sep 2017 23:03:30 +0000 (23:03 +0000)]
Update Java doc of SensorManager.createDirectChannel
am:
9ee042efa8
Change-Id: I7221311f8b9495381e75362c8d2b962761bf7645
Treehugger Robot [Mon, 25 Sep 2017 19:14:04 +0000 (19:14 +0000)]
Merge "Fixed that telephony registry service reference incorrectly assigned"
Jack Yu [Fri, 22 Sep 2017 06:48:29 +0000 (23:48 -0700)]
Fixed that telephony registry service reference incorrectly assigned
The reference to telephony registry service was assigned
prior telephony registry service was ready. Fixed by
casting the binder every time when we use it.
Test: Manual
Bug:
65593241
Merged-In: Ib234cdfd93130f7af44ef79271b106fffb8ebad5
Change-Id: Ib234cdfd93130f7af44ef79271b106fffb8ebad5
(cherry picked from commit
66420e258a97e864985530ae7a1e208c978dbc7a)
Nicolas Geoffray [Mon, 25 Sep 2017 08:32:51 +0000 (08:32 +0000)]
Merge "Move code around for deleting oat artifacts."
Nicolas Geoffray [Mon, 25 Sep 2017 08:22:34 +0000 (08:22 +0000)]
Merge "Special handling of priv-apps in PMS."
Hans Boehm [Mon, 25 Sep 2017 04:09:30 +0000 (04:09 +0000)]
Merge "Naming fix and add comments"
Treehugger Robot [Sat, 23 Sep 2017 02:39:42 +0000 (02:39 +0000)]
Merge changes from topic "equalizer_1"
* changes:
Fixing code formatting to comform to checkstyle
Add sensor HAL process into dump list
Peng Xu [Sat, 23 Sep 2017 00:17:10 +0000 (00:17 +0000)]
Merge changes from topic "equalizer"
* changes:
Update Java doc of SensorManager.createDirectChannel
sensors: pass sensor handle along with injected event
Peng Xu [Fri, 22 Sep 2017 18:50:33 +0000 (11:50 -0700)]
Fixing code formatting to comform to checkstyle
Fix following types of issue
* over 100 char/line
* missing space
* trailing spaces
* array bracket position
* variable naming convention (some cases)
* indentation
* long expression wrapping operator position
* missing curly brace for one line scope
* function modifier order
Things not changed in this CL:
* Redundant public modifiers.
* A few local variable names.
* Suggested @deprecate but function is actually @removed.
Test: m and m docs
Change-Id: I5c22648888487edaa5954026a166cfd810a8a912
Hans Boehm [Wed, 20 Sep 2017 22:59:12 +0000 (15:59 -0700)]
Naming fix and add comments
Also fix up imports to make repohooks happy and some whitespace issues.
A very small step towards making this code more understandable.
Bug:
65760710
Test: Builds.
Change-Id: I0396c06bb303e0b06ad0cbbbff4fdc1ac527ac6c
Myles Watson [Fri, 22 Sep 2017 18:06:47 +0000 (18:06 +0000)]
Merge changes from topic "avrcp_cherry_picks" am:
b4e17814f0
am:
898bc38860
Change-Id: Iee7beb952d58e7c117fa2fc50537988c7ad8b443
Ajay Panicker [Fri, 22 Sep 2017 18:05:41 +0000 (18:05 +0000)]
Add equal overloads to some MediaDescription and MediaQueue objects (2/3) am:
905d8ab843
am:
12bec46613
Change-Id: I88f9d4c23f4757fe50bbb36ef376e7460a28f1ca
Myles Watson [Fri, 22 Sep 2017 17:15:58 +0000 (17:15 +0000)]
Merge changes from topic "avrcp_cherry_picks"
am:
b4e17814f0
Change-Id: Id15dddaeb7082031fdd03ca9e0f9f54c83abb142
Ajay Panicker [Fri, 22 Sep 2017 17:14:36 +0000 (17:14 +0000)]
Add equal overloads to some MediaDescription and MediaQueue objects (2/3)
am:
905d8ab843
Change-Id: I8f47786d4e0c392b008cdce80aed05ca7b1573b1
Myles Watson [Fri, 22 Sep 2017 16:37:33 +0000 (16:37 +0000)]
Merge changes from topic "avrcp_cherry_picks"
* changes:
Bluetooth: Add AVRCP 1.3 as a developer option for AVRCP version (1/2)
Add equal overloads to some MediaDescription and MediaQueue objects (2/3)
Ajay Panicker [Fri, 1 Sep 2017 18:58:38 +0000 (11:58 -0700)]
Bluetooth: Add AVRCP 1.3 as a developer option for AVRCP version (1/2)
This is requied for the 2012 Mazda 3 carkit as the carkit refuses to send
AVRCP commands other than passthrough commands when the version is anything
else. AVRCP 1.3 is compatible with most carkits on the market and can be
used to get most carkits working at the cost of losing many features.
Bug:
37943083
Test: Set AVRCP 1.3 in developer options and see that SDP and the AVRCP
capabilites have updated to reflect this.
TestTracker: 105915/3975
Change-Id: I637b695e5cd8baa5f054ca0dda81372080a96269
Ajay Panicker [Fri, 21 Jul 2017 20:29:57 +0000 (13:29 -0700)]
Add equal overloads to some MediaDescription and MediaQueue objects (2/3)
Bug:
64686424
Test: Connect to carkit and see that NowPlayingChanged only gets sent when
the queue changes, run cts test
Change-Id: I58c9dd0bf976485a2efefd042cd667ee433e07e1
(cherry picked from commit
6edb68bea68d5f324384f3e9e411118eb8dfc781)
Christopher Schuster [Fri, 22 Sep 2017 15:11:08 +0000 (15:11 +0000)]
Merge "fixed handling of data URI schemes in Intent.toUri" am:
c3d3cf5666
am:
928b7cba47
Change-Id: I1c41d3eb7ac815b8cf04879fbeee70a66d5a2a3e
Christopher Schuster [Fri, 22 Sep 2017 15:02:03 +0000 (15:02 +0000)]
Merge "fixed handling of data URI schemes in Intent.toUri"
am:
c3d3cf5666
Change-Id: Id4b8ef16f7a428e6c3d8b382387cf575d05926ad
Nicolas Geoffray [Fri, 8 Sep 2017 12:01:40 +0000 (13:01 +0100)]
Special handling of priv-apps in PMS.
If pm.dexopt.priv-apps is set to false, don't do any dexopt on it, and
check the APKs have uncompressed and aligned code.
bug:
30972906
bug:
63920015
Test: works as expected when pm.dexopt.priv-apps is true or false
Change-Id: I72a322defb459549617028e030f1aec997223af5
Treehugger Robot [Fri, 22 Sep 2017 09:04:16 +0000 (09:04 +0000)]
Merge "fixed handling of data URI schemes in Intent.toUri"
Nicolas Geoffray [Fri, 22 Sep 2017 08:01:32 +0000 (09:01 +0100)]
Move code around for deleting oat artifacts.
Test: make and boot
(partially cherry-picked from commit
246dccf9327631597767afe418ce43ae6d07d102)
Change-Id: Id3ce5fdee116df264241dfdee95734ac4bbad7ce
Takamasa Kuramitsu [Fri, 22 Sep 2017 02:43:24 +0000 (02:43 +0000)]
Merge "Add checking values not to save illegal value to appwidgets.xml" am:
941d4b2135
am:
1807cb4a88
Change-Id: I6e02c6dead092e8727f8ef76eaf689ef0cfec376
Takamasa Kuramitsu [Fri, 22 Sep 2017 02:37:24 +0000 (02:37 +0000)]
Merge "Add checking values not to save illegal value to appwidgets.xml"
am:
941d4b2135
Change-Id: I4d74a5deb0a48e4b61dcfacb3f19f735afe5d95e
Treehugger Robot [Fri, 22 Sep 2017 02:17:47 +0000 (02:17 +0000)]
Merge "Add checking values not to save illegal value to appwidgets.xml"
Andre Eisenbach [Thu, 21 Sep 2017 21:52:39 +0000 (21:52 +0000)]
Merge "Improve AVRCP quality and state handling (2/2)" into oc-dev am:
5c54a732f1
am:
60315cab7a
Change-Id: I88d00765cd8e9a3f8b31135f3b63f9a25012dac1
Andre Eisenbach [Thu, 21 Sep 2017 21:40:45 +0000 (21:40 +0000)]
Merge "Improve AVRCP quality and state handling (2/2)" into oc-dev
am:
5c54a732f1
Change-Id: I62bacf450c64f98e44e15e0a1ec7a4f13f2982c4
Andre Eisenbach [Thu, 21 Sep 2017 18:15:27 +0000 (18:15 +0000)]
Merge "Improve AVRCP quality and state handling (2/2)" into oc-dev
Bill Yi [Thu, 21 Sep 2017 16:19:42 +0000 (16:19 +0000)]
Import translations. DO NOT MERGE am:
de5eefa935 -s ours am:
9d008286c7 -s ours am:
b4e9b3f651 -s ours
am:
7139a4dd5e -s ours
Change-Id: I9a8c5a42038743f46b46b26b26d383799a102bde
Bill Yi [Thu, 21 Sep 2017 16:13:13 +0000 (16:13 +0000)]
Import translations. DO NOT MERGE am:
de5eefa935 -s ours am:
9d008286c7 -s ours
am:
b4e9b3f651 -s ours
Change-Id: I8b727efb19b68f7adfc1f3eda4240e70551b8102
Bill Yi [Thu, 21 Sep 2017 16:11:12 +0000 (16:11 +0000)]
Import translations. DO NOT MERGE am:
50e19c566e -s ours
am:
e708378dc9 -s ours
Change-Id: Iddd08f8c762a19e7785f0fc067154f246553e2ff
Bill Yi [Thu, 21 Sep 2017 16:06:29 +0000 (16:06 +0000)]
Import translations. DO NOT MERGE
am:
50e19c566e -s ours
Change-Id: I82b5f21b00ed2e75a74859ffe70560e6999902a6
Bill Yi [Thu, 21 Sep 2017 16:04:11 +0000 (16:04 +0000)]
Import translations. DO NOT MERGE am:
de5eefa935 -s ours
am:
9d008286c7 -s ours
Change-Id: I5535968d3817e8c09e9d5e3e0a75180d29dbe303
Bill Yi [Thu, 21 Sep 2017 15:56:53 +0000 (15:56 +0000)]
Import translations. DO NOT MERGE
am:
de5eefa935 -s ours
Change-Id: I53abfc53a067bca1cec279285f59185b8b18a64e
Christopher Schuster [Fri, 21 Jul 2017 21:53:52 +0000 (14:53 -0700)]
fixed handling of data URI schemes in Intent.toUri
Data URIs in intents can use schemes with digits and some special
characters (see RFC 2396 and 3986). This patch fixes how these
data URIs are handled by Intent.toUri to support these schemes.
Bug:
63930680
Test: run cts android.content.cts.IntentTest#testUris
Change-Id: I0dbb72325f59f372abba83be9e14c59d5665a053
Signed-off-by: Christopher Schuster <levjj@google.com>
vichang [Thu, 21 Sep 2017 12:53:54 +0000 (12:53 +0000)]
Merge "Remove StructGroupSourceReq" am:
c7d27845df
am:
4c86c99273
Change-Id: I7bf2fbedce07a63adb16cff7c8a2febf90b606f7
vichang [Thu, 21 Sep 2017 12:47:34 +0000 (12:47 +0000)]
Merge "Remove StructGroupSourceReq"
am:
c7d27845df
Change-Id: I73bc8a380f8981cff14a4ef5c6f36f81a8b4d7f8
vichang [Thu, 21 Sep 2017 12:42:15 +0000 (12:42 +0000)]
Merge "Remove StructGroupSourceReq"
Hugo Benichi [Thu, 21 Sep 2017 12:14:37 +0000 (12:14 +0000)]
Merge "Implement ConnectivityService TODO and fix many race conditions" am:
f6b72dd145
am:
8bb2cdea00
Change-Id: I4a7658e1fa6946063ab86a251269413903841ee8
Hugo Benichi [Thu, 21 Sep 2017 12:08:45 +0000 (12:08 +0000)]
Merge "Implement ConnectivityService TODO and fix many race conditions"
am:
f6b72dd145
Change-Id: I2011e23c9f894c079ab66cd7cc5c14af572a956d
Erik Kline [Thu, 21 Sep 2017 12:02:07 +0000 (12:02 +0000)]
Merge "Also support 464xlat on SUSPENDED networks" am:
995a28d334
am:
69a28066bd
Change-Id: I960a8976abfebc6741a5982c749c8e428a675990
Hugo Benichi [Thu, 21 Sep 2017 12:00:48 +0000 (12:00 +0000)]
Merge "Implement ConnectivityService TODO and fix many race conditions"
Erik Kline [Thu, 21 Sep 2017 11:55:35 +0000 (11:55 +0000)]
Merge "Also support 464xlat on SUSPENDED networks"
am:
995a28d334
Change-Id: Iab87bfcb66e7932d61beec38bcbda366262eab46
Treehugger Robot [Thu, 21 Sep 2017 11:47:33 +0000 (11:47 +0000)]
Merge "Also support 464xlat on SUSPENDED networks"
Bill Yi [Thu, 21 Sep 2017 10:12:01 +0000 (03:12 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I0e4df67a950b6e0d541548c01f0812141102fb91
Hugo Benichi [Wed, 20 Sep 2017 02:20:14 +0000 (11:20 +0900)]
Implement ConnectivityService TODO and fix many race conditions
This patch implements an outstanding TODO in ConnectivityService to add
synchronization over the map of network request ids to network agent
info objects.
This structure is accessed from multiple threads:
- Binder thread on public aidl methods, most notably via
getDefaultNetwork().
- Internal handler.
This leads to many race conditions that can crash the system server and
reboot the phone if getDefaultNetwork() is called on a Binder thread to
service a public ConnectivityManager api while the default network state
is being updated on the internal handler after losing the default
network.
Bug:
65911184
Test: runtest frameworks-net
Change-Id: I86c830ebd559e31d4576a7606705a056afb064ac
Erik Kline [Thu, 21 Sep 2017 08:28:10 +0000 (17:28 +0900)]
Also support 464xlat on SUSPENDED networks
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
65684232
Change-Id: I1b10aab01554b1f926ec7157dba78645fdaff90f