git.osdn.net Git - android-x86/frameworks-base.git/log

OSDN Git Service

(root) / android-x86 / frameworks-base.git / log

commit | commitdiff | tree

Ruchi Kandoi [Thu, 6 Jul 2017 22:48:20 +0000 (22:48 +0000)]

Merge changes from topic 'NCI-2.0'
am: 430dded515

Change-Id: I264533bf8782ea66bd6959ca08f9699985273c9f

commit | commitdiff | tree

Love Khanna [Thu, 6 Jul 2017 22:47:08 +0000 (22:47 +0000)]

NCI2.0 update LF_T3T_PARAMETERS of 18 byte.
am: e7ecebae11

Change-Id: Ic91ecb6a8dcb8529efda8eb0cdc99ca7758b66e6

commit | commitdiff | tree

Ruchi Kandoi [Thu, 6 Jul 2017 22:41:29 +0000 (22:41 +0000)]

Merge changes from topic 'NCI-2.0'

* changes:
AID suffix registration.
NCI2.0 update LF_T3T_PARAMETERS of 18 byte.

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 21:13:29 +0000 (21:13 +0000)]

Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am: a4267fd89f" into stage-aosp-master

commit | commitdiff | tree

Alex Light [Thu, 6 Jul 2017 21:11:47 +0000 (21:11 +0000)]

Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor"
am: a4267fd89f

Change-Id: I8cd6ee971686accf3cc832e7c0f5f18e8b4fbf2f

commit | commitdiff | tree

Alex Light [Thu, 6 Jul 2017 21:10:11 +0000 (21:10 +0000)]

Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor"
am: a4267fd89f

Change-Id: If31e5d218bd00b3281923c80cd4f61ca734d4388

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 21:04:29 +0000 (21:04 +0000)]

Merge "Merge "Enable priority boost for non-Jack builds." am: 847c70da66" into stage-aosp-master

commit | commitdiff | tree

Alex Light [Thu, 6 Jul 2017 21:03:24 +0000 (21:03 +0000)]

Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor"

commit | commitdiff | tree

Colin Cross [Thu, 6 Jul 2017 21:03:01 +0000 (21:03 +0000)]

Merge "Enable priority boost for non-Jack builds."
am: 847c70da66

Change-Id: Ie3e16e7452404b5d83d87c5f4d86abb94f7e1c6b

commit | commitdiff | tree

Colin Cross [Thu, 6 Jul 2017 21:02:04 +0000 (21:02 +0000)]

Merge "Enable priority boost for non-Jack builds."
am: 847c70da66

Change-Id: I2172acbf465cf19c3af7388309367b77750c4ac0

commit | commitdiff | tree

Colin Cross [Thu, 6 Jul 2017 20:48:31 +0000 (20:48 +0000)]

Merge "Enable priority boost for non-Jack builds."

commit | commitdiff | tree

Yifan Hong [Thu, 6 Jul 2017 20:21:51 +0000 (20:21 +0000)]

Merge "Log errors on android.os.VintfObject.verify()"
am: 54b1e9c57c

Change-Id: I07f9797bcf9a32a3c9b517741e7cbef17d5a5382

commit | commitdiff | tree

Yifan Hong [Thu, 6 Jul 2017 19:48:26 +0000 (19:48 +0000)]

Merge "Log errors on android.os.VintfObject.verify()"

commit | commitdiff | tree

Alan Leung [Wed, 14 Jun 2017 20:50:45 +0000 (13:50 -0700)]

Enable priority boost for non-Jack builds.

Test: m ANDROID_COMPILE_WITH_JACK=false / checked for boost+reset calls.
BUG: 36791701
Change-Id: I5fb4107ae39e76644c01c502483ae7d887ab18a3
Merged-In: I5fb4107ae39e76644c01c502483ae7d887ab18a3
(cherry picked from commit 421baeb9289cd5a16e2fef5601dcddbbfad8eb3e)

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 18:26:39 +0000 (18:26 +0000)]

Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 18:25:41 +0000 (18:25 +0000)]

Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master

