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

OSDN Git Service

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

commit | commitdiff | tree

TreeHugger Robot [Wed, 5 Jul 2017 17:40:20 +0000 (17:40 +0000)]

Merge "Adding "Mobile data" and "Data usage" button in mobile settings."

commit | commitdiff | tree

Jason Monk [Wed, 5 Jul 2017 17:25:20 +0000 (13:25 -0400)]

resolve merge conflicts of 3b7bac537d0b to master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I8233ff863d207d669a32034d49e02036987def95

commit | commitdiff | tree

Andrew Sapperstein [Wed, 5 Jul 2017 17:10:07 +0000 (17:10 +0000)]

Merge "Use SystemUiContext for immersive mode cling." into oc-dr1-dev am: 2cbe6aa96b
am: 016be7dc01

Change-Id: I26abb7ac25f3d738871f7d5b2345620af467d04c

commit | commitdiff | tree

Jason Monk [Wed, 5 Jul 2017 17:10:02 +0000 (17:10 +0000)]

Merge "Tiny visual tweaks to QS" into oc-dr1-dev
am: 96decad236

Change-Id: Ida1b05a34017489078d22729830768a39053d970

commit | commitdiff | tree

Jason Monk [Wed, 5 Jul 2017 17:04:48 +0000 (17:04 +0000)]

Merge "Tiny visual tweaks to QS" into oc-dr1-dev

commit | commitdiff | tree

Andrew Sapperstein [Wed, 5 Jul 2017 17:03:38 +0000 (17:03 +0000)]

Merge "Use SystemUiContext for immersive mode cling." into oc-dr1-dev
am: 2cbe6aa96b

Change-Id: Ida3b992b69beceff700e67ceea075663720c6904

commit | commitdiff | tree

Andrew Sapperstein [Wed, 5 Jul 2017 16:56:57 +0000 (16:56 +0000)]

Merge "Use SystemUiContext for immersive mode cling." into oc-dr1-dev

commit | commitdiff | tree

Lucas Dupin [Wed, 5 Jul 2017 16:22:35 +0000 (16:22 +0000)]

Merge "Dark text support on Recents" into oc-dr1-dev am: b47e8caca5
am: b0687a0ba4

Change-Id: I806036bc0550de48754bb6695fe1b573c7e685b8

commit | commitdiff | tree

Lucas Dupin [Wed, 5 Jul 2017 16:15:33 +0000 (16:15 +0000)]

Merge "Dark text support on Recents" into oc-dr1-dev
am: b47e8caca5

Change-Id: Icae922c5c0653906cc44c1fd00d17eb5c34f754c

commit | commitdiff | tree

Lucas Dupin [Wed, 5 Jul 2017 16:09:49 +0000 (16:09 +0000)]

Merge "Dark text support on Recents" into oc-dr1-dev

commit | commitdiff | tree

Erik Kline [Wed, 5 Jul 2017 15:11:24 +0000 (15:11 +0000)]

Better logging infrastructure in OffloadHardwareInterface am: 248e736f11
am: 70bdcffbd9

Change-Id: I3b178f4bb798d9ac59b366723d19e3189d39942e

commit | commitdiff | tree

Erik Kline [Wed, 5 Jul 2017 15:04:23 +0000 (15:04 +0000)]

Better logging infrastructure in OffloadHardwareInterface
am: 248e736f11

Change-Id: I1b64e562c74797cbfaa26f3a1b5e38c3bf2a0c0d

commit | commitdiff | tree

Hugo Benichi [Wed, 5 Jul 2017 14:54:05 +0000 (14:54 +0000)]

Merge "ConnectivityManager: allow usage of TYPE_NONE" am: 279f32ded5 am: 0537f16516 am: 0278aa4b70
am: f060ecf1e8

Change-Id: I1e005686a1de5f2154fbc614ea52ce1a3ff5fc81

commit | commitdiff | tree

Hugo Benichi [Wed, 5 Jul 2017 14:47:56 +0000 (14:47 +0000)]

Merge "ConnectivityManager: allow usage of TYPE_NONE" am: 279f32ded5 am: 0537f16516
am: 0278aa4b70

Change-Id: I1707e39308b0cf425b75e1e3f85323743c252c2f

