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

OSDN Git Service

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

commit | commitdiff | tree

Siyamed Sinir [Thu, 30 Jun 2016 18:48:12 +0000 (18:48 +0000)]

Merge "Enable Text core tests"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 30 Jun 2016 18:41:03 +0000 (18:41 +0000)]

Merge "Merge \\"Support trimmed images in BootAnimation\\" into nyc-mr1-dev am: 656b9db5fb am: c3b432acde"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 30 Jun 2016 18:40:54 +0000 (18:40 +0000)]

Merge "Merge \\"Remove InputContentInfo#requestPermission()\\" into nyc-mr1-dev am: c80c64a97b am: 854e6f8501"

commit | commitdiff | tree

Geoffrey Pitsch [Thu, 30 Jun 2016 18:40:30 +0000 (18:40 +0000)]

Merge \\"Support trimmed images in BootAnimation\\" into nyc-mr1-dev am: 656b9db5fb
am: c3b432acde

Change-Id: I224d9d03c22ad6c02361042bf4cbac0ccfd3cff6

commit | commitdiff | tree

Yohei Yukawa [Thu, 30 Jun 2016 18:40:27 +0000 (18:40 +0000)]

Merge \\"Remove InputContentInfo#requestPermission()\\" into nyc-mr1-dev am: c80c64a97b
am: 854e6f8501

Change-Id: Ia84ebe07d1abf469ed461aa524c38ffa76a5ea53

commit | commitdiff | tree

Roozbeh Pournader [Thu, 30 Jun 2016 18:39:28 +0000 (18:39 +0000)]

Merge "Add locale checks to DateUtilsTest"

commit | commitdiff | tree

Geoffrey Pitsch [Thu, 30 Jun 2016 18:35:43 +0000 (18:35 +0000)]

Merge \"Support trimmed images in BootAnimation\" into nyc-mr1-dev
am: 656b9db5fb

Change-Id: Ida34d52d7761c1d08028121cffba12723caf8c00

commit | commitdiff | tree

Yohei Yukawa [Thu, 30 Jun 2016 18:35:39 +0000 (18:35 +0000)]

Merge \"Remove InputContentInfo#requestPermission()\" into nyc-mr1-dev
am: c80c64a97b

Change-Id: Iaaf2b610852510e604c482568c0ef1dc6495e179

commit | commitdiff | tree

Roozbeh Pournader [Thu, 30 Jun 2016 18:33:53 +0000 (11:33 -0700)]

Add locale checks to DateUtilsTest

This is to debug why the tests are failing on some scenarios.

Bug: 29880704
Change-Id: Ibae466681a6b40fced98f5f907ffd3582dc37ebf

commit | commitdiff | tree

Tim Murray [Thu, 30 Jun 2016 18:28:14 +0000 (18:28 +0000)]

Merge \\"Add a new API to improve VR thread scheduling.\\" into nyc-mr1-dev am: 5e261441d3
am: 75c6078c8b

Change-Id: Ic101c2d17e98fcb1cc2d6e3cccebfb6e378f9914

commit | commitdiff | tree

Geoffrey Pitsch [Thu, 30 Jun 2016 18:24:15 +0000 (18:24 +0000)]

Merge "Support trimmed images in BootAnimation" into nyc-mr1-dev

commit | commitdiff | tree

Yohei Yukawa [Thu, 30 Jun 2016 18:21:46 +0000 (18:21 +0000)]

Merge "Remove InputContentInfo#requestPermission()" into nyc-mr1-dev

commit | commitdiff | tree

Srinath Sridharan [Thu, 30 Jun 2016 18:19:47 +0000 (18:19 +0000)]

Merge \"Add a new API to improve VR thread scheduling.\" into nyc-mr1-dev
am: 5e261441d3

Change-Id: Ie7c734ca22abad05a4f0800a1dba9553eb7cbfef

commit | commitdiff | tree

Tim Murray [Thu, 30 Jun 2016 18:05:56 +0000 (18:05 +0000)]

Merge "Add a new API to improve VR thread scheduling." into nyc-mr1-dev

commit | commitdiff | tree

Siyamed Sinir [Wed, 29 Jun 2016 23:55:35 +0000 (16:55 -0700)]

Enable Text core tests