commit | commitdiff | tree

Alex Light [Thu, 6 Jul 2017 18:25:18 +0000 (11:25 -0700)]

Unhide InMemoryDexClassLoader ByteBuffer[] constructor

This constructor lets one give multiple dex files as byte buffers for
the InMemoryDexClassLoader.

Bug: 63390204
Test: Builds
Change-Id: I5b8a7860dbc365c0a51dbaf4540b9fa53c922546

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 18:24:49 +0000 (18:24 +0000)]

Merge "Add a reason arg to streamStateUpdated"
am: 6ba3829074

Change-Id: Ied8d6168fc625600c865c1980bb82da0f919e02b

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 18:24:02 +0000 (18:24 +0000)]

Merge "Add a reason arg to streamStateUpdated"
am: 6ba3829074

Change-Id: I0c05734f18d58d7693d8777a4d1bb7950a5f54af

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 18:23:57 +0000 (18:23 +0000)]

Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27" into stage-aosp-master

commit | commitdiff | tree

Fyodor Kupolov [Thu, 6 Jul 2017 18:22:49 +0000 (18:22 +0000)]

Merge "Fix ContentObserver unregister issue"
am: 09b6988e27

Change-Id: Ia9573b2cb453d3ff493a691675bee0f5dfc44396

commit | commitdiff | tree

Fyodor Kupolov [Thu, 6 Jul 2017 18:21:54 +0000 (18:21 +0000)]

Merge "Fix ContentObserver unregister issue"
am: 09b6988e27

Change-Id: I242e87b53f603a05ba7c4069662456457a3d980a

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 18:08:02 +0000 (18:08 +0000)]

Merge "Add a reason arg to streamStateUpdated"

commit | commitdiff | tree

Fyodor Kupolov [Thu, 6 Jul 2017 18:07:04 +0000 (18:07 +0000)]

Merge "Fix ContentObserver unregister issue"

commit | commitdiff | tree

Love Khanna [Fri, 12 May 2017 08:23:42 +0000 (13:53 +0530)]

AID suffix registration.

Test: compiles.

Change-Id: I0ab02599814722055d77eef29e734bfd45e8d1ee

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 08:04:24 +0000 (08:04 +0000)]

Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19" into stage-aosp-master

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 08:03:19 +0000 (08:03 +0000)]

Merge "Clearly log tether_offload_disabled setting status in start()"
am: b171a46d19

Change-Id: Ic74dcee4e473e4b6498b16affad88706bb4a6b7e

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 08:02:44 +0000 (08:02 +0000)]

Merge "Clearly log tether_offload_disabled setting status in start()"
am: b171a46d19

Change-Id: I999926bf0b67b12caadeea2d3766d8f69913bafe

commit | commitdiff | tree

Treehugger Robot [Thu, 6 Jul 2017 07:54:33 +0000 (07:54 +0000)]

Merge "Clearly log tether_offload_disabled setting status in start()"

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 03:38:48 +0000 (12:38 +0900)]

Clearly log tether_offload_disabled setting status in start()

Test: as follows
    - built
    - flashed
    - booted
    - "runtest frameworks-net" passes
Bug: 29337859
Bug: 32163131

Change-Id: I113358ef71c2e5e3254eb6f9fbf9d5721825b0df
Merged-In: Iebcdb7bfaa85f822e73fe2f3b54caceb5420709c
Merged-In: Ifce832dca7b4d8b3056e2a9e91d38bffe25cfeb6
Merged-In: I99f6abc31579b4b25589452c44e1834a7ba4e591
Merged-In: I312a9309d6934bcec7fc0245cad12b97f1a22521

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 03:25:23 +0000 (03:25 +0000)]

Merge "Merge "ProcessStats: fix uss average value offset" am: b355b7f446" into stage-aosp-master