commit | commitdiff | tree

Hugo Benichi [Wed, 5 Jul 2017 14:40:34 +0000 (14:40 +0000)]

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

Change-Id: If6430976a3a894b9f883e03692e500eb013a5245

commit | commitdiff | tree

Hugo Benichi [Wed, 5 Jul 2017 14:40:30 +0000 (14:40 +0000)]

Merge "ConnectivityServiceTest: more informative assert failures" am: 04d8a730a9 am: 0a7f5cc9d6 am: 14f400ca81
am: 89c67d3211

Change-Id: Icafd27e8273aa6b6595c30affd23a960e5d55c53

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

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

Merge "ConnectivityServiceTest: more informative assert failures" am: 04d8a730a9 am: 0a7f5cc9d6
am: 14f400ca81

Change-Id: If00f0fd750d54074c0c642465384446502c1deec

commit | commitdiff | tree

Jason Monk [Wed, 5 Jul 2017 14:26:57 +0000 (10:26 -0400)]

Tiny visual tweaks to QS

Test: visual
Change-Id: If032b940ee8726a2027552da68c46a952d01375c
Fixes: 38199857

commit | commitdiff | tree

Hugo Benichi [Wed, 5 Jul 2017 14:26:23 +0000 (14:26 +0000)]

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

Change-Id: If152d2eb134f678673b76b181146874bf65fc536

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:56:08 +0000 (12:56 +0000)]

Merge "ConnectivityServiceTest: eliminate remaining sleep()" am: 66788dc4d8 am: 2d452e6c48 am: 80bc56bf2a
am: 7ee7b4c6d4

Change-Id: I9b1c77bd8d0710736f1f29b204acc3a162e833fb

commit | commitdiff | tree

Hugo Benichi [Wed, 5 Jul 2017 12:49:04 +0000 (12:49 +0000)]

Merge "ConnectivityServiceTest: eliminate remaining sleep()" am: 66788dc4d8 am: 2d452e6c48
am: 80bc56bf2a

Change-Id: I5e33e909cd8887460c2641c069432ec6bfa5beda

commit | commitdiff | tree

Hugo Benichi [Wed, 5 Jul 2017 12:41:53 +0000 (12:41 +0000)]

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