Some of the tests were disabled because of the access permissions. This
CL:
* Removes @Suppress annotations
* Annotates the test classes with related annotations such as @SmallTest
* Removes unused imports
* Replaces android.test.sitebuilder.annotation.SmallTest annotations with
android.support.test.filters.SmallTest

Bug: 29879498
Change-Id: I9e6e326bc6eaf365d7d5c6d1f7edec35e6957302

commit | commitdiff | tree

Siyamed Sinir [Thu, 30 Jun 2016 17:54:56 +0000 (17:54 +0000)]

Merge "Visibility fixes for text related tests."

commit | commitdiff | tree

Alan Viverette [Thu, 30 Jun 2016 17:51:03 +0000 (17:51 +0000)]

Merge \"Merge \\\"Only clip PopupWindow in the vertical direction\\\" into nyc-dev am: 4b736ea56d am: bf91103763\" into nyc-mr1-dev-plus-aosp
am: 83a8bdb8b1

Change-Id: I3c4dd3ff0155c02157b8c1df54b99e77987872b6

commit | commitdiff | tree

Alan Viverette [Thu, 30 Jun 2016 17:51:01 +0000 (17:51 +0000)]

Merge \\\"Only clip PopupWindow in the vertical direction\\\" into nyc-dev am: 4b736ea56d am: a2beb44834
am: bb3fc63947

Change-Id: I1ae838346c9125d08987dee62171619d6c96e96b

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 30 Jun 2016 17:44:31 +0000 (17:44 +0000)]

Merge "Merge \\"Only clip PopupWindow in the vertical direction\\" into nyc-dev am: 4b736ea56d am: bf91103763" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Alan Viverette [Thu, 30 Jun 2016 17:43:46 +0000 (17:43 +0000)]

Merge \\"Only clip PopupWindow in the vertical direction\\" into nyc-dev am: 4b736ea56d
am: a2beb44834

Change-Id: I554dcbd9eb011d84a61d49b0d48818d1e9905c00

commit | commitdiff | tree

Alan Viverette [Thu, 30 Jun 2016 17:43:44 +0000 (17:43 +0000)]

Merge \\"Only clip PopupWindow in the vertical direction\\" into nyc-dev am: 4b736ea56d
am: bf91103763

Change-Id: I0fd29b6db29f87ebfd6f900b94b59eb9e21ac942

commit | commitdiff | tree

Alan Viverette [Thu, 30 Jun 2016 17:36:42 +0000 (17:36 +0000)]

Merge \"Merge \\\"Exclude children from excess space distribution when using largest child\\\" into nyc-dev am: 7705d5fd6e am: 176f9cb656\" into nyc-mr1-dev-plus-aosp
am: 9815dcbfd4

Change-Id: I1f4439feb857637c32e5504e2578e4abef3adcee

commit | commitdiff | tree

Alan Viverette [Thu, 30 Jun 2016 17:36:40 +0000 (17:36 +0000)]

Merge \\\"Exclude children from excess space distribution when using largest child\\\" into nyc-dev am: 7705d5fd6e am: 650cc68f10
am: 0c359bad53

Change-Id: I116d4bd532751159c59f8178dead7503e562af85

commit | commitdiff | tree

Alan Viverette [Thu, 30 Jun 2016 17:36:00 +0000 (17:36 +0000)]

Merge \"Only clip PopupWindow in the vertical direction\" into nyc-dev
am: 4b736ea56d

Change-Id: Ic10c4641d90f06b52d34285e42c35ae744f823eb

commit | commitdiff | tree

Alan Viverette [Thu, 30 Jun 2016 17:35:52 +0000 (17:35 +0000)]

Merge \"Only clip PopupWindow in the vertical direction\" into nyc-dev
am: 4b736ea56d

Change-Id: Idf5aedfb2f19595b8317c7dca1640ff0caf31696

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 30 Jun 2016 17:31:49 +0000 (17:31 +0000)]

Merge "Merge \\"Exclude children from excess space distribution when using largest child\\" into nyc-dev am: 7705d5fd6e am: 176f9cb656" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Alan Viverette [Thu, 30 Jun 2016 17:31:20 +0000 (17:31 +0000)]