commit | commitdiff | tree

Mathieu Chartier [Thu, 6 Jul 2017 03:23:39 +0000 (03:23 +0000)]

Merge "ProcessStats: fix uss average value offset"
am: b355b7f446

Change-Id: I8ea2d783c0e9c749e923b7a37b2268d0c186851e

commit | commitdiff | tree

Mathieu Chartier [Thu, 6 Jul 2017 03:23:21 +0000 (03:23 +0000)]

Merge "ProcessStats: fix uss average value offset"
am: b355b7f446

Change-Id: I3347a5b4d3df895b7066c5117f37003e4603ebd9

commit | commitdiff | tree

Mathieu Chartier [Thu, 6 Jul 2017 03:13:52 +0000 (03:13 +0000)]

Merge "ProcessStats: fix uss average value offset"

commit | commitdiff | tree

daqi [Wed, 28 Jun 2017 06:16:13 +0000 (14:16 +0800)]

Fix ContentObserver unregister issue

[Cause of Defect]
In the ContentObserver callback procedure, the binder thread
has no sync mechanism with handler thread.
The ContentObserver#onChange method can get called after
ContentResolver#unregisterContentObserver called in the
very low probability.

Bug: https://issuetracker.google.com/issues/63154326
Test: manual - check https://github.com/nanjingdaqi/ContentObserverDemo
Change-Id: I0e3831eba7a9cc1a5bf0d30abe5dd0ec8259b0d4
Signed-off-by: daqi <daqi@xiaomi.com>

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 02:05:16 +0000 (02:05 +0000)]

Merge "Merge "Update DownloadRequest API" am: fa42eea98f" into stage-aosp-master

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 02:03:42 +0000 (02:03 +0000)]

Merge "Update DownloadRequest API"
am: fa42eea98f

Change-Id: I0b966f0fa2ca3e1c45bf4932654a3bbc1b2d05eb

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 02:03:16 +0000 (02:03 +0000)]

Merge "Update DownloadRequest API"
am: fa42eea98f

Change-Id: I4c822f653900cab34276b2b4ba5fb1a29e948a76

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 01:52:04 +0000 (01:52 +0000)]

Merge "Update DownloadRequest API"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 01:47:37 +0000 (01:47 +0000)]

Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am: 21187ba5cc" into stage-aosp-master

commit | commitdiff | tree

Hiroki Yamamoto [Thu, 6 Jul 2017 01:46:20 +0000 (01:46 +0000)]

Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover"
am: 21187ba5cc

Change-Id: I9117f76d5a03d3aa222c87338bd7249184b3041d

commit | commitdiff | tree

Hiroki Yamamoto [Thu, 6 Jul 2017 01:45:13 +0000 (01:45 +0000)]

Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover"
am: 21187ba5cc

Change-Id: Iae5a62d77719833dc91c881bd3b90c9ab327a0bf

commit | commitdiff | tree

Treehugger Robot [Thu, 6 Jul 2017 01:30:10 +0000 (01:30 +0000)]

Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 00:43:51 +0000 (00:43 +0000)]

Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am: 36904fbc94" into stage-aosp-master

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 00:42:14 +0000 (00:42 +0000)]

Merge "Better logging infrastructure in OffloadHardwareInterface"
am: 36904fbc94

Change-Id: I7789242c6f574c1d81eb0a5e9527b167d4b3c755

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 00:41:33 +0000 (00:41 +0000)]

Merge "Better logging infrastructure in OffloadHardwareInterface"
am: 36904fbc94

Change-Id: Iea47f74dc77b347343726d2ab0ee128e5391767b

commit | commitdiff | tree

Treehugger Robot [Thu, 6 Jul 2017 00:31:44 +0000 (00:31 +0000)]

Merge "Better logging infrastructure in OffloadHardwareInterface"

commit | commitdiff | tree