Change-Id: I6426659d9cf84f7e1d142b006ffe69df304f7a91

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 [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

Change-Id: Id0bd14e5b364c497403c2d88f7b1c31d712e6f87

commit | commitdiff | tree

Erik Kline [Wed, 5 Jul 2017 11:21:09 +0000 (11:21 +0000)]

DO NOT MERGE ANYWHERE am: 53e5c05d83 -s ours
am: 7ee7013a83 -s ours

Change-Id: I44bff19c301019e0d8be6d2a799242cd6b01a6e6

commit | commitdiff | tree

Erik Kline [Wed, 5 Jul 2017 11:14:12 +0000 (11:14 +0000)]

DO NOT MERGE ANYWHERE
am: 53e5c05d83 -s ours

Change-Id: I08674e3b3aacf3b15b29d60996a74f4e0669aeb1

commit | commitdiff | tree

Erik Kline [Wed, 5 Jul 2017 10:55:45 +0000 (19:55 +0900)]

DO NOT MERGE ANYWHERE

This reverts a duplicate test method resulting from a bad merge.

Test: as follows
- built

Change-Id: I8ca7c97a28fbf7d20753bb4d1f942e5c04a4edf8

commit | commitdiff | tree

Erik Kline [Wed, 5 Jul 2017 09:32:15 +0000 (09:32 +0000)]

resolve merge conflicts of b1eb85c9a8d3 to stage-aosp-master am: dbc7279e85 am: c99ff3a1e7 -s ours
am: 5f2f2fdd72 -s ours

Change-Id: I284ec7a216a987b04562afec5ed811b61d22085f

commit | commitdiff | tree

Erik Kline [Wed, 5 Jul 2017 09:24:43 +0000 (09:24 +0000)]

resolve merge conflicts of b1eb85c9a8d3 to stage-aosp-master am: dbc7279e85
am: c99ff3a1e7 -s ours

Change-Id: Ie3059eb96824e8c826be2e4a2412dab0dca79cb9

commit | commitdiff | tree

Erik Kline [Wed, 5 Jul 2017 09:17:46 +0000 (09:17 +0000)]

resolve merge conflicts of b1eb85c9a8d3 to stage-aosp-master
am: dbc7279e85

Change-Id: I0280190a1d2d48ca2e80e823ed43112161af8271

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

Lucas Dupin [Wed, 28 Jun 2017 01:17:40 +0000 (18:17 -0700)]

Dark text support on Recents

Also changed target package.

Test: visual. Set light and dark wallpapers
Change-Id: I188bc21b5372e541509bdd739c825fc5ac53ca47
Fixes: 62346335

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 [Wed, 5 Jul 2017 05:32:05 +0000 (05:32 +0000)]

Switch to USB_CONFIGURED as the primary USB readiness signal am: 61be696468 -s ours
am: 098e781223 -s ours

Change-Id: Idfb6d9944bba77a126d70991f418a3968f991ff0

commit | commitdiff | tree

Erik Kline [Wed, 5 Jul 2017 05:25:37 +0000 (05:25 +0000)]

Switch to USB_CONFIGURED as the primary USB readiness signal
am: 61be696468 -s ours

Change-Id: I14082656b23c47cf4dd25262774df6e8e7c5c236

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

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
Change-Id: Ia8f7f3616f1358b0427386ce8aff26899e03ac07
(cherry picked from commit c438e306cc69b9d4d62512030267e93011b29978)

commit | commitdiff | tree

Erik Kline [Wed, 5 Jul 2017 03:13:56 +0000 (03:13 +0000)]

Switch to USB_CONFIGURED as the primary USB readiness signal am: c438e306cc
am: c651117d70

Change-Id: I3ae731c21f292a476a9e30e229d66ef6ab4a0545

commit | commitdiff | tree

Erik Kline [Wed, 5 Jul 2017 03:07:21 +0000 (03:07 +0000)]

Switch to USB_CONFIGURED as the primary USB readiness signal
am: c438e306cc

Change-Id: I717fdd269b012f32548ebe0603999ae403b03100

commit | commitdiff | tree

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

commit | commitdiff | tree

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

Merge "Revert "ConnectivityManager: allow usage of TYPE_NONE"" am: 10c314e19a am: d3f26b6731 am: bdcebe39e6
am: 6a5016df21

Change-Id: Ibd1ef362cdc21d57aefb2d1180dc678bb2692f34

commit | commitdiff | tree

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

Merge "Revert "ConnectivityServiceTest: more informative assert failures"" am: d10790c902 am: 8f68232271 am: 3b2b9b6238
am: b566fa91a0

Change-Id: I914c3ad6074e99e313c65572e3f38144a7f8a0d9

commit | commitdiff | tree

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

Merge "Revert "ConnectivityServiceTest: eliminate remaining sleep()"" am: 1e3624527b am: 962f1842ca am: a3909e0583
am: d5e3d66e07

Change-Id: I3d7c4b4752143983bc67f72120883d45925129f7

commit | commitdiff | tree

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

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

Change-Id: I428cb473221a403e3c78cbc5d1224d46747ec315

commit | commitdiff | tree

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

Merge "Revert "ConnectivityServiceTest: more informative assert failures"" am: d10790c902 am: 8f68232271
am: 3b2b9b6238

Change-Id: Id038c0f03a0edaff27b51878a6e2ee7aace7e7cb

commit | commitdiff | tree

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

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

Change-Id: I8ecc2290d58b9e8f570ec404bbde1a2a60a89b75

commit | commitdiff | tree

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

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

Change-Id: I9d7be7013b1d70c5f3b1fef0399236c105f4196f

commit | commitdiff | tree

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

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

Change-Id: I575095f54431145106c626437d7187f50e445510

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:31:23 +0000 (11:31 +0000)]

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

Change-Id: I3e1c31d878b8f2899a3ff8b88ab565eb7856d477

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 10:01:25 +0000 (10:01 +0000)]

Merge "ConnectivityServiceTest: eliminate remaining sleep()" am: 4148fe64b9 am: 1005e82639 am: 2a7985a6d0
am: 52c3239181

Change-Id: I9449d73a1cba183d6203d2fa9165027a5482c56c

