OSDN Git Service
Bill Yi [Thu, 16 Feb 2017 15:33:36 +0000 (15:33 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
495542837c -s ours
Change-Id: I35a3f583390c5a03682680921cc593e48fb77f88
Bill Yi [Thu, 16 Feb 2017 15:32:32 +0000 (15:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
ea62e92c27 -s ours
Change-Id: I0cde2e97d2d4ed8659b06ecae96c57a32f501e09
Bill Yi [Thu, 16 Feb 2017 15:31:22 +0000 (15:31 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
0860f41afc -s ours
Change-Id: I6df27fbf95cc22ef8988730a1d7f244949fa838c
TreeHugger Robot [Thu, 16 Feb 2017 15:25:29 +0000 (15:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Thu, 16 Feb 2017 15:24:59 +0000 (15:24 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Thu, 16 Feb 2017 15:24:27 +0000 (15:24 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Etan Cohen [Thu, 16 Feb 2017 14:38:28 +0000 (14:38 +0000)]
Merge changes from topic 'cm_request_to' am:
6fb97e8fd8 am:
ede9f94e32
am:
c3f0f5f3de
Change-Id: Ief32189b0f6f2c70d7e4097f70dbdf8195bd8713
Etan Cohen [Thu, 16 Feb 2017 14:37:26 +0000 (14:37 +0000)]
[CM] Remove non-functional timeout from request network am:
e9aea9d397 am:
a6be89aa40
am:
aae1411a93
Change-Id: I31fbce5bab0d03b9b468f4fc5e819a59027aca7b
Etan Cohen [Thu, 16 Feb 2017 14:29:29 +0000 (14:29 +0000)]
Merge changes from topic 'cm_request_to' am:
6fb97e8fd8
am:
ede9f94e32
Change-Id: I2720e64e4af88df9d3a7b6209e9fcef4a0340986
Etan Cohen [Thu, 16 Feb 2017 14:28:29 +0000 (14:28 +0000)]
[CM] Remove non-functional timeout from request network am:
e9aea9d397
am:
a6be89aa40
Change-Id: Ie00ac8dee9302fafc0cdad95ec08d376ad908ab9
Etan Cohen [Thu, 16 Feb 2017 14:23:18 +0000 (14:23 +0000)]
Merge changes from topic 'cm_request_to'
am:
6fb97e8fd8
Change-Id: I9ca18c0570be831ab37cdf200c28b0778117198d
Etan Cohen [Thu, 16 Feb 2017 14:21:44 +0000 (14:21 +0000)]
[CM] Remove non-functional timeout from request network
am:
e9aea9d397
Change-Id: Ica347b2c2181fe04a7efb2769d7498a31c888e5a
Etan Cohen [Thu, 16 Feb 2017 14:15:43 +0000 (14:15 +0000)]
Merge changes from topic 'cm_request_to'
* changes:
[CM] Remove maximum timeout value for request network
[CM] Remove non-functional timeout from request network
Etan Cohen [Sun, 5 Feb 2017 18:42:27 +0000 (10:42 -0800)]
[CM] Remove maximum timeout value for request network
The request network with timeout was originally created with a
check of max timeout against a constant of 100 minutes. However,
the API was not public and did not implement a timeout. Any users
were internal and never got any onUnavailable() callback (since
timeout never triggered).
There is no reason to have a max timeout so the constant is
remove.
Bug:
31399536
Test: unit tests and CTS of ConnectivityManager
Change-Id: Icbedfb4299d75b6a7e3e43720111531f1faafd06
Hemant Gupta [Thu, 16 Feb 2017 13:18:22 +0000 (13:18 +0000)]
Merge "OBEX: Set Min maxPacketLength negotiated in CONNECT Operation." am:
3ac3170a4b am:
1112046506
am:
ff3f4e72af
Change-Id: Ic5965ea14b7b1b68b261b554063f5aae473a117d
Hemant Gupta [Thu, 16 Feb 2017 13:14:22 +0000 (13:14 +0000)]
Merge "OBEX: Set Min maxPacketLength negotiated in CONNECT Operation." am:
3ac3170a4b
am:
1112046506
Change-Id: Ib406bdcd0f388c7fe1f226da2ae17a2c588739c9
Shigeki Yokomichi [Thu, 16 Feb 2017 13:14:19 +0000 (13:14 +0000)]
Merge "Fix the "Alarm volume" icon is displayed incorrectly" am:
e0ba81110a am:
657abc315d
am:
4b06345751
Change-Id: I2b4719d6f50533f62af22d55fb870802ead7c554
Hemant Gupta [Thu, 16 Feb 2017 13:10:19 +0000 (13:10 +0000)]
Merge "OBEX: Set Min maxPacketLength negotiated in CONNECT Operation."
am:
3ac3170a4b
Change-Id: I477f407d94a43a14083fa68a7b271f5d4fe8445d
Shigeki Yokomichi [Thu, 16 Feb 2017 13:06:27 +0000 (13:06 +0000)]
Merge "Fix the "Alarm volume" icon is displayed incorrectly" am:
e0ba81110a
am:
657abc315d
Change-Id: I295d50e9513775dddb2aea3686275264d7e0f12c
Treehugger Robot [Thu, 16 Feb 2017 12:59:15 +0000 (12:59 +0000)]
Merge "OBEX: Set Min maxPacketLength negotiated in CONNECT Operation."
Shigeki Yokomichi [Thu, 16 Feb 2017 12:58:17 +0000 (12:58 +0000)]
Merge "Fix the "Alarm volume" icon is displayed incorrectly"
am:
e0ba81110a
Change-Id: Id7996cd16fea9eccbdcd389206e77d7390cd25a2
Bill Yi [Thu, 16 Feb 2017 12:54:38 +0000 (04:54 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3ee5f071cb664f57f316b70a4036973aba9312bd
Auto-generated-cl: translation import
Treehugger Robot [Thu, 16 Feb 2017 12:47:41 +0000 (12:47 +0000)]
Merge "Fix the "Alarm volume" icon is displayed incorrectly"
Bill Yi [Thu, 16 Feb 2017 11:29:57 +0000 (03:29 -0800)]
Import translations. DO NOT MERGE
Change-Id: If44132000703aba49ea891bd59b3006c7cc8dc31
Auto-generated-cl: translation import
Bill Yi [Thu, 16 Feb 2017 10:48:51 +0000 (02:48 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3ee247ad24da92edcf93e0edadcddcce8bda17b5
Auto-generated-cl: translation import
Hugo Benichi [Thu, 16 Feb 2017 07:12:55 +0000 (07:12 +0000)]
Merge "Captive portal: better detect empty responses" am:
c217f7a9f3 am:
af8e749820
am:
7973ff4c13
Change-Id: I63a3bf9f2983bdb68df7ef48b334930a089648eb
Hugo Benichi [Thu, 16 Feb 2017 07:08:27 +0000 (07:08 +0000)]
Merge "Captive portal: better detect empty responses" am:
c217f7a9f3
am:
af8e749820
Change-Id: I0b2cd45fb92e2f8accb53ef4e050d2b6e7f7fd1c
Hugo Benichi [Thu, 16 Feb 2017 07:04:25 +0000 (07:04 +0000)]
Merge "Captive portal: better detect empty responses"
am:
c217f7a9f3
Change-Id: If6229a3a5c0ccc3575d44d11ed9f486cab35eac3
Hugo Benichi [Thu, 16 Feb 2017 06:54:46 +0000 (06:54 +0000)]
Merge "Captive portal: better detect empty responses"
Hugo Benichi [Wed, 11 Jan 2017 07:23:26 +0000 (16:23 +0900)]
Captive portal: better detect empty responses
The captive portal detection logic treats empty http responses with a
Content-Length of 0 as not coming from a portal.
However when the Content-Length is missing from the response header, the
empty response is not detected as such and is classified as a captive
portal answer.
When this happens for the http probe, the portal detection logic will
short circuit the detection and wrongly report a portal. The system
validates the network in such conditions only if the https probe
returns a successful connection faster than the http probe.
This patch attempts to better detect empty responses by trying to read
the first byte from the response body when the Content-Length is missing
for 200 responses.
Test: build, flashed + manual tests.
Bug:
33498325
(cherry picked from commit
cb4aa4d412c7940386df9b8dd681e0d2efebfd1d)
Change-Id: Ibb9914cba72a4dab3ae76746d8889bbf083be812
Manu Cornet [Thu, 16 Feb 2017 03:13:14 +0000 (03:13 +0000)]
Merge "DO NOT MERGE - Ensuring that there are per-user last stack active times." into nyc-mr2-dev
am:
e0e08f3f41
Change-Id: Iaeee64f2a6954be8560412f60f838e2483be01f0
TreeHugger Robot [Thu, 16 Feb 2017 03:02:14 +0000 (03:02 +0000)]
Merge "DO NOT MERGE - Ensuring that there are per-user last stack active times." into nyc-mr2-dev
Hall Liu [Thu, 16 Feb 2017 01:31:54 +0000 (01:31 +0000)]
Merge "Add extra key for app-specified outgoing call timeout" into nyc-mr2-dev
am:
4d3435637f -s ours
Change-Id: I2ed7250a9fb8c5026b209ad5b3384a401b1d4d16
Chris Tate [Thu, 16 Feb 2017 01:25:04 +0000 (01:25 +0000)]
Merge "Harden against jobscheduler client app misbehavior" into nyc-mr2-dev
am:
38f1b6dbc9
Change-Id: I44d16150abee9dd0ec7961d1ce847d9793937354
Hall Liu [Thu, 16 Feb 2017 01:09:34 +0000 (01:09 +0000)]
Merge "Add extra key for app-specified outgoing call timeout" into nyc-mr2-dev
Chris Tate [Thu, 16 Feb 2017 00:50:56 +0000 (00:50 +0000)]
Merge "Harden against jobscheduler client app misbehavior" into nyc-mr2-dev
Manu Cornet [Thu, 16 Feb 2017 00:37:16 +0000 (16:37 -0800)]
DO NOT MERGE - Ensuring that there are per-user last stack active times.
- This fixes an issue where the last stack active time would be clobbered
when switching between users. With the policy in the phone/stack
recents, this is fine, but with the grid recents, it no longer only
applies when out of the historical window, so it is always wrong (it
would normally be wrong if switching back from another user after the
historical time of six hours).
This CL will migrate the last stack active time to a per-user secure
setting, which will be used going forward.
[This is a manual merge of change
1913535]
Bug:
35375206
Test: On the Ryu, launch some tasks, switch users, launch more tasks, and
return to the original user
Change-Id: Idc72920240093d15f822f5d9e3ee11b12a56edae
Hall Liu [Wed, 15 Feb 2017 02:11:11 +0000 (18:11 -0800)]
Add extra key for app-specified outgoing call timeout
Bug:
34474757
Test: manual
Merged-In: I6e7e67c946205b28440a4daeeab3a002f8d6bccc
Change-Id: Ia93d68d6a01308b0b93b88977daf983a0ed3a22c
Hall Liu [Wed, 15 Feb 2017 22:35:52 +0000 (22:35 +0000)]
Merge "Add extra key for app-specified outgoing call timeout" am:
decc6c9d56 am:
2bc24e252e
am:
38f5001c10
Change-Id: I6e7e67c946205b28440a4daeeab3a002f8d6bccc
Hall Liu [Wed, 15 Feb 2017 22:30:44 +0000 (22:30 +0000)]
Merge "Add extra key for app-specified outgoing call timeout" am:
decc6c9d56
am:
2bc24e252e
Change-Id: I1912bfa8856e78f375587d94bf589ef2fd25bee8
Hall Liu [Wed, 15 Feb 2017 22:24:23 +0000 (22:24 +0000)]
Merge "Add extra key for app-specified outgoing call timeout"
am:
decc6c9d56
Change-Id: I58a70b265f4b5af735e93c9004616bd44d5c51de
Hall Liu [Wed, 15 Feb 2017 21:41:21 +0000 (21:41 +0000)]
Merge "Add extra key for app-specified outgoing call timeout"
Badhri Jagan Sridharan [Wed, 15 Feb 2017 20:27:18 +0000 (20:27 +0000)]
Merge changes from topic 'dual_role_chargers' am:
37b939a180 am:
0a3efc2622
am:
d4a847495e
Change-Id: Icadc77cb7630e61166ab3c9608f60736c24e52c1
Badhri Jagan Sridharan [Wed, 15 Feb 2017 20:20:15 +0000 (20:20 +0000)]
Merge changes from topic 'dual_role_chargers' am:
37b939a180
am:
0a3efc2622
Change-Id: I2c0ba36c46674ff7f9a0b963543e271eec93858c
Badhri Jagan Sridharan [Wed, 15 Feb 2017 20:13:53 +0000 (20:13 +0000)]
Merge changes from topic 'dual_role_chargers'
am:
37b939a180
Change-Id: I2b9eda605ae85347eb2e3e4202a6c7ec176778af
Badhri Jagan Sridharan [Wed, 15 Feb 2017 20:00:24 +0000 (20:00 +0000)]
Merge changes from topic 'dual_role_chargers'
* changes:
Introduce debounce to filter rapidly toggling type-c ports
Fix handling usb dialog for wall chargers.
Badhri Jagan Sridharan [Fri, 10 Feb 2017 03:45:21 +0000 (19:45 -0800)]
Introduce debounce to filter rapidly toggling type-c ports
Type-c ports can quickly toggle between connected/disconnected
states. Introduce debounce to prevent sending spurious notifications.
Bug:
34972898
Test: notification should not be queued for a pixel-c charger not connected
to the power outlet.
Change-Id: I4aa19f9f864fe5b77e65f6a07a3184d8aba1f5fc
Badhri Jagan Sridharan [Mon, 13 Feb 2017 21:14:40 +0000 (13:14 -0800)]
Fix handling usb dialog for wall chargers.
UsbPort.POWER_ROLE_SINK is orthogonal to the type of the charger
attached. POWER_ROLE_SINK would be the case for AC charging and
USB charging. Therefore query BatteryManager for the charger
type.
Bug:
34972898
Test: Charging notification should not show for pixel-c chargers.
Change-Id: I8dddcd7727b6af973bd173d2c6e325aa4be2ca3a
Hall Liu [Wed, 15 Feb 2017 02:11:11 +0000 (18:11 -0800)]
Add extra key for app-specified outgoing call timeout
Bug:
34474757
Test: manual
Change-Id: Ia93d68d6a01308b0b93b88977daf983a0ed3a22c
Hugo Benichi [Wed, 15 Feb 2017 01:24:29 +0000 (01:24 +0000)]
Merge "ConnectivityManager: fix potential NPE" am:
b688dd18ab am:
ab453cd565
am:
7c9cc1f9e5
Change-Id: I6f487ce9da656610c939ddc78e834ac8ef5f8135
Hugo Benichi [Wed, 15 Feb 2017 01:09:58 +0000 (01:09 +0000)]
Merge "ConnectivityManager: fix potential NPE" am:
b688dd18ab
am:
ab453cd565
Change-Id: I72e114037ce6a0ec53863749b8ffa34513c9fdce
Hugo Benichi [Wed, 15 Feb 2017 01:05:24 +0000 (01:05 +0000)]
Merge "ConnectivityManager: fix potential NPE"
am:
b688dd18ab
Change-Id: If562fc6a921569ad9d3141cac72b6f395a30da9e
Erik Kline [Wed, 15 Feb 2017 01:04:44 +0000 (01:04 +0000)]
Merge "Split chooseUpstreamType() into two separate functions" am:
7a42d3ad83 am:
f6d55d7e9e
am:
8eb1fbf1bc
Change-Id: Ia8fd663404f1d0a70243ab9c9bd853ac6d51d68f
Erik Kline [Wed, 15 Feb 2017 01:03:49 +0000 (01:03 +0000)]
Merge "Slightly simplify mTryCell and requestUpstreamMobileConnection() usage" am:
63445824d6 am:
4650762557
am:
23d077318c
Change-Id: I19f92ac6160702233832a190aeeaeff06391ce9e
Erik Kline [Wed, 15 Feb 2017 00:54:07 +0000 (00:54 +0000)]
Merge "Split chooseUpstreamType() into two separate functions" am:
7a42d3ad83
am:
f6d55d7e9e
Change-Id: Ibd6b1fae52ec31ae488484be727b5261820e6ecb
Hugo Benichi [Wed, 15 Feb 2017 00:53:44 +0000 (00:53 +0000)]
Merge "ConnectivityManager: fix potential NPE"
Erik Kline [Wed, 15 Feb 2017 00:52:57 +0000 (00:52 +0000)]
Merge "Slightly simplify mTryCell and requestUpstreamMobileConnection() usage" am:
63445824d6
am:
4650762557
Change-Id: Ie004da6fe1252ddec90204637ff17c3ed73f2923
Erik Kline [Wed, 15 Feb 2017 00:49:20 +0000 (00:49 +0000)]
Merge "Split chooseUpstreamType() into two separate functions"
am:
7a42d3ad83
Change-Id: I77649e11e74140ec985dcdadab226e3e73e67642
Erik Kline [Wed, 15 Feb 2017 00:48:24 +0000 (00:48 +0000)]
Merge "Slightly simplify mTryCell and requestUpstreamMobileConnection() usage"
am:
63445824d6
Change-Id: Ie921ee1a2f1dbdd338c9f0700b24808e1cb6435e
Erik Kline [Wed, 15 Feb 2017 00:38:50 +0000 (00:38 +0000)]
Merge "Split chooseUpstreamType() into two separate functions"
Erik Kline [Wed, 15 Feb 2017 00:38:31 +0000 (00:38 +0000)]
Merge "Slightly simplify mTryCell and requestUpstreamMobileConnection() usage"
Michael Peck [Wed, 15 Feb 2017 00:00:11 +0000 (00:00 +0000)]
Merge "Pass targetSdkVersion specifier for SELinux labeling" am:
4516240b47 am:
f8cefed995
am:
5493749d64
Change-Id: I731220c719cf29d94e11698906dfb7f049a90a55
Michael Peck [Tue, 14 Feb 2017 23:55:07 +0000 (23:55 +0000)]
Merge "Pass targetSdkVersion specifier for SELinux labeling" am:
4516240b47
am:
f8cefed995
Change-Id: Ie71368e7b4571d209d8c3a824bbf1a8c738f56a8
Michael Peck [Tue, 14 Feb 2017 23:50:17 +0000 (23:50 +0000)]
Merge "Pass targetSdkVersion specifier for SELinux labeling"
am:
4516240b47
Change-Id: Ic61c4dc30f075d01a85d8b60cfe4ae1de773aa09
Treehugger Robot [Tue, 14 Feb 2017 23:42:57 +0000 (23:42 +0000)]
Merge "Pass targetSdkVersion specifier for SELinux labeling"
Michael Kwan [Tue, 14 Feb 2017 23:00:47 +0000 (23:00 +0000)]
Merge "Fix incorrect values for VelocityTracker in SwipeDismissLayout." into cw-f-dev am:
c61cd1a635
am:
34c98becbd
Change-Id: I4030b021838853ca3064d9da01a7d89a64d1861c
Michael Kwan [Tue, 14 Feb 2017 22:57:48 +0000 (22:57 +0000)]
Merge "Fix incorrect values for VelocityTracker in SwipeDismissLayout." into cw-f-dev am:
c61cd1a635
am:
83b072c48c
Change-Id: I77b0a0a30e60658dbcf3ab0806bd0227939b8ba8
Michael Kwan [Tue, 14 Feb 2017 22:53:44 +0000 (22:53 +0000)]
Merge "Fix incorrect values for VelocityTracker in SwipeDismissLayout." into cw-f-dev
am:
c61cd1a635
Change-Id: I02c70d3be50c00927e78282c9f3635b7ed9ae197
Michael Kwan [Tue, 14 Feb 2017 22:53:41 +0000 (22:53 +0000)]
Merge "Fix incorrect values for VelocityTracker in SwipeDismissLayout." into cw-f-dev
am:
c61cd1a635
Change-Id: Ib1cff2ace082862c2a1c250170453b989f6697df
TreeHugger Robot [Tue, 14 Feb 2017 22:46:57 +0000 (22:46 +0000)]
Merge "Fix incorrect values for VelocityTracker in SwipeDismissLayout." into cw-f-dev
Etan Cohen [Fri, 10 Feb 2017 02:16:58 +0000 (18:16 -0800)]
[CM] Remove non-functional timeout from request network
Until now the request network with timeout was non-functional
(see b/
31402633). Any caller which was using the timeout getting
the request network without a timeout.
While the timeout version has now been implemented, a max
timeout value is being removed since the large number used
(100 minutes) had no rationale for existing.
Updating the code to reflect the functionality which was
actually used - without a timeout.
Bug:
31399536
Bug:
35354391
Test: unit tests and CTS of ConnectivityManager
Change-Id: I0ebf0917a4478036a5ae532dd1e0784479057eb8
Michael Kwan [Tue, 14 Feb 2017 20:04:38 +0000 (12:04 -0800)]
Fix incorrect values for VelocityTracker in SwipeDismissLayout.
The offset used to adjust MotionEvents for swipe velocity tracking
was incorrect, and caused issues when touch points where close
together. Fixed the offset used, which resolved swiping issues.
Bug:
34673753
Change-Id: Ide6060b511510bcf299e3db778e6ffc6afda5e19
Colin Cross [Tue, 14 Feb 2017 19:22:27 +0000 (19:22 +0000)]
Merge "Use asm-5.2 prebuilt" am:
6b32770d6d am:
6c1ac4dd80
am:
29fd14f9ee
Change-Id: I0b08a521058a82ca801f020bd63dc9ccb4bf3a28
Colin Cross [Tue, 14 Feb 2017 19:17:24 +0000 (19:17 +0000)]
Merge "Use asm-5.2 prebuilt" am:
6b32770d6d
am:
6c1ac4dd80
Change-Id: Icc01bcd92c5b23198bb39ff382610c72b4bf1867
Colin Cross [Tue, 14 Feb 2017 19:10:18 +0000 (19:10 +0000)]
Merge "Use asm-5.2 prebuilt"
am:
6b32770d6d
Change-Id: I7dc856be1a10ea7a65c7b3f889b37d9afaadbd5c
Colin Cross [Tue, 14 Feb 2017 19:03:45 +0000 (19:03 +0000)]
Merge "Use asm-5.2 prebuilt"
Philip P. Moltmann [Tue, 14 Feb 2017 17:43:23 +0000 (09:43 -0800)]
resolve merge conflicts of
d043a840f7f12ce2c54e7d4564a6ac9cfa24dd17 to nyc-mr2-dev-plus-aosp
Test: Clean merge
Change-Id: Ib2420ff793fdf22fd80cfaed7848ff6b8be8d382
Michael Peck [Tue, 14 Feb 2017 17:07:04 +0000 (09:07 -0800)]
Pass targetSdkVersion specifier for SELinux labeling
Motivation:
Provide the ability to phase in new security policies by
applying them to apps with a minimum targetSdkVersion
Test: Marlin builds and boots. Apps targeting targetSdkVersion<=25
run in untrusted_app_25 domain. Apps targeting the current development
build >=26 run in the untrusted_app domain with fewer permissions. No
new denials observed during testing.
Bug:
34115651
Change-Id: Ib9f6ded9bd2f426861a6d843861b4074084253b0
Orion Hodson [Tue, 14 Feb 2017 16:20:31 +0000 (16:20 +0000)]
Merge "Import CallSite classes and BootstrapMethodError class from ojdk8u60" am:
3023906b1b am:
49e0cad3e1
am:
4105747ec3
Change-Id: Id6a920af9c5f506d4e25cb05294877f9a7043aaa
Orion Hodson [Tue, 14 Feb 2017 16:14:08 +0000 (16:14 +0000)]
Merge "Import CallSite classes and BootstrapMethodError class from ojdk8u60" am:
3023906b1b
am:
49e0cad3e1
Change-Id: I16775763cb63e18d35765b807acb91fc57286b85
Orion Hodson [Tue, 14 Feb 2017 16:07:28 +0000 (16:07 +0000)]
Merge "Import CallSite classes and BootstrapMethodError class from ojdk8u60"
am:
3023906b1b
Change-Id: If332034df3b7afac1f7fdb92ca40adfb420ba768
Philip P. Moltmann [Tue, 14 Feb 2017 16:03:27 +0000 (16:03 +0000)]
Merge "[DO NOT MERGE] Revert "[DO NOT MERGE] Delay SharedPreferences.apply() by 50 ms"" into nyc-mr2-dev
Orion Hodson [Tue, 14 Feb 2017 16:02:32 +0000 (16:02 +0000)]
Merge "Import CallSite classes and BootstrapMethodError class from ojdk8u60"
Manu Cornet [Tue, 14 Feb 2017 15:30:21 +0000 (15:30 +0000)]
Merge "2D Recents: Fix a glitch during task relayout after a dismiss" into nyc-mr2-dev
am:
f47658f120
Change-Id: I664be0dd3e1f2e6cf2d7dc94613b0efcaf6887a9
TreeHugger Robot [Tue, 14 Feb 2017 15:24:42 +0000 (15:24 +0000)]
Merge "2D Recents: Fix a glitch during task relayout after a dismiss" into nyc-mr2-dev
songjinshi [Tue, 14 Feb 2017 14:39:14 +0000 (14:39 +0000)]
Merge "[NotificationManagerService]: Fixes the thread-safe issue." am:
d530d1bf18 am:
f69a73793d
am:
d0e81464bd
Change-Id: I8a2f552e3fa500f14e1912acbbbade3ea510715f
songjinshi [Tue, 14 Feb 2017 14:34:13 +0000 (14:34 +0000)]
Merge "[NotificationManagerService]: Fixes the thread-safe issue." am:
d530d1bf18
am:
f69a73793d
Change-Id: Ifcce0699f9434cf490f9b4b596ba7604208275c6
songjinshi [Tue, 14 Feb 2017 14:29:36 +0000 (14:29 +0000)]
Merge "[NotificationManagerService]: Fixes the thread-safe issue."
am:
d530d1bf18
Change-Id: I661207bb52d84b1928d7ff3ad262cfe89e71e60b
Treehugger Robot [Tue, 14 Feb 2017 14:23:18 +0000 (14:23 +0000)]
Merge "[NotificationManagerService]: Fixes the thread-safe issue."
Erik Kline [Tue, 14 Feb 2017 10:03:09 +0000 (19:03 +0900)]
Split chooseUpstreamType() into two separate functions
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Change-Id: If892864ff59a6f38340791597c2d9e5b4022bbfa
Erik Kline [Tue, 14 Feb 2017 09:26:04 +0000 (18:26 +0900)]
Slightly simplify mTryCell and requestUpstreamMobileConnection() usage
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Change-Id: I46fbd176a71e61552d7d92660c1debe6487a1edf
Erik Kline [Tue, 14 Feb 2017 09:49:56 +0000 (09:49 +0000)]
Merge "Verify duplicate upstream notifications are ignored" am:
3d57eb0bdc am:
02e71f6245
am:
8055dafb08
Change-Id: I1e10adfba2ebb9f52e86d8b35f3d0b87134c0e91
Erik Kline [Tue, 14 Feb 2017 09:45:56 +0000 (09:45 +0000)]
Merge "Verify duplicate upstream notifications are ignored" am:
3d57eb0bdc
am:
02e71f6245
Change-Id: I0e62e4f6f371aa43eae1a0e5c62787c4e84ddd9a
Erik Kline [Tue, 14 Feb 2017 09:41:53 +0000 (09:41 +0000)]
Merge "Verify duplicate upstream notifications are ignored"
am:
3d57eb0bdc
Change-Id: Iff84a1a12714047b20408f03e3bb2252a463b74b
Treehugger Robot [Tue, 14 Feb 2017 09:32:55 +0000 (09:32 +0000)]
Merge "Verify duplicate upstream notifications are ignored"
Hugo Benichi [Fri, 3 Feb 2017 05:18:44 +0000 (14:18 +0900)]
ConnectivityManager: fix potential NPE
ConnectivityManager static sCallbackHandler is referenced and directly
used in a way that is not ensuring its proper initialization.
This patch fixes this potential NPE by using getHandler() instead.
Also this patch changes sendRequestForNetwork's signature to only accept
the subtype CallbackHandler instead of Handler: without using
CallbackHandler the NetworkCallbacks are not triggered properly and
bookkeeping of sCallbacks does not happen. sendRequestForNetwork's
signature now makes this explicit.
This step prepares the addition of overloaded versions of
registerNetworkCallback and cie that takes custom Handlers.
Test: build, flashed, manually checked connectivity
Change-Id: I52e8a2cb5075e7aef7b35e30c9845cacba927d13
Erik Kline [Tue, 14 Feb 2017 06:55:00 +0000 (15:55 +0900)]
Verify duplicate upstream notifications are ignored
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest .../tethering/TetherInterfaceStateMachineTest.java passes
Bug:
32163131
Change-Id: I3c097d766fe4c416a8e3f02640809fe1199c6ef2
Erik Kline [Tue, 14 Feb 2017 06:25:47 +0000 (06:25 +0000)]
Merge "Cleanup in the face of upstream error" am:
ed6d75d5f3 am:
76e6f790db
am:
663ec79cb2
Change-Id: Ib726fe85b816eccbc0beab555873b77f3454bc64
Erik Kline [Tue, 14 Feb 2017 06:21:44 +0000 (06:21 +0000)]
Merge "Cleanup in the face of upstream error" am:
ed6d75d5f3
am:
76e6f790db
Change-Id: I097318f3edc5257288d582a0f17744e1f984856c
Erik Kline [Tue, 14 Feb 2017 06:17:38 +0000 (06:17 +0000)]
Merge "Cleanup in the face of upstream error"
am:
ed6d75d5f3
Change-Id: If8dbf882bd8c4a8d53ae026d8f83a00a52590830