Hiroki Yamamoto [Fri, 14 Apr 2017 06:10:15 +0000 (15:10 +0900)]

Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover

Test: do Nfc Bluetooth Handover and wait for the timeout
Bug: 63250718
Change-Id: Ieea8b8f7a07fe90a594ed13ecfefd01e1d60853d

commit | commitdiff | tree

Yifan Hong [Wed, 5 Jul 2017 23:39:51 +0000 (16:39 -0700)]

Log errors on android.os.VintfObject.verify()

Test: pass
Bug: 63290683
Change-Id: I7ddc355024359e31aca4bbdf18f42075f72ddd5a

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 5 Jul 2017 22:43:56 +0000 (22:43 +0000)]

Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 5 Jul 2017 22:38:28 +0000 (22:38 +0000)]

Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master

commit | commitdiff | tree

Tobias Thierer [Wed, 5 Jul 2017 22:37:47 +0000 (22:37 +0000)]

Merge "Track update of org.json API"
am: c5a65bc152

Change-Id: I9f6df94ef58488a62558ee31e549c5e71a726f8a

commit | commitdiff | tree

Tobias Thierer [Wed, 5 Jul 2017 22:33:10 +0000 (22:33 +0000)]

Merge "Track update of org.json API"
am: c5a65bc152

Change-Id: I755b8be63f4a9dbe11d1c14c0d9f3f8cd3e93916

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 5 Jul 2017 22:33:09 +0000 (22:33 +0000)]

Merge "Merge "Framework: Add libziparchive dependency" am: 2688a9ab56" into stage-aosp-master

commit | commitdiff | tree

Andreas Gampe [Wed, 5 Jul 2017 22:30:56 +0000 (22:30 +0000)]

Merge "Framework: Add libziparchive dependency"
am: 2688a9ab56

Change-Id: I68c353e8784c86b4a1e1e38c3c2f65e79bd7920a

commit | commitdiff | tree

Andreas Gampe [Wed, 5 Jul 2017 22:30:51 +0000 (22:30 +0000)]

Merge "Framework: Add libziparchive dependency"
am: 2688a9ab56

Change-Id: I4d42a5c0564f7d142b1ee3fe8606b4bd6371e9a9

commit | commitdiff | tree

Tobias Thierer [Wed, 5 Jul 2017 22:22:16 +0000 (22:22 +0000)]

Merge "Track update of org.json API"

commit | commitdiff | tree

Treehugger Robot [Wed, 5 Jul 2017 22:20:40 +0000 (22:20 +0000)]

Merge "Framework: Add libziparchive dependency"

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 5 Jul 2017 21:13:19 +0000 (21:13 +0000)]

Merge "Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6" am: 6fd0671265 -s ours" into stage-aosp-master

commit | commitdiff | tree

Adam Lesinski [Wed, 5 Jul 2017 21:12:22 +0000 (21:12 +0000)]

Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6"
am: 6fd0671265 -s ours

Change-Id: Icefbb67a8046a4bc57de5f69bcc32ab235371ddc

commit | commitdiff | tree

Adam Lesinski [Wed, 5 Jul 2017 21:11:36 +0000 (21:11 +0000)]

Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6"
am: 6fd0671265 -s ours

Change-Id: Ib9428106e209a77220e22f43210ecf0d946128ad

commit | commitdiff | tree

Treehugger Robot [Wed, 5 Jul 2017 21:01:29 +0000 (21:01 +0000)]

Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6"

commit | commitdiff | tree

Andreas Gampe [Mon, 3 Jul 2017 20:03:29 +0000 (13:03 -0700)]

Framework: Add libziparchive dependency

Bug: 37342627
Test: m
Change-Id: I4bc85b87a6c4305f14586aba662bcccbd4b8b6e2

commit | commitdiff | tree

Adam Lesinski [Fri, 28 Oct 2016 23:39:15 +0000 (16:39 -0700)]

Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6