commit | commitdiff | tree

Hugo Benichi [Tue, 4 Jul 2017 09:55:04 +0000 (09:55 +0000)]

Merge "ConnectivityServiceTest: eliminate remaining sleep()" am: 4148fe64b9 am: 1005e82639
am: 2a7985a6d0

Change-Id: I3d53ece1c18cf1cf1e5e361231e321dcd59b5bad

commit | commitdiff | tree

Hugo Benichi [Tue, 4 Jul 2017 09:54:57 +0000 (09:54 +0000)]

Merge changes I90c211dc,I4455f272 am: a0ff4efc8b am: 2c856480a0 am: d0e5f1d280
am: ad0e98f881

Change-Id: I8a07b60112df37a63804454b356b4838c3a24965

commit | commitdiff | tree

Hugo Benichi [Tue, 4 Jul 2017 09:49:06 +0000 (09:49 +0000)]

Merge changes I90c211dc,I4455f272 am: a0ff4efc8b am: 2c856480a0
am: d0e5f1d280

Change-Id: Ia79936c51ec8236d5c92c19a8d2a3dff34f0e1a1

commit | commitdiff | tree

Hugo Benichi [Tue, 4 Jul 2017 09:49:00 +0000 (09:49 +0000)]

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

Change-Id: I0043c4a4c96f7ee39b9036060897dbf85222c6e6

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:42:51 +0000 (09:42 +0000)]

Merge changes I90c211dc,I4455f272 am: a0ff4efc8b
am: 2c856480a0

Change-Id: Ifc74828ff2932b3c1043ed27bc2f9a5fda32e3ee

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)]

commit | commitdiff | tree

Erik Kline [Tue, 4 Jul 2017 06:11:51 +0000 (06:11 +0000)]

Merge "Pass all offload-exempt prefixes into OffloadController" into oc-dr1-dev am: 1d8d34fa3e -s ours
am: 324dfc989f -s ours

Change-Id: I3edead8bdcff10cfc07e4c061cac89943d0cd974

commit | commitdiff | tree

Erik Kline [Tue, 4 Jul 2017 06:05:49 +0000 (06:05 +0000)]

Merge "Pass all offload-exempt prefixes into OffloadController" into oc-dr1-dev
am: 1d8d34fa3e -s ours

Change-Id: I7c3bdf71367f9f6888ffc76afb7e69de1a26c9f0

commit | commitdiff | tree

TreeHugger Robot [Tue, 4 Jul 2017 05:58:46 +0000 (05:58 +0000)]

Merge "Pass all offload-exempt prefixes into OffloadController" into oc-dr1-dev

commit | commitdiff | tree

Joel Scherpelz [Tue, 4 Jul 2017 04:16:43 +0000 (04:16 +0000)]

Merge "Wakeup packet mark/mask configuration option" am: b975c88178 am: 01860f8ea5 am: 48360082bc
am: 1ecac318d8

Change-Id: I96595368cfb6f461a84dae5bc1330f6c843f77ba

commit | commitdiff | tree

Joel Scherpelz [Tue, 4 Jul 2017 04:07:56 +0000 (04:07 +0000)]

Merge "Wakeup packet mark/mask configuration option" am: b975c88178 am: 01860f8ea5
am: 48360082bc

Change-Id: Ie5c88f5b91248a5f069decc0708f17af4b649710

commit | commitdiff | tree

Joel Scherpelz [Tue, 4 Jul 2017 03:55:15 +0000 (03:55 +0000)]

Merge "Wakeup packet mark/mask configuration option" am: b975c88178
am: 01860f8ea5

Change-Id: I4e682aa58b0d889c9ede17b2b695cb9ec07b4b80

commit | commitdiff | tree

Joel Scherpelz [Tue, 4 Jul 2017 03:47:14 +0000 (03:47 +0000)]

Merge "Wakeup packet mark/mask configuration option"
am: b975c88178

Change-Id: Ief60fa8a594931c8968db7a9ea2872c030794088

commit | commitdiff | tree

Treehugger Robot [Tue, 4 Jul 2017 03:38:34 +0000 (03:38 +0000)]

Merge "Wakeup packet mark/mask configuration option"

commit | commitdiff | tree