Merge \\"Exclude children from excess space distribution when using largest child\\" into nyc-dev am: 7705d5fd6e
am: 176f9cb656

Change-Id: I1ea31c0defb8b00a9b15545a826210680de6fbeb

commit | commitdiff | tree

Alan Viverette [Thu, 30 Jun 2016 17:31:11 +0000 (17:31 +0000)]

Merge \\"Exclude children from excess space distribution when using largest child\\" into nyc-dev am: 7705d5fd6e
am: 650cc68f10

Change-Id: I490421dd7f13deda634b669ca7b7bd7a51d2bfdf

commit | commitdiff | tree

Alan Viverette [Thu, 30 Jun 2016 17:24:21 +0000 (17:24 +0000)]

Merge "Only clip PopupWindow in the vertical direction" into nyc-dev

commit | commitdiff | tree

Alan Viverette [Thu, 30 Jun 2016 17:19:43 +0000 (17:19 +0000)]

Merge \"Exclude children from excess space distribution when using largest child\" into nyc-dev
am: 7705d5fd6e

Change-Id: I9a478a5dd666c8c938206e888065dbec976a9e82

commit | commitdiff | tree

Alan Viverette [Thu, 30 Jun 2016 17:19:41 +0000 (17:19 +0000)]

Merge \"Exclude children from excess space distribution when using largest child\" into nyc-dev
am: 7705d5fd6e

Change-Id: I747b4dab5bfc31b2461b445d1d983ac95a05693d

commit | commitdiff | tree

Alan Viverette [Thu, 30 Jun 2016 17:17:26 +0000 (13:17 -0400)]

Only clip PopupWindow in the vertical direction

Bug: 29865091
Change-Id: Ic4e3b50571034f341aff2c2fbf2c349342622448

commit | commitdiff | tree

TreeHugger Robot [Thu, 30 Jun 2016 17:07:06 +0000 (17:07 +0000)]

Merge "Exclude children from excess space distribution when using largest child" into nyc-dev

commit | commitdiff | tree

Srinath Sridharan [Tue, 28 Jun 2016 01:13:47 +0000 (18:13 -0700)]

Add a new API to improve VR thread scheduling.

Adds a new API that enables device-specific scheduler optimizations for
latency-sensitive VR threads.

BUG: 29163534
Change-Id: I58d7be0eb266eca452c804cd07004784fb7daf2b

commit | commitdiff | tree

Yohei Yukawa [Thu, 30 Jun 2016 16:32:54 +0000 (09:32 -0700)]

Remove InputContentInfo#requestPermission()

It turns out that requiring editor authors to call
InputContentInfo#requestPermission() as needed is just confusing and can
cause compatibility issues, because if an editor author forgot to call
that method then there would be no way for IME developers to prevent
permission denial except for relaxing the default permission of the
ContentProvider just because of such an application. This is not what we
want to see.

My conclusion is that the system should automatically call
InputContentInfo#requestPermission() (or do any equivalent operation)
when InputConnection#INPUT_CONTENT_GRANT_READ_URI_PERMISSION is
specified, like we have done in Context#startActivity().

With this CL, the system automatically grants a temporary URI permission
to the target application when the IME calls
InputConnection#commitContent() with
InputConnection#INPUT_CONTENT_GRANT_READ_URI_PERMISSION, and the
temporary permission will be revoked by any of the following events:
- InputContentInfo#releasePermission() is explicitly called by the
   target application.
- The target application returned false in
   InputConnection#commitContent().
- All the InputContentInfo instances copied from the original one are
   GC-ed.

Bug: 29450031
Bug: 29892936
Change-Id: I37fb744e4d3d1c59177fb0a9be4ef5c325c9a39f

commit | commitdiff | tree

Alan Viverette [Thu, 30 Jun 2016 15:15:36 +0000 (11:15 -0400)]

Exclude children from excess space distribution when using largest child

Preserves API 23 behavior.

Bug: 29872769
Change-Id: I514cde81dcca4d78238f407251805cced4c0bea1

commit | commitdiff | tree

Lorenzo Colitti [Thu, 30 Jun 2016 14:43:30 +0000 (14:43 +0000)]

Merge changes I65784f35,Ib6937335 into nyc-mr1-dev am: 74f7f2ec0d
am: e80e63331d