Partial cherry-pick of commit 7ad1110ecd6a840fcd2895c62668828a1ca029c6.

Test: m
Merged-In: Id0e57ee828f17008891fe3741935a9be8830b01d
Change-Id: Id0e57ee828f17008891fe3741935a9be8830b01d

commit | commitdiff | tree

Erik Kline [Tue, 4 Jul 2017 04:39:48 +0000 (13:39 +0900)]

Better logging infrastructure in OffloadHardwareInterface

Test: as follows
    - built
    - flashed
    - booted
    - "runtest frameworks-net" passes
    - watch "adb shell dumpsys connectivity tethering | tail -60" shows logs
Bug: 29337859
Bug: 32163131

Merged-In: I3b178f4bb798d9ac59b366723d19e3189d39942e
Merged-In: I1b64e562c74797cbfaa26f3a1b5e38c3bf2a0c0d
Merged-In: Id0bd14e5b364c497403c2d88f7b1c31d712e6f87
Change-Id: I78f28a9e940cc7e050f2d79f877d27468d13599a

commit | commitdiff | tree

Hugo Benichi [Wed, 5 Jul 2017 14:33:35 +0000 (14:33 +0000)]

Merge "ConnectivityManager: allow usage of TYPE_NONE"
am: 279f32ded5

Change-Id: I72dbd17db63bd7b8637e82f5cdcfec3bf1482962

commit | commitdiff | tree

Treehugger Robot [Wed, 5 Jul 2017 14:21:35 +0000 (14:21 +0000)]

Merge "ConnectivityManager: allow usage of TYPE_NONE"

commit | commitdiff | tree

Hugo Benichi [Wed, 5 Jul 2017 14:19:33 +0000 (14:19 +0000)]

Merge "ConnectivityServiceTest: more informative assert failures"
am: 04d8a730a9

Change-Id: Iaa55014ae4c2f4927059735c349c40ada836b79b

commit | commitdiff | tree

Treehugger Robot [Wed, 5 Jul 2017 14:07:37 +0000 (14:07 +0000)]

Merge "ConnectivityServiceTest: more informative assert failures"

commit | commitdiff | tree

Hugo Benichi [Wed, 5 Jul 2017 12:35:01 +0000 (12:35 +0000)]

Merge "ConnectivityServiceTest: eliminate remaining sleep()"
am: 66788dc4d8

Change-Id: Ib1e31c2b8999d07b20ef4cef8e70d851f93df6e5

commit | commitdiff | tree

Hugo Benichi [Tue, 20 Jun 2017 05:07:59 +0000 (14:07 +0900)]

ConnectivityManager: allow usage of TYPE_NONE

This patch allows to use TYPE_NONE for the legacy network type variable
of NetworkInfo. This usage is "safe" with respect to legacy APIs using
network types as most of them already returns null or do nothing for
TYPE_NONE.

Of the existing APIs in ConnectivityManager that accept a network type
argument, those which were already returning null or doing nothing for
TYPE_NONE are:
  getNetworkInfo(int)
  getNetworkForType(int)
  stopUsingNetworkFeature(int, String)
  networkCapabilitiesForType(int)
  requestRouteToHostAddress(int, InetAddress)
  reportInetCondition(int, int)
  isNetworkSupported(int)
  getLinkProperties(int)

Only setProvisioningNotificationVisible needs an additional guard
against TYPE_NONE.

Bug: 30088447
Bug: 62844794
Test: runtest frameworks-net
Change-Id: I112596fcd03d3c2cd42a2a84d265adb38e3944bb

commit | commitdiff | tree

Hugo Benichi [Mon, 26 Jun 2017 01:06:49 +0000 (10:06 +0900)]

ConnectivityServiceTest: more informative assert failures

Bug: 62918393
Test: runtest frameworks-net
Change-Id: If87315ef7cba6380596f48b92c7e0f6eeccc8368

commit | commitdiff | tree