TreeHugger Robot [Tue, 4 Jul 2017 02:22:43 +0000 (02:22 +0000)]

Merge "Mocked system properties should return default value by default"

commit | commitdiff | tree

Tobias Thierer [Mon, 3 Jul 2017 15:30:44 +0000 (15:30 +0000)]

Merge changes from topic 'revert-update-conscrypt' into oc-dr1-dev am: b2b73e4956
am: 18318f7dbf

Change-Id: Id2bea1ccb2a3f6523e2e21da32e2adf7ca1810a7

commit | commitdiff | tree

Tobias Thierer [Mon, 3 Jul 2017 15:26:06 +0000 (15:26 +0000)]

Revert "Track updates to Conscrypt". DO NOT MERGE ANYWHERE. am: c20c2ea28e -s ours
am: 216a0bdfb8 -s ours

Change-Id: I5b08b986e8b29e6890d314bbac45bab0439282d5

commit | commitdiff | tree

Tobias Thierer [Mon, 3 Jul 2017 15:21:03 +0000 (15:21 +0000)]

Merge changes from topic 'revert-update-conscrypt' into oc-dr1-dev
am: b2b73e4956

Change-Id: I7b97fd34f5007f52804c45e539f493184bcf8c0d

commit | commitdiff | tree

Tobias Thierer [Mon, 3 Jul 2017 15:16:26 +0000 (15:16 +0000)]

Revert "Track updates to Conscrypt". DO NOT MERGE ANYWHERE.
am: c20c2ea28e -s ours

Change-Id: I8f51100a3429f0a604e6b93c17cd149f644b1256

commit | commitdiff | tree

TreeHugger Robot [Mon, 3 Jul 2017 15:07:20 +0000 (15:07 +0000)]

Merge changes from topic 'revert-update-conscrypt' into oc-dr1-dev

* changes:
Revert "Track updates to Conscrypt". DO NOT MERGE ANYWHERE.
Revert "Delete obsolete and unused KeyStoreTests". DO NOT MERGE ANYWHERE.

commit | commitdiff | tree

Selim Cinek [Mon, 3 Jul 2017 13:48:50 +0000 (13:48 +0000)]

Merge "Improved Text transformations for notifications" into oc-dr1-dev am: 19dc697f33
am: 2d220942ce

Change-Id: I7d6e7c755431dad906dcc091652a4d8f65f1281b

commit | commitdiff | tree

Selim Cinek [Mon, 3 Jul 2017 13:43:31 +0000 (13:43 +0000)]

Merge "Improved Text transformations for notifications" into oc-dr1-dev
am: 19dc697f33

Change-Id: Id09a2eabdda8a6fcd3e41760c0c4ddfa418af412

commit | commitdiff | tree

TreeHugger Robot [Mon, 3 Jul 2017 13:37:33 +0000 (13:37 +0000)]

Merge "Improved Text transformations for notifications" into oc-dr1-dev

commit | commitdiff | tree

Adrian Roos [Mon, 3 Jul 2017 12:28:19 +0000 (12:28 +0000)]

Merge "AOD: Avoid double re-registration of sensors" into oc-dr1-dev am: fc73208ec9
am: 2f5f9b6a39

Change-Id: I2f2a33d45c7bd7c6ba3828baefeb051a51cca754

commit | commitdiff | tree

Adrian Roos [Mon, 3 Jul 2017 12:22:53 +0000 (12:22 +0000)]

Merge "AOD: Avoid double re-registration of sensors" into oc-dr1-dev
am: fc73208ec9

Change-Id: Iff1960bfe0d69b2afd3df4fd0f7d7d6a5bffa78e

commit | commitdiff | tree

TreeHugger Robot [Mon, 3 Jul 2017 12:15:57 +0000 (12:15 +0000)]

Merge "AOD: Avoid double re-registration of sensors" into oc-dr1-dev

commit | commitdiff | tree

Selim Cinek [Mon, 3 Jul 2017 10:59:17 +0000 (10:59 +0000)]

Merge "Fixed an issue where the shelf could be hidden" into oc-dr1-dev am: fdc84a13a2
am: 3ec9d993ce

Change-Id: I307a3d65603f5ede0e283f36715271bc68b8eabd

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help