Change-Id: I5cdfe7e952ceb9da89f775f4cd451cc26ed52401

commit | commitdiff | tree

Lorenzo Colitti [Thu, 30 Jun 2016 14:33:25 +0000 (14:33 +0000)]

Merge changes I65784f35,Ib6937335 into nyc-mr1-dev
am: 74f7f2ec0d

Change-Id: Iba950e7837d91f83a9c2bcd7fc8e7b1193038400

commit | commitdiff | tree

TreeHugger Robot [Thu, 30 Jun 2016 14:28:37 +0000 (14:28 +0000)]

Merge changes I65784f35,Ib6937335 into nyc-mr1-dev

* changes:
Add detailed test coverage for lingering.
Add more test coverage for requests and callbacks.

commit | commitdiff | tree

Bill Yi [Thu, 30 Jun 2016 14:21:19 +0000 (14:21 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Bill Yi [Thu, 30 Jun 2016 14:18:28 +0000 (14:18 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Hugo Benichi [Thu, 30 Jun 2016 14:17:41 +0000 (14:17 +0000)]

Merge changes Ia28652e0,Id2eaafdc,I9c4c8286 into nyc-mr1-dev am: f5e3481951
am: 0664017da0

Change-Id: I75a518b8909e5cd85c7554ceaa11dc7519717075

commit | commitdiff | tree

Hugo Benichi [Thu, 30 Jun 2016 14:12:13 +0000 (14:12 +0000)]

Merge changes Ia28652e0,Id2eaafdc,I9c4c8286 into nyc-mr1-dev
am: f5e3481951

Change-Id: Ic853ff8e8e1745821627e796d22daea227bafca2

commit | commitdiff | tree

TreeHugger Robot [Thu, 30 Jun 2016 14:03:20 +0000 (14:03 +0000)]

Merge changes Ia28652e0,Id2eaafdc,I9c4c8286 into nyc-mr1-dev

* changes:
  Record events for RA option lifetimes
  Log RA listening statistics
  Log events at APF program generation

commit | commitdiff | tree

Tobias Thierer [Thu, 30 Jun 2016 13:12:46 +0000 (13:12 +0000)]

Merge \\\\"Changes for upgrade to OkHttp 2.7.5\\\\" am: a31247bd8d am: f6bcab7f97 am: 6b473f7b67
am: 847fe1668e

Change-Id: I02fe28e773df3b328be8c7ea26b0df065014188a

commit | commitdiff | tree

Tobias Thierer [Thu, 30 Jun 2016 13:04:52 +0000 (13:04 +0000)]

Merge \\\"Changes for upgrade to OkHttp 2.7.5\\\" am: a31247bd8d am: f6bcab7f97
am: 6b473f7b67

Change-Id: I3a0dc1da2ee96d71c38cab727141efcb686627e1

commit | commitdiff | tree

Tobias Thierer [Thu, 30 Jun 2016 12:59:22 +0000 (12:59 +0000)]

Merge \\"Changes for upgrade to OkHttp 2.7.5\\" am: a31247bd8d
am: f6bcab7f97

Change-Id: I7a1c9838a22cb7e8228e77bde68283fda57c83d6

commit | commitdiff | tree

Tobias Thierer [Thu, 30 Jun 2016 12:49:47 +0000 (12:49 +0000)]

Merge \"Changes for upgrade to OkHttp 2.7.5\"
am: a31247bd8d

Change-Id: Id79249756929a61dca374f9f1d43d0ea9e6b1280

commit | commitdiff | tree

Lorenzo Colitti [Tue, 28 Jun 2016 12:28:28 +0000 (21:28 +0900)]

Add detailed test coverage for lingering.

Bug: 23113288
Change-Id: I65784f3589378d97f3c824e600f21f361be8741e

commit | commitdiff | tree

Tobias Thierer [Thu, 30 Jun 2016 12:35:03 +0000 (12:35 +0000)]

Merge "Changes for upgrade to OkHttp 2.7.5"

commit | commitdiff | tree

Hugo Benichi [Thu, 23 Jun 2016 01:41:30 +0000 (10:41 +0900)]

Record events for RA option lifetimes

This patch defines a new android.net.metrics.RaEvent class carrying
lifetime values contained in RA packets. RaEvent are recorded when
ApfFilter processes a new RA for which there is no match.

Example:
ConnectivityMetricsEvent(15:39:39.808, 0, 0): RaEvent(lifetimes: router=3600s, prefix_valid=2592000s, prefix_preferred=604800s, route_info=-1s, dnssl=-1s, rdnss=3600s)

Change-Id: Ia28652e03ed442d5f2a686ef5b3fafbcb77c503a

commit | commitdiff | tree

Hugo Benichi [Tue, 7 Jun 2016 06:35:16 +0000 (15:35 +0900)]

Log RA listening statistics

This patch adds a new ApfStats event class that counts RA packet
reception statistics on the RA listener thread of ApfFilter and reports
the maximum program size advertised by hardware.

Statistics are gathered for the lifetime of a network with APF
capabilities and uploaded at network teardown when the listener thread
exits.

Example event:
ConnectivityMetricsEvent(15:44:23.741, 0, 0): ApfStats(284945ms 2048B RA: 2 received, 0 matching, 0 ignored, 0 expired, 0 parse errors, 2 program updates)

Bug: 28204408
Change-Id: Id2eaafdca97f61152a4b66d06061c971bc0aba4c

commit | commitdiff | tree

Hugo Benichi [Thu, 2 Jun 2016 02:20:27 +0000 (11:20 +0900)]

Log events at APF program generation

Example:
ConnectivityMetricsEvent(15:24:52.018, 0, 0): ApfProgramEvent(0/0 RAs 121B forever FLAG_MULTICAST_FILTER_ON)
ConnectivityMetricsEvent(15:24:53.036, 0, 0): ApfProgramEvent(1/1 RAs 334B 600s)
ConnectivityMetricsEvent(15:24:53.590, 0, 0): ApfProgramEvent(1/1 RAs 360B 600s FLAG_MULTICAST_FILTER_ON, FLAG_HAS_IPV4_ADDRESS)
ConnectivityMetricsEvent(15:24:58.157, 0, 0): ApfProgramEvent(1/1 RAs 294B 599s FLAG_HAS_IPV4_ADDRESS)

Bug: 28204408
Change-Id: I9c4c82861cf42eb2c7e7bf5471f05e8ff2fc560c

commit | commitdiff | tree

TreeHugger Robot [Thu, 30 Jun 2016 08:08:27 +0000 (08:08 +0000)]

Merge "Update test expectations."

commit | commitdiff | tree

Jin Seok Park [Thu, 30 Jun 2016 06:39:15 +0000 (06:39 +0000)]

Merge "ExifInterface: Remove dependency on Piex for DNG Test File"

commit | commitdiff | tree

Tyler Gunn [Thu, 30 Jun 2016 06:35:13 +0000 (06:35 +0000)]

Merge \\"Add missing setPulling() method in Connection.\\" into nyc-mr1-dev am: 089e99ee4d
am: 2251dda76b

Change-Id: Id924dc5335527b727c7fde31a581f68dac01808c

commit | commitdiff | tree

TreeHugger Robot [Thu, 30 Jun 2016 06:29:53 +0000 (06:29 +0000)]

Merge "AAPT2: Improve diff command"

commit | commitdiff | tree

Tyler Gunn [Thu, 30 Jun 2016 06:28:37 +0000 (06:28 +0000)]

Merge \"Add missing setPulling() method in Connection.\" into nyc-mr1-dev
am: 089e99ee4d

Change-Id: I91b9b6d6eaf0df8a13245157bfaeeffd0ee84900

commit | commitdiff | tree

Tyler Gunn [Thu, 30 Jun 2016 06:20:41 +0000 (06:20 +0000)]

Merge "Add missing setPulling() method in Connection." into nyc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 30 Jun 2016 06:08:47 +0000 (06:08 +0000)]

Merge "[multi-part] Eliminate 1k selection limit"

commit | commitdiff | tree

Seigo Nonaka [Thu, 30 Jun 2016 06:08:14 +0000 (15:08 +0900)]

Update test expectations.

After Ie49b378250, all emoji can be a part of ZWJ sequence, so need to
update the test expectations.

Bug: 29871956
Change-Id: I89ee3e432b6855c86df187cd36c78e9a4e275b79

commit | commitdiff | tree

Jin Park [Thu, 16 Jun 2016 13:59:20 +0000 (22:59 +0900)]

ExifInterface: Remove dependency on Piex for DNG Test File

This CL removes dependency from Piex for a DNG Test file currently in
ExifInterfaceTest.java.
Specific functions include identifying and setting the byte order of
the data, parsing and saving Exif tags, and retrieving thumbnail
image data and information.
The marker HANDLE_RAW will determine whether to use Piex or not.

Bug: 29409358
Change-Id: I4cd9916ac0c6f294fc44d8b76f52d456aeee8cdc

commit | commitdiff | tree

TreeHugger Robot [Thu, 30 Jun 2016 06:07:15 +0000 (06:07 +0000)]

Merge "Fix Angler search tests."

commit | commitdiff | tree

Erik Kline [Thu, 30 Jun 2016 05:59:11 +0000 (05:59 +0000)]

Merge \\"Make provisioning timeout apply to both IPv4 and IPv6\\" into nyc-mr1-dev am: ce7ff88bc2
am: d2f3c69222

Change-Id: If9bc8dd98898e6a840615884d979b0e6901a2f7e

commit | commitdiff | tree

Erik Kline [Thu, 30 Jun 2016 05:49:28 +0000 (05:49 +0000)]

Merge \"Make provisioning timeout apply to both IPv4 and IPv6\" into nyc-mr1-dev
am: ce7ff88bc2

Change-Id: I4f2f7cf0d51cee4a657a750cfcd58e5638b3fce5

commit | commitdiff | tree

TreeHugger Robot [Thu, 30 Jun 2016 05:41:51 +0000 (05:41 +0000)]

Merge "Make provisioning timeout apply to both IPv4 and IPv6" into nyc-mr1-dev

commit | commitdiff | tree

Tyler Gunn [Thu, 30 Jun 2016 05:35:45 +0000 (22:35 -0700)]

Add missing setPulling() method in Connection.

Change-Id: I89c720b2fa3d3e1304766ba3779410b233a04c6a

commit | commitdiff | tree

Jaewan Kim [Thu, 30 Jun 2016 05:31:58 +0000 (05:31 +0000)]

Merge \\"MediaResourceMonitor: Send broadcast to current users\\" into nyc-mr1-dev am: 7f4f52cb4c
am: 60b85827ab

Change-Id: Ie7b2e22c866fde26a4ee99e8b168b5fdbfd21d80

commit | commitdiff | tree

Jaewan Kim [Thu, 30 Jun 2016 05:27:55 +0000 (05:27 +0000)]

Merge \"MediaResourceMonitor: Send broadcast to current users\" into nyc-mr1-dev
am: 7f4f52cb4c

Change-Id: I9a35cebe9e4d645733e71b82b52a2c7d5e6c0e84

commit | commitdiff | tree

Jaewan Kim [Thu, 30 Jun 2016 05:21:26 +0000 (05:21 +0000)]

Merge "MediaResourceMonitor: Send broadcast to current users" into nyc-mr1-dev

commit | commitdiff | tree

Adam Lesinski [Mon, 27 Jun 2016 23:21:42 +0000 (16:21 -0700)]

AAPT2: Improve diff command

Change-Id: Ia1e2f8482c7192ef50126b61bed7975297332767

commit | commitdiff | tree

TreeHugger Robot [Thu, 30 Jun 2016 04:49:46 +0000 (04:49 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Steve McKay [Wed, 29 Jun 2016 23:01:39 +0000 (16:01 -0700)]

Fix Angler search tests.

Use a matcher compatible with all devices.
Move constant matchers into respective Bot files.
Suppress testCreateDir test which is failing *ALOT*.

Change-Id: I67d41d54bc36648ed4d7384a046ee4c9c20d753b

commit | commitdiff | tree

Lorenzo Colitti [Mon, 27 Jun 2016 07:44:07 +0000 (16:44 +0900)]

Add more test coverage for requests and callbacks.

1. Support multiple callbacks in TestNetworkCallback. This is
   necessary to test situations where multiple callbacks are
   generated by the same event (e.g., CALLBACK_LOSING on cell
   with CALLBACK_AVAILABLE on wifi when wifi connects), which is
   necessary to test callback order. So far this has not been
   covered because all callback testing was using per-network
   callbacks.
2. Add a benchmark test for registering NetworkRequests and for
   sending onAvailable and onLosing callbacks.

Bug: 23113288
Change-Id: Ib69373358ad766ab1bd989e864a5a51ef762c73c

commit | commitdiff | tree

Erik Kline [Tue, 28 Jun 2016 02:40:07 +0000 (11:40 +0900)]

Make provisioning timeout apply to both IPv4 and IPv6

Bug: 29449295
Change-Id: I743533ca61914c11163ba5c5767a365def3a5461

commit | commitdiff | tree

TreeHugger Robot [Thu, 30 Jun 2016 03:51:17 +0000 (03:51 +0000)]

Merge "AAPT2: Add version collapsing"

commit | commitdiff | tree

Bill Yi [Thu, 30 Jun 2016 03:36:26 +0000 (03:36 +0000)]

Merge \"Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: bb07b0b372 -s ours am: 847dcc9f4e -s ours\" into nyc-mr1-dev-plus-aosp
am: 1e0f58aca5 -s ours

Change-Id: I7583e199bae86dffa6f54c9a6aea8b57957b7c78

commit | commitdiff | tree

Bill Yi [Thu, 30 Jun 2016 03:36:23 +0000 (03:36 +0000)]

Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: bb07b0b372 -s ours am: 791de14f4c -s ours
am: 2a99d01323 -s ours

Change-Id: Ib651481c44029ee84fc43004a4b8d958424369c1

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 30 Jun 2016 03:30:08 +0000 (03:30 +0000)]

Merge "Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: bb07b0b372 -s ours am: 847dcc9f4e -s ours" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Bill Yi [Thu, 30 Jun 2016 03:29:53 +0000 (03:29 +0000)]

Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: c4376b5fae -s ours
am: 54e04be817 -s ours

Change-Id: I5a92ee13433b1ef7f2c12a302fc8c50b93620c6d

commit | commitdiff | tree

Bill Yi [Thu, 30 Jun 2016 03:29:50 +0000 (03:29 +0000)]

Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 285c920428 -s ours
am: 09e2617bd4 -s ours

Change-Id: If3359d2d4a78d3db6d439e488586ac15e86cd78f

commit | commitdiff | tree

Bill Yi [Thu, 30 Jun 2016 03:29:48 +0000 (03:29 +0000)]

Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 8c9d0dbeda -s ours
am: 5abcce865e -s ours

Change-Id: If70b60d90262aa98775d2ba6929c48a2de70cf51

commit | commitdiff | tree

Bill Yi [Thu, 30 Jun 2016 03:29:45 +0000 (03:29 +0000)]

Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: bb07b0b372 -s ours
am: 847dcc9f4e -s ours

Change-Id: I940c75e30425862896c1727b4717388f7bdacbd8

commit | commitdiff | tree

Bill Yi [Thu, 30 Jun 2016 03:28:59 +0000 (03:28 +0000)]

Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: bb07b0b372 -s ours
am: 791de14f4c -s ours

Change-Id: I1a04ddb396b18178af5d05b38b7174b0fe5394cc

commit | commitdiff | tree

Bill Yi [Thu, 30 Jun 2016 03:24:30 +0000 (03:24 +0000)]

Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: c4376b5fae -s ours

Change-Id: Ic39f504b2dd5931efdc00025c79dc79bda3acd00

commit | commitdiff | tree

Bill Yi [Thu, 30 Jun 2016 03:24:25 +0000 (03:24 +0000)]

Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: 285c920428 -s ours

Change-Id: Ifeb849460ba1e1223233911170c5c8ed9334c007

commit | commitdiff | tree

Bill Yi [Thu, 30 Jun 2016 03:23:54 +0000 (03:23 +0000)]

Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: bb07b0b372 -s ours

Change-Id: Ibc2fb6d61c5e391b9804411bd6e0d1f646766910

commit | commitdiff | tree

Bill Yi [Thu, 30 Jun 2016 03:23:51 +0000 (03:23 +0000)]

Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: bb07b0b372 -s ours

Change-Id: I3b4ad7bc8c424e58daddb1d5f16d338f35636eb6