Hugo Benichi [Wed, 5 Jul 2017 12:25:16 +0000 (12:25 +0000)]

Merge "ConnectivityServiceTest: eliminate remaining sleep()"

commit | commitdiff | tree

Erik Kline [Wed, 5 Jul 2017 06:44:42 +0000 (15:44 +0900)]

resolve merge conflicts of b1eb85c9a8d3 to stage-aosp-master

Test: I solemnly swear I tested this conflict resolution.

Merged-In: I3ae731c21f292a476a9e30e229d66ef6ab4a0545
Merged-In: I717fdd269b012f32548ebe0603999ae403b03100
Merged-Id: Ia8f7f3616f1358b0427386ce8aff26899e03ac07
Merged-In: Ie32f50ec1a07e3126a05abee27c76bc63cdaca14
Change-Id: I217d7ca2958f3d6ca8992f738a034693a0fac486

commit | commitdiff | tree

Hugo Benichi [Mon, 26 Jun 2017 01:20:00 +0000 (10:20 +0900)]

ConnectivityServiceTest: eliminate remaining sleep()

ConnectivityServiceTest was still using sleep() in a few places although
these were unnecessary:
  - in testSatisfiedThenLostNetworkRequestDoesNotTriggerOnAvailable(),
    expectNoCallback() and expectAvailableCallback() already include
    waitForIdleHandler calls that drain the message queues and make
    sleep no-ops.
  - in testTimedoutAfterUnregisterdNetworkRequest, the sleeps were
    introduced before unregisterNetworkCallback was changed to have a
    synchronous effect for callback unregistration, therefore the sleep
    becomes simply non-sensical. To reflect this the name of the method
    is also changed.

Bug: 62918393
Test: runtest frameworks-net
Change-Id: I7b701ecf5846a5e1890e86107b8d2544b419ce44

commit | commitdiff | tree

Treehugger Robot [Wed, 5 Jul 2017 05:56:29 +0000 (05:56 +0000)]

Merge "Switch to USB_CONFIGURED as the primary USB readiness signal"

commit | commitdiff | tree

Erik Kline [Tue, 4 Jul 2017 13:02:49 +0000 (22:02 +0900)]

Switch to USB_CONFIGURED as the primary USB readiness signal

Test: as follows
    - built
    - flashed
    - booted
    - "runtest frameworks-net" passes
    - USB tethering on and off works as expected
Bug: 32163131
Bug: 36216864
Bug: 62147658
Bug: 62552150

Merged-In: I3ae731c21f292a476a9e30e229d66ef6ab4a0545
Merged-In: I717fdd269b012f32548ebe0603999ae403b03100
Merged-Id: Ia8f7f3616f1358b0427386ce8aff26899e03ac07
Change-Id: Ia8f7f3616f1358b0427386ce8aff26899e03ac07
(cherry picked from commit c438e306cc69b9d4d62512030267e93011b29978)

commit | commitdiff | tree

Roland Levillain [Tue, 4 Jul 2017 11:31:30 +0000 (11:31 +0000)]

Merge "Revert "ConnectivityManager: allow usage of TYPE_NONE""
am: 10c314e19a

Change-Id: I49221522c1a9a6e7d4ae72529c1a47b736e26a39

commit | commitdiff | tree

Roland Levillain [Tue, 4 Jul 2017 11:24:25 +0000 (11:24 +0000)]

Merge "Revert "ConnectivityServiceTest: more informative assert failures""
am: d10790c902

Change-Id: Ie61051984a1b6efbb0b19754ce0fb99024ab296a

commit | commitdiff | tree

Roland Levillain [Tue, 4 Jul 2017 11:22:32 +0000 (11:22 +0000)]

Merge "Revert "ConnectivityServiceTest: eliminate remaining sleep()""
am: 1e3624527b

Change-Id: If210f213c7840c218d5e847667c7613d53f86661

commit | commitdiff | tree

