OSDN Git Service
Jorim Jaggi [Thu, 18 May 2017 22:47:12 +0000 (22:47 +0000)]
Merge "Fix ordering of notifying dismiss callback" into oc-dev am:
e85f8eb0ca
am:
a55a662600
Change-Id: Ic24eaca241ddc2c84395a1d2bdaf6dd554b0e55b
Jorim Jaggi [Thu, 18 May 2017 22:39:08 +0000 (22:39 +0000)]
Merge "Fix ordering of notifying dismiss callback" into oc-dev
am:
e85f8eb0ca
Change-Id: Ia851bbedb5fc429ea05eb0b1eaa5cbcddec7b961
Jorim Jaggi [Thu, 18 May 2017 22:25:46 +0000 (22:25 +0000)]
Merge "Fix ordering of notifying dismiss callback" into oc-dev
Stan Iliev [Thu, 18 May 2017 22:11:41 +0000 (22:11 +0000)]
Merge "Fix a crash in Canvas.drawBitmap if empty dest rect is passed"
Calin Juravle [Thu, 18 May 2017 21:42:45 +0000 (21:42 +0000)]
Merge "Also pin vdex file for camera" am:
d4ae914be2 am:
a433a9d9f4 am:
d7a40aced2
am:
d2eb85f5c8
Change-Id: Ia6fa6e66c9d104cc6b274f885e8d2a5ff8d0e721
Calin Juravle [Thu, 18 May 2017 21:29:46 +0000 (21:29 +0000)]
Merge "Also pin vdex file for camera" am:
d4ae914be2 am:
a433a9d9f4
am:
d7a40aced2
Change-Id: I682843c8b76fc7249d6210aad2b344e463c8966a
Calin Juravle [Thu, 18 May 2017 21:21:11 +0000 (21:21 +0000)]
Merge "Also pin vdex file for camera" am:
d4ae914be2
am:
a433a9d9f4
Change-Id: I943815b1e8b29734224d49140a667bf4d7d23b8f
Calin Juravle [Thu, 18 May 2017 21:12:05 +0000 (21:12 +0000)]
Merge "Also pin vdex file for camera"
am:
d4ae914be2
Change-Id: I0d1a687ea2d90e968fe4e9705de223dc8b181238
Calin Juravle [Thu, 18 May 2017 21:03:48 +0000 (21:03 +0000)]
Merge "Also pin vdex file for camera"
Bill Yi [Thu, 18 May 2017 20:26:57 +0000 (20:26 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
a239ed1c79 -s ours
am:
cfb3693fd8 -s ours
Change-Id: I6442efdc972861973d0330774b2f04503dc1c2e6
Bill Yi [Thu, 18 May 2017 20:18:53 +0000 (20:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
a239ed1c79 -s ours
Change-Id: Ic6c5ebc4242cdf2033a0fd272b842de1f482b396
TreeHugger Robot [Thu, 18 May 2017 20:10:29 +0000 (20:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Todd Kennedy [Thu, 18 May 2017 19:54:38 +0000 (19:54 +0000)]
Merge "don't dex when installing an instant app" into oc-dev am:
d5f3bd46a1
am:
ec7cd6dbbe
Change-Id: I70a7876ea219ab9e8503be9dcb4ff7349a3941eb
Todd Kennedy [Thu, 18 May 2017 19:51:53 +0000 (19:51 +0000)]
Merge "Filter package related info" into oc-dev am:
72b7b1f001
am:
36482247ea
Change-Id: I8b5a7d1c08e7d6f822347aaed2b15e4e270d0a49
Yipeng Cao [Thu, 18 May 2017 19:45:29 +0000 (19:45 +0000)]
Merge "Change currentTimeMillis to elapsedRealtime" into oc-dev am:
b42205ee9e
am:
ad17fd8fda -s ours
Change-Id: I1481aed438cc531a304acad6e50893ba74c67a35
Todd Kennedy [Thu, 18 May 2017 19:45:12 +0000 (19:45 +0000)]
Merge "don't dex when installing an instant app" into oc-dev
am:
d5f3bd46a1
Change-Id: Ia27a62acce14f8dbce07ceef942f0059ed8875cc
Todd Kennedy [Thu, 18 May 2017 19:42:52 +0000 (19:42 +0000)]
Merge "Filter package related info" into oc-dev
am:
72b7b1f001
Change-Id: Iaf388732140d5e3d134c9a60db459410ad6a944c
Roozbeh Pournader [Thu, 18 May 2017 19:42:51 +0000 (19:42 +0000)]
Merge "In onDragEvent(), don't assume text is Spannable" into oc-dev am:
99e620ef32
am:
c9affff74c
Change-Id: I3501e9a7174b5e1ab8a9486710de515a605f5eb7
Stan Iliev [Thu, 18 May 2017 18:21:23 +0000 (14:21 -0400)]
Fix a crash in Canvas.drawBitmap if empty dest rect is passed
Fix a crash in Canvas.drawBitmap if an empty dest or source rect
is passed. This issue is specific to Skia pipeline only.
Test: Ran hwui unit tests and verified nexuslauncher is not
crashing anymore.
Change-Id: I3f9f96d03541e960d463836200d2b01269b5e008
Todd Kennedy [Thu, 18 May 2017 19:36:11 +0000 (19:36 +0000)]
Merge "don't dex when installing an instant app" into oc-dev
TreeHugger Robot [Thu, 18 May 2017 19:34:58 +0000 (19:34 +0000)]
Merge "Filter package related info" into oc-dev
Yipeng Cao [Thu, 18 May 2017 19:34:29 +0000 (19:34 +0000)]
Merge "Change currentTimeMillis to elapsedRealtime" into oc-dev
am:
b42205ee9e
Change-Id: I479deb4dc114f2f169994501230a882377f1453e
Roozbeh Pournader [Thu, 18 May 2017 19:32:02 +0000 (19:32 +0000)]
Merge "In onDragEvent(), don't assume text is Spannable" into oc-dev
am:
99e620ef32
Change-Id: I5431864f75241c9f8b33064981ea332e7bef823b
Jean-Michel Trivi [Thu, 18 May 2017 19:31:49 +0000 (19:31 +0000)]
Merge "Audio focus: start players in ducked state when focus is already lost" into oc-dev am:
f8592a0d8b
am:
1c8334078d
Change-Id: I0fb19d951752a7010c0b00f93d4510e44ad740be
TreeHugger Robot [Thu, 18 May 2017 19:25:53 +0000 (19:25 +0000)]
Merge "Change currentTimeMillis to elapsedRealtime" into oc-dev
Jean-Michel Trivi [Thu, 18 May 2017 19:22:07 +0000 (19:22 +0000)]
Merge "Audio focus: start players in ducked state when focus is already lost" into oc-dev
am:
f8592a0d8b
Change-Id: Ia3a9606035b834d7e90d651cf8c473c0e0394b06
TreeHugger Robot [Thu, 18 May 2017 19:21:46 +0000 (19:21 +0000)]
Merge "In onDragEvent(), don't assume text is Spannable" into oc-dev
Jean-Michel Trivi [Thu, 18 May 2017 19:06:38 +0000 (19:06 +0000)]
Merge "Audio focus: start players in ducked state when focus is already lost" into oc-dev
Sudheer Shanka [Thu, 18 May 2017 18:06:56 +0000 (18:06 +0000)]
Merge "More unit tests for classes needed in reading uid times per cpu freq." into oc-dev am:
aff7c3c71e
am:
1768a0054d
Change-Id: Ic22cc9e7289479e8e7df8db961b240db93721a15
Dianne Hackborn [Thu, 18 May 2017 18:04:17 +0000 (18:04 +0000)]
Merge "Work on issue #
36891897: Need to ensure foreground services..." into oc-dev am:
e4f484915f
am:
4d208f2ec6
Change-Id: Idc57b2a5953b0525d7c51999bcefdba868c68e16
Todd Kennedy [Thu, 18 May 2017 17:58:29 +0000 (17:58 +0000)]
Merge "Add action to launch intent" into oc-dev am:
ed57e46089
am:
61bfa28b97
Change-Id: I5ca06a8da6aa5ded02670736dacdb1e4c39a6169
Adam Lesinski [Thu, 18 May 2017 17:56:15 +0000 (17:56 +0000)]
Merge "AAPT2: Ignore trailing data after IEND chunk in PNG" into oc-dev am:
2d885e942d
am:
0196460f27
Change-Id: I8bff9b440b5a1f75d75e3601b654aa8825cf9523
Sudheer Shanka [Thu, 18 May 2017 17:53:28 +0000 (17:53 +0000)]
Merge "More unit tests for classes needed in reading uid times per cpu freq." into oc-dev
am:
aff7c3c71e
Change-Id: Ie7691a19ef61668afd9200c9a3c77fa9fc5368f1
Dianne Hackborn [Thu, 18 May 2017 17:50:56 +0000 (17:50 +0000)]
Merge "Work on issue #
36891897: Need to ensure foreground services..." into oc-dev
am:
e4f484915f
Change-Id: I644cf3173134c0aeb2cddcb8add85803aa76b362
Todd Kennedy [Thu, 18 May 2017 17:48:09 +0000 (17:48 +0000)]
Merge "Add action to launch intent" into oc-dev
am:
ed57e46089
Change-Id: Ib34609428416c6356fa1c5af08411dfc389372a0
Adam Lesinski [Thu, 18 May 2017 17:42:44 +0000 (17:42 +0000)]
Merge "AAPT2: Ignore trailing data after IEND chunk in PNG" into oc-dev
am:
2d885e942d
Change-Id: Ic1c24dd55a4d6258533e57cea957a775e03013df
Sudheer Shanka [Thu, 18 May 2017 17:42:10 +0000 (17:42 +0000)]
Merge "More unit tests for classes needed in reading uid times per cpu freq." into oc-dev
Winson Chung [Thu, 18 May 2017 17:37:51 +0000 (17:37 +0000)]
Merge "Fix issue with deferred start of the background loader." into oc-dev am:
13bd634262
am:
8d7692c8cf
Change-Id: I7dc950c411efbd8e6c7fd6f2d3031ebd80d8ac72
Dianne Hackborn [Thu, 18 May 2017 17:35:08 +0000 (17:35 +0000)]
Merge "Work on issue #
36891897: Need to ensure foreground services..." into oc-dev
TreeHugger Robot [Thu, 18 May 2017 17:31:04 +0000 (17:31 +0000)]
Merge "Add action to launch intent" into oc-dev
TreeHugger Robot [Thu, 18 May 2017 17:30:21 +0000 (17:30 +0000)]
Merge "AAPT2: Ignore trailing data after IEND chunk in PNG" into oc-dev
Winson Chung [Thu, 18 May 2017 17:27:59 +0000 (17:27 +0000)]
Merge "Fix issue with deferred start of the background loader." into oc-dev
am:
13bd634262
Change-Id: I37ba0818f8bac5b88f2887825a0595f0550316bf
Winson Chung [Thu, 18 May 2017 17:18:52 +0000 (17:18 +0000)]
Merge "Fix issue with deferred start of the background loader." into oc-dev
Yipeng Cao [Tue, 16 May 2017 03:23:12 +0000 (20:23 -0700)]
Change currentTimeMillis to elapsedRealtime
System.currentTimeMillis does not gauntness to be monotonically
increasing, changed to SystemClock.elapsedRealtime
Bug:
38317243
Fixes:
38317243
Test: make -j 32; flash the angler device using local build
Change-Id: I3fd8f8b03655183d257d69412bc1c17cc38ccead
Merged-In: I75a70d43028e901d9f3459d6b525cac58e8e64af
Antony Sargent [Thu, 18 May 2017 16:54:17 +0000 (16:54 +0000)]
Merge "Fix a race condition in the A2dpProfile constructor" into oc-dev am:
8d87842690
am:
81877dbb79
Change-Id: Ia5bf4beb7325e63d718073edfcea5360965ac8c3
Jean-Michel Trivi [Wed, 17 May 2017 00:59:54 +0000 (17:59 -0700)]
Audio focus: start players in ducked state when focus is already lost
The volume ramp for ducking is only to be heard when a player is
playing while focus is lost. When a player is starting when
focus is already lost (and ducking is applicable), it should
play at the same level as that reached after a duck. This is
implemented using the VolumeShaper.Operation time offset
(a.k.a. XOffset), set to 1, i.e. the end of the duck.
Test: see bug
Bug:
38353147
Change-Id: Iec36fbe002b183d6d70c258d9ab26b577dc1d2ce
Antony Sargent [Thu, 18 May 2017 16:46:08 +0000 (16:46 +0000)]
Merge "Fix a race condition in the A2dpProfile constructor" into oc-dev
am:
8d87842690
Change-Id: Idbb41ac149976073add1f03e9aa3d888d36c999d
Antony Sargent [Thu, 18 May 2017 16:37:28 +0000 (16:37 +0000)]
Merge "Fix a race condition in the A2dpProfile constructor" into oc-dev
Andy Hung [Thu, 18 May 2017 16:34:39 +0000 (16:34 +0000)]
Merge "VolumeShaper: Enable xOffset from Java" into oc-dev am:
b33c0eb07a
am:
0cc01b5bc2
Change-Id: I9afcd844391b56991b5cc686808f89b4ec878a31
Andy Hung [Thu, 18 May 2017 16:26:41 +0000 (16:26 +0000)]
Merge "VolumeShaper: Enable xOffset from Java" into oc-dev
am:
b33c0eb07a
Change-Id: Icc37873492d612a66484d731168de5c5e27213c9
Jeff Sharkey [Thu, 18 May 2017 16:23:23 +0000 (16:23 +0000)]
Merge "Unbreak APK 26 apps running on "O" preview/beta builds." into oc-dev am:
91f674eeda
am:
e261ea2195
Change-Id: I184f06046d89a182f505508351bf64f29072467a
Andy Hung [Thu, 18 May 2017 16:15:44 +0000 (16:15 +0000)]
Merge "VolumeShaper: Enable xOffset from Java" into oc-dev
Jeff Sharkey [Thu, 18 May 2017 16:13:42 +0000 (16:13 +0000)]
Merge "Unbreak APK 26 apps running on "O" preview/beta builds." into oc-dev
am:
91f674eeda
Change-Id: If6537f3a9f00e5379b2de5db1d8b9712bc20798d
Jeff Sharkey [Thu, 18 May 2017 16:11:07 +0000 (16:11 +0000)]
Merge "Unbreak even more APK 26 apps running on "O" preview/beta builds." into oc-dev am:
997042ac33
am:
c244963675
Change-Id: I30e0155a9260ec4099ad45d7161c8459c8b657a2
Christine Franks [Thu, 18 May 2017 16:04:30 +0000 (16:04 +0000)]
Merge "Don't back up night display state settings"
Jeff Sharkey [Thu, 18 May 2017 16:02:49 +0000 (16:02 +0000)]
Merge "Unbreak even more APK 26 apps running on "O" preview/beta builds." into oc-dev
am:
997042ac33
Change-Id: I6da01817370fa1244499644497396a57e55df492
Jeff Sharkey [Thu, 18 May 2017 15:59:34 +0000 (15:59 +0000)]
Merge "Unbreak APK 26 apps running on "O" preview/beta builds." into oc-dev
TreeHugger Robot [Thu, 18 May 2017 15:52:37 +0000 (15:52 +0000)]
Merge "Unbreak even more APK 26 apps running on "O" preview/beta builds." into oc-dev
Jorim Jaggi [Thu, 18 May 2017 15:07:36 +0000 (15:07 +0000)]
Merge "Enable starting window logging" into oc-dev am:
5616c5f610
am:
682cd21187
Change-Id: I36e3fbd30d52446a7c3f281da28041ba0fa6e7d1
Jorim Jaggi [Thu, 18 May 2017 14:59:53 +0000 (14:59 +0000)]
Merge "Enable starting window logging" into oc-dev
am:
5616c5f610
Change-Id: I474a4db75828a2c8063c2761f046df3af07c92b9
Jorim Jaggi [Thu, 18 May 2017 14:51:44 +0000 (14:51 +0000)]
Merge "Enable starting window logging" into oc-dev
Todd Kennedy [Wed, 17 May 2017 22:16:04 +0000 (15:16 -0700)]
don't dex when installing an instant app
Bug:
38259387
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest
Test: install an instant app, see that it doesn't dex
Test: install a full app, see that it does dex
Change-Id: Id7dc749954d0be24bbd80da2ef0f43e39f77993e
Jorim Jaggi [Thu, 18 May 2017 12:58:33 +0000 (12:58 +0000)]
Merge "Fix refactoring typo" into oc-dev am:
4566518ff2
am:
13f214916c
Change-Id: I2101b07da283ed93e4286947d5d3115646c509eb
Jorim Jaggi [Thu, 18 May 2017 12:52:52 +0000 (12:52 +0000)]
Merge "Fix refactoring typo" into oc-dev
am:
4566518ff2
Change-Id: Iee60a8e32c907832cdb54a545f6a07518804f6bd
Jorim Jaggi [Wed, 17 May 2017 13:10:29 +0000 (15:10 +0200)]
Enable starting window logging
Also extend it to make sure we catch the bug!
Test: Open a couple of cold/hot apps, make sure logs look accurate
Bug:
37888853
Change-Id: Ied394969748d4d2d40359af15e0b491a2dc2b078
Jorim Jaggi [Thu, 18 May 2017 12:41:18 +0000 (12:41 +0000)]
Merge "Fix refactoring typo" into oc-dev
Przemyslaw Szczepaniak [Thu, 18 May 2017 12:22:33 +0000 (12:22 +0000)]
resolve merge conflicts of
2ce1b38e85af to oc-dev-plus-aosp
am:
3a9f256329 -s ours
Change-Id: If5f8e616ae84df0b850aa29d2db06961e91acc1a
Przemyslaw Szczepaniak [Thu, 18 May 2017 09:57:09 +0000 (10:57 +0100)]
resolve merge conflicts of
2ce1b38e85af to oc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia1eb0590edf2b074f6cbf16060cda2257091edd8
Przemyslaw Szczepaniak [Thu, 18 May 2017 09:15:30 +0000 (09:15 +0000)]
Merge "Consolidated all data allow/disallow logic into one method" am:
449d73251f
am:
ab0f6fc5d2
Change-Id: I31606372f361ad0cb8d9600f79c41257e121c7f4
Przemyslaw Szczepaniak [Thu, 18 May 2017 09:07:24 +0000 (09:07 +0000)]
Merge "Consolidated all data allow/disallow logic into one method"
am:
449d73251f
Change-Id: I861d75dad60ab83039aa06565141a2eb5b294386
Przemyslaw Szczepaniak [Thu, 18 May 2017 08:58:26 +0000 (08:58 +0000)]
Merge "Consolidated all data allow/disallow logic into one method"
TreeHugger Robot [Thu, 18 May 2017 08:43:19 +0000 (08:43 +0000)]
Merge "Add metrics constant for Choose Lock Dialog"
TreeHugger Robot [Thu, 18 May 2017 06:38:01 +0000 (06:38 +0000)]
Merge "Avoid a race condition on reading qemu.gles property"
TreeHugger Robot [Thu, 18 May 2017 06:30:26 +0000 (06:30 +0000)]
Merge "Added indication text stubs for changes to trust being managed."
TreeHugger Robot [Thu, 18 May 2017 06:24:26 +0000 (06:24 +0000)]
Merge "Removed unused attribute"
Hugo Benichi [Thu, 18 May 2017 06:02:13 +0000 (06:02 +0000)]
Merge "Captive portals: reinspect http result after fallback probe" into oc-dev am:
1fe60b213e -s ours
am:
5bda8323c5 -s ours
Change-Id: If6a502bc0f9b63a0bf7431a5a08f1f476a1640b7
TreeHugger Robot [Thu, 18 May 2017 05:53:12 +0000 (05:53 +0000)]
Merge "Fix NPE in MtpDocumentsProviderTests"
Hugo Benichi [Thu, 18 May 2017 05:53:07 +0000 (05:53 +0000)]
Merge "Captive portals: reinspect http result after fallback probe" into oc-dev
am:
1fe60b213e -s ours
Change-Id: Ic5974733afcae83e8233949f098958eb2bd35f1e
TreeHugger Robot [Thu, 18 May 2017 05:40:34 +0000 (05:40 +0000)]
Merge "Change currentTimeMillis to elapsedRealtime"
Hugo Benichi [Thu, 18 May 2017 05:39:24 +0000 (05:39 +0000)]
Merge "Captive portals: reinspect http result after fallback probe" into oc-dev
TreeHugger Robot [Thu, 18 May 2017 04:33:40 +0000 (04:33 +0000)]
Merge "PowerManager: Log wake up reason"
Bill Yi [Thu, 18 May 2017 04:18:52 +0000 (21:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: I87ad71bcf1a9095723341ee3140f7307b5df61fb
Auto-generated-cl: translation import
Jack Yu [Tue, 2 May 2017 00:01:11 +0000 (17:01 -0700)]
Consolidated all data allow/disallow logic into one method
Consolidated all data allow/disallow logic into one method
and got rid of the obsolete isDataPossible. This is the
preliminary work for checking if data is allowed just right
before data connection entering connected state.
Test: Telephony sanity tests and unit tests
bug:
33847610
Merged-In: I24f1415bbb59990e9e8e9920724be9e3f17e3e60
Change-Id: I24f1415bbb59990e9e8e9920724be9e3f17e3e60
Android Build Merger (Role) [Thu, 18 May 2017 04:06:46 +0000 (04:06 +0000)]
Merge "Merge "Expand logging capabilities of Tethering subsystem" am:
0373340b07 am:
96f9371a66 am:
945ff184c2 am:
308ed7f467"
Tomasz Wasilczyk [Thu, 18 May 2017 04:06:21 +0000 (04:06 +0000)]
Merge "Implement isAntennaConnected interface of ITuner."
Erik Kline [Thu, 18 May 2017 04:04:57 +0000 (04:04 +0000)]
Merge "Expand logging capabilities of Tethering subsystem" am:
0373340b07 am:
96f9371a66 am:
945ff184c2
am:
308ed7f467
Change-Id: I2644f518304a03da469fb9c2aa01a6d8f1a97901
Erik Kline [Thu, 18 May 2017 03:54:30 +0000 (03:54 +0000)]
Merge "Expand logging capabilities of Tethering subsystem" am:
0373340b07 am:
96f9371a66
am:
945ff184c2
Change-Id: Ia9d15f0dcc49ce070f8684eb8c8481310859faa5
Daichi Hirono [Thu, 18 May 2017 03:54:25 +0000 (12:54 +0900)]
Fix NPE in MtpDocumentsProviderTests
Previous patch ag/
2250238 broke MtpDocumentsProviderTests since
ServiceIntentSender's constructor refers the context argument which is
null in the tests.
The CL adds a test version of the constructor which does not use the
context argument in it.
Bug:
38363487
Test: MtpDocumentsProviderTests
Change-Id: I68a1d8cb6997499e5069c33f70fd0f675aaad77c
Hugo Benichi [Thu, 18 May 2017 03:50:46 +0000 (03:50 +0000)]
Merge "Fix NetworkNotificationManagerTest" am:
c13a80deee am:
13f0d10115 am:
31c566037b
am:
a67ea35d9a
Change-Id: I000077352ab0e1af7209a266be0309607034dbea
Erik Kline [Thu, 18 May 2017 03:47:16 +0000 (03:47 +0000)]
Merge "Expand logging capabilities of Tethering subsystem" am:
0373340b07
am:
96f9371a66
Change-Id: I58f88c3f5505b83539654c75e05de4eb29b64f15
Hugo Benichi [Thu, 18 May 2017 03:44:20 +0000 (03:44 +0000)]
Merge "Fix NetworkNotificationManagerTest" am:
c13a80deee am:
13f0d10115
am:
31c566037b
Change-Id: Ib880777290f74eaa565839632eb7518642fcc4f3
Erik Kline [Thu, 18 May 2017 03:38:43 +0000 (03:38 +0000)]
Merge "Expand logging capabilities of Tethering subsystem"
am:
0373340b07
Change-Id: I1381b8457781dcfafe52371a5dc7628282cb8efc
Hugo Benichi [Thu, 18 May 2017 03:36:50 +0000 (03:36 +0000)]
Merge "Fix NetworkNotificationManagerTest" am:
c13a80deee
am:
13f0d10115
Change-Id: Icf4e4e9c9dde7f6c8308adb79e3ca8b63d6f604b
TreeHugger Robot [Thu, 18 May 2017 03:34:26 +0000 (03:34 +0000)]
Merge "Print A11yEv. Content Change Types in DEBUG toString"
Yipeng Cao [Thu, 18 May 2017 03:31:39 +0000 (20:31 -0700)]
Change currentTimeMillis to elapsedRealtime
System.currentTimeMillis does not gauntness to be monotonically
increasing, changed to SystemClock.elapsedRealtime
Bug:
38317243
Fixes:
38317243
Test: make -j 32; flash the angler device using local build
Change-Id: I75a70d43028e901d9f3459d6b525cac58e8e64af
Hugo Benichi [Thu, 18 May 2017 03:29:50 +0000 (03:29 +0000)]
Merge "Fix NetworkNotificationManagerTest"
am:
c13a80deee
Change-Id: I8f02be13da5790d0fd60f04886e87de04c96de08
Treehugger Robot [Thu, 18 May 2017 03:25:28 +0000 (03:25 +0000)]
Merge "Expand logging capabilities of Tethering subsystem"
Hugo Benichi [Thu, 18 May 2017 03:22:53 +0000 (03:22 +0000)]
Merge "Captive portals: reinspect http result after fallback probe" am:
3a7c4f3337 am:
3bda223110 am:
80eb47ff61
am:
cf9ab571cd
Change-Id: I4c0d711b34c4bcd69a1811a97fe74053bdc2945a
Hugo Benichi [Thu, 18 May 2017 03:20:50 +0000 (03:20 +0000)]
Merge "Fix NetworkNotificationManagerTest"
Hugo Benichi [Thu, 18 May 2017 03:15:50 +0000 (03:15 +0000)]
Merge "Captive portals: reinspect http result after fallback probe" am:
3a7c4f3337 am:
3bda223110
am:
80eb47ff61
Change-Id: I5a8e353d33ed70d6f0627dc8f9cc4d8cda8a6f8b
OSDN Git Service
