OSDN Git Service
Evan Laird [Tue, 20 Jun 2017 20:07:40 +0000 (20:07 +0000)]
Merge "Fix battery percent text not updating on Font size change" into oc-dev am:
2ca91661f0
am:
2c34b5bf55
Change-Id: I95d4e069fa93ac025598a7a2954f7ed9f566fd25
Evan Laird [Tue, 20 Jun 2017 19:59:02 +0000 (19:59 +0000)]
Merge "Fix battery percent text not updating on Font size change" into oc-dev
am:
2ca91661f0
Change-Id: I26680deb22ded21d970cd213e20f6d96d7ae8cc3
Evan Laird [Tue, 20 Jun 2017 19:49:34 +0000 (19:49 +0000)]
Merge "Fix battery percent text not updating on Font size change" into oc-dev
Makoto Onuki [Tue, 20 Jun 2017 19:26:49 +0000 (19:26 +0000)]
Merge "Enhance recent sync log in dumpsys content" into oc-dr1-dev
am:
a014ce292a
Change-Id: I37135899d96cbd0eed2df224aef061d1f02857ec
Makoto Onuki [Tue, 20 Jun 2017 19:20:04 +0000 (19:20 +0000)]
Merge "Enhance recent sync log in dumpsys content" into oc-dr1-dev
Android Build Merger (Role) [Tue, 20 Jun 2017 18:51:50 +0000 (18:51 +0000)]
Merge "Merge "remove the lock-use for prunePrintService in case blocking main thread" into oc-dev am:
c06746ce46 -s ours am:
e4e1c11e8b -s ours" into oc-dr1-dev-plus-aosp
Philip P. Moltmann [Tue, 20 Jun 2017 18:50:52 +0000 (18:50 +0000)]
Merge "remove the lock-use for prunePrintService in case blocking main thread" into oc-dev am:
c06746ce46 -s ours
am:
e4e1c11e8b -s ours
Change-Id: Ie6d9ac84561fe2ad04d84fac3938aa827655f707
Philip P. Moltmann [Tue, 20 Jun 2017 18:49:15 +0000 (18:49 +0000)]
Merge "remove the lock-use for prunePrintService in case blocking main thread" into oc-dev am:
c06746ce46
am:
ee7f5887d0 -s ours
Change-Id: I1a833a4e3c0b4ff0d420d5b4b8b7a421ea353930
Philip P. Moltmann [Tue, 20 Jun 2017 18:42:03 +0000 (18:42 +0000)]
Merge "remove the lock-use for prunePrintService in case blocking main thread" into oc-dev
am:
c06746ce46
Change-Id: I0ac3d9bf7af40f672f7ae482318c375041b28d12
Philip P. Moltmann [Tue, 20 Jun 2017 18:41:53 +0000 (18:41 +0000)]
Merge "remove the lock-use for prunePrintService in case blocking main thread" into oc-dev
am:
c06746ce46 -s ours
Change-Id: Ide56fc37ebe8e06c6914e8212b232876d535f716
Android Build Merger (Role) [Tue, 20 Jun 2017 18:29:21 +0000 (18:29 +0000)]
Merge "Merge "Look on all displays if can't launch on a source secondary one" into oc-dev am:
d883070267 am:
842ca2b085" into oc-dr1-dev-plus-aosp
Philip P. Moltmann [Tue, 20 Jun 2017 18:28:03 +0000 (18:28 +0000)]
Merge "remove the lock-use for prunePrintService in case blocking main thread" into oc-dev
Andrii Kulian [Tue, 20 Jun 2017 18:24:49 +0000 (18:24 +0000)]
Merge "Look on all displays if can't launch on a source secondary one" into oc-dev am:
d883070267
am:
ac371d0550
Change-Id: I05d53efa1e5d1d92a9726ad13f539692974043c4
Andrii Kulian [Tue, 20 Jun 2017 18:22:52 +0000 (18:22 +0000)]
Merge "Look on all displays if can't launch on a source secondary one" into oc-dev am:
d883070267
am:
842ca2b085
Change-Id: Id4a0da66a7793ada499b41b0816e25b8aaabdbcd
Andrii Kulian [Tue, 20 Jun 2017 18:14:22 +0000 (18:14 +0000)]
Merge "Look on all displays if can't launch on a source secondary one" into oc-dev
am:
d883070267
Change-Id: I4129187f5ac00a08f5b0bb6fdf62a9703c861bd9
Andrii Kulian [Tue, 20 Jun 2017 18:11:02 +0000 (18:11 +0000)]
Merge "Look on all displays if can't launch on a source secondary one" into oc-dev
am:
d883070267
Change-Id: I92bd1ad211fb97bf27fe34a8d1fe4c57c6c46d89
Andrii Kulian [Tue, 20 Jun 2017 18:01:14 +0000 (18:01 +0000)]
Merge "Look on all displays if can't launch on a source secondary one" into oc-dev
Jason Monk [Tue, 20 Jun 2017 17:55:30 +0000 (17:55 +0000)]
Merge "Fix QS wifi accessibility announcements" into oc-dev am:
accdadae9d
am:
314d815415
Change-Id: Ic81f2fc792ab71425cb3299d1c0c69bac7bc6e9b
Jason Monk [Tue, 20 Jun 2017 17:49:59 +0000 (17:49 +0000)]
Merge "Fix QS wifi accessibility announcements" into oc-dev am:
accdadae9d
am:
3602f32fce
Change-Id: I30c243c2c8143d1db3cb8b02817f211a26344bcd
Jason Monk [Tue, 20 Jun 2017 17:46:52 +0000 (17:46 +0000)]
Merge "Fix QS wifi accessibility announcements" into oc-dev
am:
accdadae9d
Change-Id: I9ffba74a945475525a60226ba4c106af9ca99579
Jason Monk [Tue, 20 Jun 2017 17:42:30 +0000 (17:42 +0000)]
Merge "Fix QS wifi accessibility announcements" into oc-dev
am:
accdadae9d
Change-Id: I3eca1aa3f0fac1067ed25cf74ad0b2301ee146bc
Daniel Sandler [Tue, 20 Jun 2017 17:33:58 +0000 (17:33 +0000)]
Merge "Log screenshot exceptions." into oc-dr1-dev
am:
346f760280
Change-Id: Ib7d97e5186714fd3b0cc41c451542a5286d3bb0e
Jason Monk [Tue, 20 Jun 2017 17:32:26 +0000 (17:32 +0000)]
Merge "Fix QS wifi accessibility announcements" into oc-dev
Daniel Sandler [Tue, 20 Jun 2017 17:25:11 +0000 (17:25 +0000)]
Merge "Log screenshot exceptions." into oc-dr1-dev
Jason Monk [Tue, 20 Jun 2017 17:16:05 +0000 (13:16 -0400)]
Fix QS wifi accessibility announcements
The state was being inverted in events to try to get clicks correct,
but events can occur at other times, so really we want to invert
the state between when the click happens and when the next state
change occurs. Also add a toString to fix equals checks on the content
description to make the announcements less noisy.
Test: manual
Change-Id: Ie4159664e9a81fd1719dbf7c06fba5e7b827cc6d
Fixes:
62679498
Makoto Onuki [Fri, 9 Jun 2017 00:12:05 +0000 (17:12 -0700)]
Enhance recent sync log in dumpsys content
- Add "Per Adapter History" section that has recent activities per adapter. Example:
mxxxx@gmail.com/com.google u0 [com.android.calendar]
2017-06-19 14:19:07 success Source=LOCAL Elapsed=0s Reason=10014 Extras=[upload=true ]
2017-06-19 14:19:06 success Source=SERVER Elapsed=16s Reason=10014 Extras=[feed=#contacts@group.v.calendar.google.com ]
mxxxx@gmail.com/com.google u0 [com.android.chrome]
2017-06-19 13:26:25 canceled Source=POLL Elapsed=0s Reason=AccountsUpdated Extras=[initialize=true ]
mxxxx@gmail.com/com.google u0 [com.android.contacts]
- Improve pending/periodic syncs with better formatting, and sort them in a sane order.
Bug:
38498544
Bug:
62391411
Test: manual test with "dumpsys content"
Change-Id: I947a9255230f27a7f438d648da324787fdf16f55
Andreas Huber [Tue, 20 Jun 2017 17:12:35 +0000 (17:12 +0000)]
Merge "Add an extra level of indirection to make sure that native IHwBinder" into oc-dr1-dev
am:
38028ec63a
Change-Id: I8e4fb176e45b10579aceddbfc75ddac3382fae90
Andreas Huber [Tue, 20 Jun 2017 17:05:23 +0000 (17:05 +0000)]
Merge "Add an extra level of indirection to make sure that native IHwBinder" into oc-dr1-dev
Lucas Dupin [Tue, 20 Jun 2017 17:00:02 +0000 (17:00 +0000)]
Merge "Separate theme breakpoints" into oc-dr1-dev
am:
52e6e12ad6
Change-Id: Ic6847e9c0dcca85da8c8ff9a4b628d094ed04e1e
TreeHugger Robot [Tue, 20 Jun 2017 16:51:38 +0000 (16:51 +0000)]
Merge "Separate theme breakpoints" into oc-dr1-dev
Jonathan Solnit [Tue, 20 Jun 2017 16:29:02 +0000 (16:29 +0000)]
Merge "Check for keyguard occlusion on camera lift" into oc-dr1-dev
am:
e07567cc0b
Change-Id: I75f221c9fe2d869e269b2ff375456041c973166b
Jonathan Solnit [Tue, 20 Jun 2017 16:24:23 +0000 (16:24 +0000)]
Merge "Check for keyguard occlusion on camera lift" into oc-dr1-dev
Android Build Merger (Role) [Tue, 20 Jun 2017 15:57:55 +0000 (15:57 +0000)]
Merge "Merge "Correct lastId on onCreate with unexpected state" into oc-dev am:
aed0c10d52 am:
d1942b3abe" into oc-dr1-dev-plus-aosp
Philip P. Moltmann [Tue, 20 Jun 2017 15:55:53 +0000 (15:55 +0000)]
Merge "Correct lastId on onCreate with unexpected state" into oc-dev am:
aed0c10d52
am:
d1942b3abe
Change-Id: Icc42f18a220848b58cbe0035e726fdbb53df58e0
Philip P. Moltmann [Tue, 20 Jun 2017 15:55:46 +0000 (15:55 +0000)]
Merge "Correct lastId on onCreate with unexpected state" into oc-dev am:
aed0c10d52
am:
fd5c4dd477
Change-Id: Iae8f67a95e708d53a57c0e5f443c7387670e5721
Philip P. Moltmann [Tue, 20 Jun 2017 15:48:54 +0000 (15:48 +0000)]
Merge "Correct lastId on onCreate with unexpected state" into oc-dev
am:
aed0c10d52
Change-Id: I2197920ee7d6483276473129e74fd9527162dc0a
Philip P. Moltmann [Tue, 20 Jun 2017 15:48:50 +0000 (15:48 +0000)]
Merge "Correct lastId on onCreate with unexpected state" into oc-dev
am:
aed0c10d52
Change-Id: I821aba22236152a8a0230a0db7a3710ad7731d12
Philip P. Moltmann [Tue, 20 Jun 2017 15:42:13 +0000 (15:42 +0000)]
Merge "Correct lastId on onCreate with unexpected state" into oc-dev
Paul Duffin [Tue, 20 Jun 2017 15:14:22 +0000 (15:14 +0000)]
Merge "Remove unused a.t.InstrumentationCoreTestRunner" am:
1bfccadc81 am:
dfc6939ed5
am:
b3be07bc77
Change-Id: I12a6133de7ec7101327424854cf7a46debe3362d
Neil Fuller [Tue, 20 Jun 2017 15:10:58 +0000 (15:10 +0000)]
Merge "Track TimeZoneDistroInstaller method changes" am:
ba6b96d978 am:
7ab9d93fa4
am:
7f5e9bd68c
Change-Id: Ieabd84430c0b28039184406fa4a26e5b55273dda
Paul Duffin [Tue, 20 Jun 2017 15:05:46 +0000 (15:05 +0000)]
Merge "Remove unused a.t.InstrumentationCoreTestRunner" am:
1bfccadc81
am:
dfc6939ed5
Change-Id: I5ccdb58bbcde73a33bdce9b65d95aad2bf7b931f
Erik Kline [Tue, 20 Jun 2017 15:05:23 +0000 (15:05 +0000)]
resolve merge conflicts of
9e6b6e2a58d4 to oc-dev-plus-aosp
am:
b912c50b19
Change-Id: I973bdc5b540cce66a9713cebfd5071ad4a4b0a08
Neil Fuller [Tue, 20 Jun 2017 15:02:37 +0000 (15:02 +0000)]
Merge "Track TimeZoneDistroInstaller method changes" am:
ba6b96d978
am:
7ab9d93fa4
Change-Id: I0388475b92a6b4f981d5027992af461f48181ab2
Paul Duffin [Tue, 20 Jun 2017 14:54:46 +0000 (14:54 +0000)]
Merge "Remove unused a.t.InstrumentationCoreTestRunner"
am:
1bfccadc81
Change-Id: Id624c17f7d5da6fa81cfac9a21726042b793c270
Treehugger Robot [Tue, 20 Jun 2017 14:44:57 +0000 (14:44 +0000)]
Merge "Remove unused a.t.InstrumentationCoreTestRunner"
Paul Duffin [Tue, 20 Jun 2017 10:05:25 +0000 (11:05 +0100)]
Remove unused a.t.InstrumentationCoreTestRunner
The only usage of this was in the unused
cts/tests/vm-tests-tf/AndroidManifest.xml which was deleted in
https://android-review.googlesource.com/#/c/418900/.
Bug:
30188076
Test: make checkbuild
Change-Id: I96f3586a7017f4cd14fa31207e0fff19c92f0de4
Erik Kline [Tue, 20 Jun 2017 12:18:31 +0000 (21:18 +0900)]
resolve merge conflicts of
9e6b6e2a58d4 to oc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I2104ecf8102c8f9541ee2d3ce6589b0081db4fe3
Neil Fuller [Tue, 20 Jun 2017 12:12:11 +0000 (12:12 +0000)]
Merge "Track TimeZoneDistroInstaller method changes"
am:
ba6b96d978
Change-Id: I9352872ceb2d11739a4372589f69bb473f3457d3
Treehugger Robot [Tue, 20 Jun 2017 12:06:29 +0000 (12:06 +0000)]
Merge "Track TimeZoneDistroInstaller method changes"
Erik Kline [Tue, 20 Jun 2017 11:12:00 +0000 (11:12 +0000)]
Merge "Create a TetherInterfaceStateMachine when told the interface name."
am:
51ee00785c
Change-Id: If79a096375e6b9665d5ba4aa0bcd9dbec6a8adab
Erik Kline [Tue, 20 Jun 2017 11:01:13 +0000 (11:01 +0000)]
Merge "Create a TetherInterfaceStateMachine when told the interface name."
Hugo Benichi [Tue, 20 Jun 2017 08:53:53 +0000 (08:53 +0000)]
resolve merge conflicts of
48bc4c1f420d to stage-aosp-master am:
ca0c91b9f1
am:
a111068342 -s ours
Change-Id: I018561953dbf2290522b11e09aa3ab04cd9df814
Hugo Benichi [Tue, 20 Jun 2017 08:45:56 +0000 (08:45 +0000)]
Merge changes I4d2be5d9,I34706201 into oc-dr1-dev
am:
c649a9978a -s ours
Change-Id: I576c2ff37bcf2885f0b126b9d66a3d3d23974146
Hugo Benichi [Tue, 20 Jun 2017 08:38:27 +0000 (08:38 +0000)]
Merge changes I4d2be5d9,I34706201 into oc-dr1-dev
* changes:
Better errors from unregisterNetworkCallback
CaptivePortalLogin correctly unregisters callbacks
Erik Kline [Tue, 20 Jun 2017 08:18:27 +0000 (17:18 +0900)]
Create a TetherInterfaceStateMachine when told the interface name.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Bug:
62343300
Change-Id: I93f3bdcf20dc4f03cd621d7ab6066344642550e3
Hugo Benichi [Tue, 20 Jun 2017 07:18:25 +0000 (07:18 +0000)]
resolve merge conflicts of
48bc4c1f420d to stage-aosp-master
am:
ca0c91b9f1
Change-Id: I941327a914d4a44e63a5f57fc0aa98d778fef949
Hugo Benichi [Tue, 20 Jun 2017 07:02:33 +0000 (16:02 +0900)]
resolve merge conflicts of
48bc4c1f420d to stage-aosp-master
Change-Id: I41889b0497463e8a63cf2d1e983e7e54298c5c2e
Erik Kline [Tue, 20 Jun 2017 06:10:43 +0000 (06:10 +0000)]
Merge "Make interface IP serving code set LinkProperties" into oc-dr1-dev
am:
e20bfea3d7 -s ours
Change-Id: I22b127879df9469fd63140d3b4466e859028eac0
TreeHugger Robot [Tue, 20 Jun 2017 06:06:07 +0000 (06:06 +0000)]
Merge "Make interface IP serving code set LinkProperties" into oc-dr1-dev
Hugo Benichi [Tue, 20 Jun 2017 05:26:40 +0000 (05:26 +0000)]
Merge "Better errors from unregisterNetworkCallback" am:
04e89ad631 am:
ca6ebb0f39
am:
6531ea25cd
Change-Id: Ia959388c875c22e56f5f2867f33a7329ce4b3535
Hugo Benichi [Tue, 20 Jun 2017 05:19:46 +0000 (05:19 +0000)]
Merge "Better errors from unregisterNetworkCallback" am:
04e89ad631
am:
ca6ebb0f39
Change-Id: Ib380ee7c3fc85db353682ee7abfe97842eaeeb29
Hugo Benichi [Tue, 20 Jun 2017 05:12:39 +0000 (05:12 +0000)]
Merge "Better errors from unregisterNetworkCallback"
am:
04e89ad631
Change-Id: Icbd68ff14db55c6546c7de6353774a3622b32f9e
Hugo Benichi [Tue, 20 Jun 2017 05:04:01 +0000 (05:04 +0000)]
Merge "CaptivePortalLogin correctly unregisters callbacks"
Hugo Benichi [Tue, 20 Jun 2017 05:03:22 +0000 (05:03 +0000)]
Merge "Better errors from unregisterNetworkCallback"
Hugo Benichi [Tue, 20 Jun 2017 04:55:19 +0000 (04:55 +0000)]
Merge "DO NOT MERGE Instrument captive portal login activity" am:
778ade9073 -s ours am:
5da98a422d -s ours
am:
e3efe5d054 -s ours
Change-Id: I39e5302384530e81675560f81a8c41ee7325bbc3
Hugo Benichi [Tue, 20 Jun 2017 04:49:06 +0000 (04:49 +0000)]
Merge "DO NOT MERGE Instrument captive portal login activity" am:
778ade9073 -s ours
am:
5da98a422d -s ours
Change-Id: Iffdc9cae102d54672d55274a8cad582b3b6d5f6a
Android Build Merger (Role) [Tue, 20 Jun 2017 04:39:28 +0000 (04:39 +0000)]
Merge "Merge "Hack around b/
36066697." into oc-dev am:
e139434e3a am:
8effb089ed" into oc-dr1-dev-plus-aosp
Josh Gao [Tue, 20 Jun 2017 04:38:38 +0000 (04:38 +0000)]
Merge "Hack around b/
36066697." into oc-dev am:
e139434e3a
am:
8effb089ed
Change-Id: I12e0f907251c9624ea630c0ce72b42f1a4b45438
Josh Gao [Tue, 20 Jun 2017 04:36:03 +0000 (04:36 +0000)]
Merge "Hack around b/
36066697." into oc-dev am:
e139434e3a
am:
17d3fc2e68
Change-Id: I341c785941c3860344aa053670db8f4a5da18dd6
Josh Gao [Tue, 20 Jun 2017 04:31:40 +0000 (04:31 +0000)]
Merge "Hack around b/
36066697." into oc-dev
am:
e139434e3a
Change-Id: I97427d86074cea38ca6aa59264e98a5d81645830
Josh Gao [Tue, 20 Jun 2017 04:30:07 +0000 (04:30 +0000)]
Merge "Hack around b/
36066697." into oc-dev
am:
e139434e3a
Change-Id: I422d2b73fc854047d1293919c25f0656df0842c9
TreeHugger Robot [Tue, 20 Jun 2017 04:24:08 +0000 (04:24 +0000)]
Merge "Hack around b/
36066697." into oc-dev
Erik Kline [Mon, 12 Jun 2017 09:20:08 +0000 (18:20 +0900)]
Make interface IP serving code set LinkProperties
Additionally, clean up awkward IPv6TetheringInterfaceServices
instantiation mechanics. In future, this class will be absorbed
by TetherInterfaceStateMachine (prior to its renaming to IpServer).
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
29337859
Bug:
32163131
Merged-In: I8b15edbf04c10cd9429da079c6b79352a6740b3b
Merged-In: I39a1744a7fa9b91e3b607429c79f39578e9bde19
Merged-In: I753ab701f2109c0972816724e73119dc1dbc4dca
Change-Id: Ib620e3df182f9f8e2c019aae1cd8981eb0b29376
(cherry picked from commit
dd4d5820344205085c19dc142aec252ea9ac220b)
Android Build Merger (Role) [Tue, 20 Jun 2017 01:56:53 +0000 (01:56 +0000)]
Merge "Merge "Remove legacy advertiser from map after it's no longer used" into oc-dev am:
271e0aa02a am:
50bad313e4" into oc-dr1-dev-plus-aosp
Jakub Pawlowski [Tue, 20 Jun 2017 01:54:51 +0000 (01:54 +0000)]
Merge "Remove legacy advertiser from map after it's no longer used" into oc-dev am:
271e0aa02a
am:
4d813757c7
Change-Id: I1e9b8c713440aee1f4154554a9eb53665b7dab19
Jakub Pawlowski [Tue, 20 Jun 2017 01:54:51 +0000 (01:54 +0000)]
Merge "Remove legacy advertiser from map after it's no longer used" into oc-dev am:
271e0aa02a
am:
50bad313e4
Change-Id: I71c4dae7d7955a8676cec1d669dc2375fdcc03a0
Jakub Pawlowski [Tue, 20 Jun 2017 01:47:01 +0000 (01:47 +0000)]
Merge "Remove legacy advertiser from map after it's no longer used" into oc-dev
am:
271e0aa02a
Change-Id: I9e8645c808d1b1cbee242e8a953be93fbf71e4e1
Jakub Pawlowski [Tue, 20 Jun 2017 01:46:56 +0000 (01:46 +0000)]
Merge "Remove legacy advertiser from map after it's no longer used" into oc-dev
am:
271e0aa02a
Change-Id: Idddaa69cc89caaebcee0be1d4d27e28e2fd8ea51
TreeHugger Robot [Tue, 20 Jun 2017 01:38:36 +0000 (01:38 +0000)]
Merge "Remove legacy advertiser from map after it's no longer used" into oc-dev
Adam Lesinski [Tue, 20 Jun 2017 01:22:35 +0000 (01:22 +0000)]
Merge "Fix potential race in Theme creation" into oc-dev am:
b0a5fd0384
am:
cfedad3c2f
Change-Id: I109d983b5fbcbbb7433ffc6cb00770211b25bbd1
Adam Lesinski [Tue, 20 Jun 2017 01:17:49 +0000 (01:17 +0000)]
Merge "Fix potential race in Theme creation" into oc-dev am:
b0a5fd0384
am:
185285592f
Change-Id: I080662459cbf6eeca9c4d6e4e80459efcbf83258
Adam Lesinski [Tue, 20 Jun 2017 01:11:20 +0000 (01:11 +0000)]
Merge "Fix potential race in Theme creation" into oc-dev
am:
b0a5fd0384
Change-Id: I9044d46d68f7fcb471f584d75225137c3b6f171b
Adam Lesinski [Tue, 20 Jun 2017 01:11:19 +0000 (01:11 +0000)]
Merge "Fix potential race in Theme creation" into oc-dev
am:
b0a5fd0384
Change-Id: I964d23b0daad2326989ece5f8ffc086b6286cb44
Antony Sargent [Tue, 20 Jun 2017 01:07:31 +0000 (01:07 +0000)]
Merge "BT device renaming: move edit icon and add metrics proto" into oc-dr1-dev
am:
a4c07d7c09
Change-Id: I5d2cb4923bc6b3e9bdcfbab0e7d4b55d9e312f32
Adam Lesinski [Tue, 20 Jun 2017 01:07:06 +0000 (01:07 +0000)]
Merge "Fix potential race in Theme creation" into oc-dev
Hugo Benichi [Sat, 17 Jun 2017 04:14:12 +0000 (13:14 +0900)]
Better errors from unregisterNetworkCallback
This patch changes the validation of unregisterNetworkCallback in
ConnectivityManager so that the caller can better distinguish the case
of a callback that was never registered from the case of a callback that
has already been unregistered.
Bug:
62497809
Test: runtest frameworks-net passes
Merged-In: I58eda22725dd4e67dc4b64207e38cf482032df10
(cherry picked from commit
605b295011be74c786a2eef586d31ccb07160422)
Change-Id: I4d2be5d9037cfec03218b702d707f50808ee0694
Hugo Benichi [Sat, 17 Jun 2017 03:47:33 +0000 (12:47 +0900)]
CaptivePortalLogin correctly unregisters callbacks
The NetworkCallback registered by the CaptivePortalLogin activity in
onCreate was unregistered in both onDestroy() and done(). In addition
done() can be called concurrently from different places (from the
webview, from the captive portal test probe, from the activity menu),
resulting in incorrectly unregistering the callback more than once.
This patch fixes the lifecycle management of the NetworkCallback
registered by the CaptivePortalLogin activity so that it is unregistered
once only in onDestroy.
In addition the done() method is made robust against multiple calls and
becomes a no-op after the first call. This avoids multiple calls
to CaptivePortal for the same captive portal.
Bug:
62497809
Test: tested manually with captive portal setup in the office
Merged-In: I77fbeb55cf91d3b44e91d2fecb800dae40279652
(cherry pick from commit
31c176d91068934f5b79125afa3b5ce0f44dbe8f)
Change-Id: I34706201395ed5ddba11d12cc75c357e371d1920
TreeHugger Robot [Tue, 20 Jun 2017 01:00:16 +0000 (01:00 +0000)]
Merge "BT device renaming: move edit icon and add metrics proto" into oc-dr1-dev
Hugo Benichi [Tue, 20 Jun 2017 00:54:48 +0000 (00:54 +0000)]
Merge "DO NOT MERGE Instrument captive portal login activity"
am:
778ade9073 -s ours
Change-Id: Ie493a705d3c60958037b0128195ee4ac85329d8b
Hugo Benichi [Tue, 20 Jun 2017 00:47:55 +0000 (00:47 +0000)]
Merge "DO NOT MERGE Instrument captive portal login activity"
Android Build Merger (Role) [Tue, 20 Jun 2017 00:42:46 +0000 (00:42 +0000)]
Merge "Merge "Fixed updateAutofillValue() when mText is not set." into oc-dev am:
4eaba84065 am:
51ed7f4e6b" into oc-dr1-dev-plus-aosp
Felipe Leme [Tue, 20 Jun 2017 00:41:56 +0000 (00:41 +0000)]
Merge "Fixed updateAutofillValue() when mText is not set." into oc-dev am:
4eaba84065
am:
51ed7f4e6b
Change-Id: Ia73ca585d85b071d77b1cd6efe31d1fcf8ce5381
Felipe Leme [Tue, 20 Jun 2017 00:40:26 +0000 (00:40 +0000)]
Merge "Fixed updateAutofillValue() when mText is not set." into oc-dev am:
4eaba84065
am:
b7e80c9350
Change-Id: Ib6724e4d13dc9a0e29605513addd7c2f1591c3cc
Felipe Leme [Tue, 20 Jun 2017 00:36:12 +0000 (00:36 +0000)]
Merge "Fixed updateAutofillValue() when mText is not set." into oc-dev
am:
4eaba84065
Change-Id: I7603a791f8c149799a0adf9e0fe735483ce1be1a
Felipe Leme [Tue, 20 Jun 2017 00:34:31 +0000 (00:34 +0000)]
Merge "Fixed updateAutofillValue() when mText is not set." into oc-dev
am:
4eaba84065
Change-Id: Ia00eb87f13de85ee652aa5cbab290dd98d817399
Lucas Dupin [Tue, 13 Jun 2017 20:48:09 +0000 (13:48 -0700)]
Separate theme breakpoints
Separating dark sysui theme from dark
colors on lock screen since they should
be independent.
Bug:
62346335
Test: manual
Change-Id: I1e2ddc8b80f838bcac1647b7c5ac2d5ba50765e3
TreeHugger Robot [Tue, 20 Jun 2017 00:27:32 +0000 (00:27 +0000)]
Merge "Fixed updateAutofillValue() when mText is not set." into oc-dev
Android Build Merger (Role) [Tue, 20 Jun 2017 00:15:17 +0000 (00:15 +0000)]
Merge "Merge "Fix issue #
62787070: restart due to NPE in JobServiceContext..." into oc-dev am:
fa791d5e97 am:
3049791af6" into oc-dr1-dev-plus-aosp
Dianne Hackborn [Tue, 20 Jun 2017 00:13:15 +0000 (00:13 +0000)]
Merge "Fix issue #
62787070: restart due to NPE in JobServiceContext..." into oc-dev am:
fa791d5e97
am:
93ae16db0f
Change-Id: Iee3991ada4a776ce2f63853e3da49f5c712f06c3
Dianne Hackborn [Tue, 20 Jun 2017 00:13:03 +0000 (00:13 +0000)]
Merge "Fix issue #
62787070: restart due to NPE in JobServiceContext..." into oc-dev am:
fa791d5e97
am:
3049791af6
Change-Id: I365ad8998a11579b50f4a6b6b1ec3ec5f2e416d1
OSDN Git Service