Roland Levillain [Tue, 4 Jul 2017 11:15:18 +0000 (11:15 +0000)]

Merge "Revert "ConnectivityManager: allow usage of TYPE_NONE""

commit | commitdiff | tree

Roland Levillain [Tue, 4 Jul 2017 11:07:47 +0000 (11:07 +0000)]

Revert "ConnectivityManager: allow usage of TYPE_NONE"

This CL is breaking some internal builds.

This reverts commit 726931ebf4707795413578b57a1f033bf9a6e064.

Change-Id: Ie79214808d84c73f54a525f515b4c90a3fb23542

commit | commitdiff | tree

Roland Levillain [Tue, 4 Jul 2017 11:12:10 +0000 (11:12 +0000)]

Merge "Revert "ConnectivityServiceTest: more informative assert failures""

commit | commitdiff | tree

Roland Levillain [Tue, 4 Jul 2017 11:09:10 +0000 (11:09 +0000)]

Revert "ConnectivityServiceTest: more informative assert failures"

CL https://android-review.googlesource.com/#/c/420720/ is
breaking several internal builds, and CL
https://android-review.googlesource.com/#/c/422480/ must
be reverted beforehand.

This reverts commit a6981669c4e2707bcfb3db001e262b2da4bb9c17.

Change-Id: I5883409452d39e1834e183aa7b5ccdbf14291ca5

commit | commitdiff | tree

Roland Levillain [Tue, 4 Jul 2017 11:11:09 +0000 (11:11 +0000)]

Merge "Revert "ConnectivityServiceTest: eliminate remaining sleep()""

commit | commitdiff | tree

Roland Levillain [Tue, 4 Jul 2017 11:10:06 +0000 (11:10 +0000)]

Revert "ConnectivityServiceTest: eliminate remaining sleep()"

CL https://android-review.googlesource.com/#/c/420720/ is
breaking several internal builds, and CL
https://android-review.googlesource.com/#/c/422481/ must
be reverted beforehand.

This reverts commit 8afb9cfd000dadc730e52ebdeb4ad031b84b8e03.

Change-Id: If0b196b6860c4087a05b28770469d7850a76fd37

commit | commitdiff | tree

Hugo Benichi [Tue, 4 Jul 2017 09:43:01 +0000 (09:43 +0000)]

Merge "ConnectivityServiceTest: eliminate remaining sleep()"
am: 4148fe64b9

Change-Id: I31a8f64b4ee37a58bc83c08251d949f44cc26fd4

commit | commitdiff | tree

Hugo Benichi [Tue, 4 Jul 2017 09:35:51 +0000 (09:35 +0000)]

Merge changes I90c211dc,I4455f272
am: a0ff4efc8b

Change-Id: I502d978ff636a00979d2083c39381bf600d3d6da

commit | commitdiff | tree

Treehugger Robot [Tue, 4 Jul 2017 09:25:53 +0000 (09:25 +0000)]

Merge "ConnectivityServiceTest: eliminate remaining sleep()"

commit | commitdiff | tree

Treehugger Robot [Tue, 4 Jul 2017 09:22:07 +0000 (09:22 +0000)]

Merge changes I90c211dc,I4455f272

* changes:
ConnectivityServiceTest: more informative assert failures
ConnectivityManager: allow usage of TYPE_NONE

commit | commitdiff | tree

Hugo Benichi [Mon, 26 Jun 2017 01:20:00 +0000 (10:20 +0900)]

commit | commitdiff | tree

Hugo Benichi [Mon, 26 Jun 2017 01:06:49 +0000 (10:06 +0900)]

ConnectivityServiceTest: more informative assert failures

Bug: 62918393
Test: runtest frameworks-net
Change-Id: I90c211dc6d6262475924ecabc2863c47aec5a0b9

commit | commitdiff | tree

Hugo Benichi [Tue, 20 Jun 2017 05:07:59 +0000 (14:07 +0900)]