OSDN Git Service
Dianne Hackborn [Tue, 13 Jun 2017 22:08:38 +0000 (22:08 +0000)]
Merge "Fix issue #
62390590: SecurityException in JobIntentService$..." into oc-dev am:
69c3a1d45a
am:
1e41816eb0
Change-Id: I60aadf3d73de86b4e83dc0fa228e1ac9a21db86f
Christopher Tate [Tue, 13 Jun 2017 22:04:09 +0000 (22:04 +0000)]
Merge "Send ACTION_SHUTDOWN broadcast to manifest receivers" into oc-dev am:
630a49aa4e
am:
2e135c25a4
Change-Id: Ic991aac29d91f82aefe2d5a1a0e1b9d1b370ab9b
Dianne Hackborn [Tue, 13 Jun 2017 21:59:47 +0000 (21:59 +0000)]
Merge "Fix issue #
62390590: SecurityException in JobIntentService$..." into oc-dev
am:
69c3a1d45a
Change-Id: I71017d8fd6efee24d437f66b2c5be34068bd3dfc
Android Build Merger (Role) [Tue, 13 Jun 2017 21:59:22 +0000 (21:59 +0000)]
Merge "Merge "Send ACTION_SHUTDOWN broadcast to manifest receivers" into oc-dev am:
630a49aa4e am:
f03738d877" into oc-dr1-dev-plus-aosp
Christopher Tate [Tue, 13 Jun 2017 21:58:06 +0000 (21:58 +0000)]
Merge "Send ACTION_SHUTDOWN broadcast to manifest receivers" into oc-dev am:
630a49aa4e
am:
f03738d877
Change-Id: I7738d29f74995122533b16ecb82819f125a9bdd9
Android Build Merger (Role) [Tue, 13 Jun 2017 21:57:21 +0000 (21:57 +0000)]
Merge "Merge "Fix sysui depending on slow bt calls" into oc-dev am:
02d5b79cf6 am:
304f3a74be" into oc-dr1-dev-plus-aosp
Jason Monk [Tue, 13 Jun 2017 21:55:11 +0000 (21:55 +0000)]
Merge "Fix sysui depending on slow bt calls" into oc-dev am:
02d5b79cf6
am:
4764f7b5b5
Change-Id: I794a40787c56048b1b0af502470621ff799a1eef
Jason Monk [Tue, 13 Jun 2017 21:54:34 +0000 (21:54 +0000)]
Merge "Fix sysui depending on slow bt calls" into oc-dev am:
02d5b79cf6
am:
304f3a74be
Change-Id: I2d863f2db0576b04fbbcec0c81fffb354833af1c
TreeHugger Robot [Tue, 13 Jun 2017 21:51:46 +0000 (21:51 +0000)]
Merge "Fix issue #
62390590: SecurityException in JobIntentService$..." into oc-dev
Christopher Tate [Tue, 13 Jun 2017 21:47:20 +0000 (21:47 +0000)]
Merge "Send ACTION_SHUTDOWN broadcast to manifest receivers" into oc-dev
am:
630a49aa4e
Change-Id: I2fc48a0117c021ed415ecb06efffb2e41ce567a1
Christopher Tate [Tue, 13 Jun 2017 21:47:03 +0000 (21:47 +0000)]
Merge "Send ACTION_SHUTDOWN broadcast to manifest receivers" into oc-dev
am:
630a49aa4e
Change-Id: Ib2a4229a6b00810b9dd73733421f3ac7e57f2112
Jason Monk [Tue, 13 Jun 2017 21:44:03 +0000 (21:44 +0000)]
Merge "Fix sysui depending on slow bt calls" into oc-dev
am:
02d5b79cf6
Change-Id: I9a1dbc2f382562fb8ced63fd70f1a5e1674285f0
Jason Monk [Tue, 13 Jun 2017 21:43:35 +0000 (21:43 +0000)]
Merge "Fix sysui depending on slow bt calls" into oc-dev
am:
02d5b79cf6
Change-Id: If250b772445628e26fd73d0c81f31ea89e74f7fa
Chad Brubaker [Tue, 13 Jun 2017 21:40:44 +0000 (21:40 +0000)]
Merge "Remove stopship workaround for instant app targetSdkVersion" into oc-dev am:
4a0ea3e88f
am:
bfd7cc4dbb
Change-Id: Ia50be57d9203381f39c739dddd3b52a35b761cea
TreeHugger Robot [Tue, 13 Jun 2017 21:36:45 +0000 (21:36 +0000)]
Merge "Send ACTION_SHUTDOWN broadcast to manifest receivers" into oc-dev
Chad Brubaker [Tue, 13 Jun 2017 21:36:27 +0000 (21:36 +0000)]
Merge "Remove stopship workaround for instant app targetSdkVersion" into oc-dev am:
4a0ea3e88f
am:
6d1b84bc3f
Change-Id: I6e307ac5b38732d69d6eeeed7fa155db3d215fe1
TreeHugger Robot [Tue, 13 Jun 2017 21:32:28 +0000 (21:32 +0000)]
Merge "Fix sysui depending on slow bt calls" into oc-dev
Evan Laird [Tue, 13 Jun 2017 21:30:58 +0000 (21:30 +0000)]
Merge "Change SlashDrawable semantics to fix QS crash" into oc-dr1-dev
am:
70cb08326e
Change-Id: I18d0e0af532749e7b6fcf60a69e1dfd81b70c2d9
Chad Brubaker [Tue, 13 Jun 2017 21:29:45 +0000 (21:29 +0000)]
Merge "Remove stopship workaround for instant app targetSdkVersion" into oc-dev
am:
4a0ea3e88f
Change-Id: Id7b7326f819c9e0389c3ad9db2863e72ec716f83
Chad Brubaker [Tue, 13 Jun 2017 21:28:37 +0000 (21:28 +0000)]
Merge "Remove stopship workaround for instant app targetSdkVersion" into oc-dev
am:
4a0ea3e88f
Change-Id: I5dcc03662ab5babbfc5559257b1ecdf9568c9d49
Android Build Merger (Role) [Tue, 13 Jun 2017 21:27:11 +0000 (21:27 +0000)]
Merge "Merge "Binder: Add more logging on Error" into oc-dev am:
ab934ae8e6 am:
807c9ae55f" into oc-dr1-dev-plus-aosp
Andreas Gampe [Tue, 13 Jun 2017 21:24:03 +0000 (21:24 +0000)]
Merge "Binder: Add more logging on Error" into oc-dev am:
ab934ae8e6
am:
807c9ae55f
Change-Id: I510c04b8628453f37ce6098573e23e7c3e4bc29e
Andreas Gampe [Tue, 13 Jun 2017 21:23:05 +0000 (21:23 +0000)]
Merge "Binder: Add more logging on Error" into oc-dev am:
ab934ae8e6
am:
8767655272
Change-Id: I5c77433743214db21d5d3f2992430ec8bbab7151
TreeHugger Robot [Tue, 13 Jun 2017 21:19:14 +0000 (21:19 +0000)]
Merge "Change SlashDrawable semantics to fix QS crash" into oc-dr1-dev
Chad Brubaker [Tue, 13 Jun 2017 21:18:23 +0000 (21:18 +0000)]
Merge "Remove stopship workaround for instant app targetSdkVersion" into oc-dev
Andreas Gampe [Tue, 13 Jun 2017 21:14:52 +0000 (21:14 +0000)]
Merge "Binder: Add more logging on Error" into oc-dev
am:
ab934ae8e6
Change-Id: I6e320f34429c82ece01a946ecda96cf17252a701
Andreas Gampe [Tue, 13 Jun 2017 21:12:33 +0000 (21:12 +0000)]
Merge "Binder: Add more logging on Error" into oc-dev
am:
ab934ae8e6
Change-Id: I7cdc522995f3b10d70cd6dced7dd4850eb542c71
Robert Greenwalt [Tue, 13 Jun 2017 21:11:43 +0000 (21:11 +0000)]
Merge "Add updateMethod callback" am:
a0974dbc0f am:
7791ac2e28
am:
01712b1aa6
Change-Id: I4b5b26081030f71e90022495e7a5cbb7811e5974
TreeHugger Robot [Tue, 13 Jun 2017 21:03:38 +0000 (21:03 +0000)]
Merge "Binder: Add more logging on Error" into oc-dev
Android Build Merger (Role) [Tue, 13 Jun 2017 20:59:52 +0000 (20:59 +0000)]
Merge "Merge "remove the lock-use for prunePrintService in case blocking main thread" am:
b124bea782 am:
60246acdbf am:
a76f1cbd1d" into oc-dr1-dev-plus-aosp
yangbingqian [Tue, 13 Jun 2017 20:59:12 +0000 (20:59 +0000)]
Merge "remove the lock-use for prunePrintService in case blocking main thread" am:
b124bea782 am:
60246acdbf
am:
a76f1cbd1d
Change-Id: I952759d6fcf072f36b7cf0a896eeb03702b6014d
Robert Greenwalt [Tue, 13 Jun 2017 20:59:09 +0000 (20:59 +0000)]
Merge "Add updateMethod callback" am:
a0974dbc0f
am:
7791ac2e28
Change-Id: I3402217fddc77d03b191ac7af0d938c6fa931486
Tyler Gunn [Tue, 13 Jun 2017 20:55:58 +0000 (20:55 +0000)]
Merge "Add EXTRA_HANDOVER_FROM_PHONE_ACCOUNT." into oc-dr1-dev
am:
48962fcc3b
Change-Id: I6734494a42629f67829cb93e6d11d1b11277d3fb
Robert Greenwalt [Tue, 13 Jun 2017 20:51:39 +0000 (20:51 +0000)]
Merge "Add updateMethod callback"
am:
a0974dbc0f
Change-Id: I9dc2564d0856db617c0deb6bff35ca3cf6b6010c
Pankaj Kanwar [Tue, 13 Jun 2017 20:50:15 +0000 (20:50 +0000)]
Merge "Radio Interface changes to pass the encryption object, including the key,to the modem." am:
aadb414f02 am:
717b5bf3e0
am:
8532bc3b59
Change-Id: Idd49ae115d660cb21ed7baf4e66f5ec0f89e3e53
Tyler Gunn [Tue, 13 Jun 2017 20:48:12 +0000 (20:48 +0000)]
Merge "Add EXTRA_HANDOVER_FROM_PHONE_ACCOUNT." into oc-dr1-dev
yangbingqian [Tue, 13 Jun 2017 20:48:10 +0000 (20:48 +0000)]
Merge "remove the lock-use for prunePrintService in case blocking main thread" am:
b124bea782
am:
60246acdbf
Change-Id: If773ac8166bee1e92168f4df7a9de2dd7cea190f
yangbingqian [Tue, 13 Jun 2017 20:41:03 +0000 (20:41 +0000)]
Merge "remove the lock-use for prunePrintService in case blocking main thread"
am:
b124bea782
Change-Id: Ie93b79dfff5787cb9835c4ba86e3aa586e0d2ad8
Robert Greenwalt [Tue, 13 Jun 2017 20:38:49 +0000 (20:38 +0000)]
Merge "Add updateMethod callback"
Pankaj Kanwar [Tue, 13 Jun 2017 20:38:46 +0000 (20:38 +0000)]
Merge "Radio Interface changes to pass the encryption object, including the key,to the modem." am:
aadb414f02
am:
717b5bf3e0
Change-Id: I8133ca2e269f74dd2c7b8a17f81de24567fcdc2e
Treehugger Robot [Tue, 13 Jun 2017 20:30:37 +0000 (20:30 +0000)]
Merge "remove the lock-use for prunePrintService in case blocking main thread"
Pankaj Kanwar [Tue, 13 Jun 2017 20:30:36 +0000 (20:30 +0000)]
Merge "Radio Interface changes to pass the encryption object, including the key,to the modem."
am:
aadb414f02
Change-Id: I2f2189aa6483dfe17fe6ed7f42e8b23166c67444
Pankaj Kanwar [Tue, 13 Jun 2017 20:22:22 +0000 (20:22 +0000)]
Merge "Radio Interface changes to pass the encryption object, including the key,to the modem."
Christopher Tate [Tue, 13 Jun 2017 19:11:09 +0000 (12:11 -0700)]
Send ACTION_SHUTDOWN broadcast to manifest receivers
Fix #
36767224
Test: manual
Change-Id: If8f1fa986b9b8f3c426e4c0623bbca6f96b7199c
Adrian Roos [Tue, 13 Jun 2017 19:25:52 +0000 (19:25 +0000)]
Merge "AOD: Use double tap coordinates to trigger Ambient Indication" into oc-dr1-dev
am:
2402522553
Change-Id: I22486ede65b6a07683cea4b8f5c48de94ae7a148
TreeHugger Robot [Tue, 13 Jun 2017 19:17:37 +0000 (19:17 +0000)]
Merge "AOD: Use double tap coordinates to trigger Ambient Indication" into oc-dr1-dev
Android Build Merger (Role) [Tue, 13 Jun 2017 19:09:50 +0000 (19:09 +0000)]
Merge "Merge "Binder: Add more logging on Error" am:
d9f3a3cf37 am:
e3bda6170d am:
6d908413bd" into oc-dr1-dev-plus-aosp
Evan Laird [Tue, 13 Jun 2017 19:09:21 +0000 (15:09 -0400)]
Change SlashDrawable semantics to fix QS crash
SlashDrawable wraps a reference to Drawable in order to store the
intended Drawable and optionally draw a slash over it. As such, it
should probably have similar semantics to Drawable, in that it either
exists or doesn't; if you set SlashImageView's drawable to `null`, you'd
expect that the drawable goes away, not that the SlashDrawable's
contained Drawable goes away but the slash stays.
Test: runtest systemui
Change-Id: I34b92716cc60ba5043ab68ae09954f5a5e97e562
Fixes:
62525439
Andreas Gampe [Tue, 13 Jun 2017 19:08:54 +0000 (19:08 +0000)]
Merge "Binder: Add more logging on Error" am:
d9f3a3cf37 am:
e3bda6170d
am:
6d908413bd
Change-Id: I828b2dca2109334d27f43f9bc04c00214d14ba1e
Android Build Merger (Role) [Tue, 13 Jun 2017 19:08:22 +0000 (19:08 +0000)]
Merge "Merge "Address issues surrounding freezing by display." into oc-dev am:
8ab4d11145 am:
c717e603b1" into oc-dr1-dev-plus-aosp
Bryce Lee [Tue, 13 Jun 2017 19:07:25 +0000 (19:07 +0000)]
Merge "Address issues surrounding freezing by display." into oc-dev am:
8ab4d11145
am:
c717e603b1
Change-Id: I584661bb20175ef11e761ce87c629de9f7b29dc6
Bryce Lee [Tue, 13 Jun 2017 19:03:56 +0000 (19:03 +0000)]
Merge "Address issues surrounding freezing by display." into oc-dev am:
8ab4d11145
am:
fb385a6c15
Change-Id: I384de2479a69df5a6463586d87eb3cd5b2eebcbe
Andreas Gampe [Tue, 13 Jun 2017 19:02:21 +0000 (19:02 +0000)]
Merge "Binder: Add more logging on Error" am:
d9f3a3cf37
am:
e3bda6170d
Change-Id: Iec158813e6892fba5449219e32a7201fae142037
Bryce Lee [Tue, 13 Jun 2017 18:56:53 +0000 (18:56 +0000)]
Merge "Address issues surrounding freezing by display." into oc-dev
am:
8ab4d11145
Change-Id: If9ec8e8492ed8249cc99dfe05e97a0cf62ff8dd8
Bryce Lee [Tue, 13 Jun 2017 18:56:52 +0000 (18:56 +0000)]
Merge "Address issues surrounding freezing by display." into oc-dev
am:
8ab4d11145
Change-Id: I5eec6ff604056b7095ac07afd9721a5223a584d8
Bryce Lee [Tue, 13 Jun 2017 18:50:57 +0000 (18:50 +0000)]
Merge "Address issues surrounding freezing by display." into oc-dev
Andreas Gampe [Tue, 13 Jun 2017 18:45:27 +0000 (18:45 +0000)]
Merge "Binder: Add more logging on Error"
am:
d9f3a3cf37
Change-Id: I58eb483fff9fa9c4f2519fbd842172f48f1052e9
Andreas Gampe [Tue, 13 Jun 2017 18:34:45 +0000 (18:34 +0000)]
Merge "Binder: Add more logging on Error"
Dianne Hackborn [Tue, 13 Jun 2017 17:33:19 +0000 (10:33 -0700)]
Fix issue #
62390590: SecurityException in JobIntentService$...
...JobServiceEngineImpl$WrapperWorkItem.complete
When a job is in the process of stopping a job, we should no
longer allow new work to be dispatched for it.
Also there was an issue with how we determine wether a caller
is valid for the current job -- this was only based on the uid
of the currently running job, but of course that context could
be re-used for a new job of the same uid. Instead, we now create
a different callback binder for each client, so we can identify
the exact client each time it calls back. (This also allows us
to hang information about why the job last stopped on that
client state, so we can always report it.)
Finally make a bunch of classes final that should have been.
Test: bit CtsJobSchedulerTestCases:*
Change-Id: I1b00dd2da710414dd2898c4d39a5c528d54b95ea
Tyler Gunn [Fri, 26 May 2017 20:30:09 +0000 (13:30 -0700)]
Add EXTRA_HANDOVER_FROM_PHONE_ACCOUNT.
Used in handovers to tell the account we're handing over to which account
the call is from.
Test: Manual
Bug:
38027075
Change-Id: I9b61a5fce3e4f7344174a1b81f4964ca02b71ccd
Adrian Roos [Fri, 2 Jun 2017 19:50:38 +0000 (12:50 -0700)]
AOD: Use double tap coordinates to trigger Ambient Indication
Bug:
38386446
Test: Double tap on AOD, verify that it still works. On device that supports double tap coordinates, verify that double tapping on ambient music opens ambient music.
Change-Id: Ic75ba731a980c9598c85927e83d2032f01da4822
(cherry picked from commit
44198f5124743f0d603eb4efa3b436bd96f32144)
Jason Monk [Tue, 13 Jun 2017 16:49:55 +0000 (12:49 -0400)]
Fix sysui depending on slow bt calls
Move calls to a background thread and cache the results to avoid
slowing down sysui when there are too many bluetooth devices.
Test: runtest systemui
Change-Id: Ica10e86ca6b2783c30ed9de68f1a91dc5cfdf068
Fixes:
38118549
Andreas Gampe [Mon, 12 Jun 2017 17:43:05 +0000 (10:43 -0700)]
Binder: Add more logging on Error
Try to add the Error's message to the abort, so that it shows up
when the logcat is missing.
Sample message:
'jni_internal.cc:508] JNI FatalError called: java.lang.Error thrown during binder transaction: java.lang.LinkageError: This is a test.'
(cherry picked from commit
58383ba095f552a58ed416736fe049126c647ffd)
Bug:
62514767
Test: m
Change-Id: I12026bb7a8ec9438db493f135ed5d0177187f702
Narayan Kamath [Tue, 13 Jun 2017 15:53:15 +0000 (15:53 +0000)]
Merge changes I73ae8de1,I58260902 am:
6f11744adc am:
a506180804
am:
d1941e51a6
Change-Id: I0b5e2850cd3710638660d0c58ed7c9cde869726f
Narayan Kamath [Tue, 13 Jun 2017 15:45:48 +0000 (15:45 +0000)]
Merge changes I73ae8de1,I58260902 am:
6f11744adc
am:
a506180804
Change-Id: I572de6f022670cd14223ada2f5fe6cf6f7a87a98
Narayan Kamath [Tue, 13 Jun 2017 15:38:42 +0000 (15:38 +0000)]
Merge changes I73ae8de1,I58260902
am:
6f11744adc
Change-Id: I9b47ae1d3953280a627584902b3bc099e1f907c8
pkanwar [Mon, 22 May 2017 22:23:38 +0000 (15:23 -0700)]
Radio Interface changes to pass the encryption object, including the
key,to the modem.
We will now pass the ImsiEncryptionInfo object which includes mnc/mcc.
BUG:
35606429
Test: manual
Change-Id: Idf835d9b99a26cb0c0d73fb70ffa9875843ac62b
Treehugger Robot [Tue, 13 Jun 2017 15:27:09 +0000 (15:27 +0000)]
Merge changes I73ae8de1,I58260902
* changes:
Binder: Log details of pending exception.
Binder: Be forceful about a forceful exit.
Bryce Lee [Mon, 12 Jun 2017 21:12:29 +0000 (14:12 -0700)]
Address issues surrounding freezing by display.
The first issue is the animating a display as a consequence of the
freezing due to configuration change during construction. This
additional animation is not expected and interferes with tests
expecting for the original display contents to be shown intact. This
CL addresses the issue by not freezing while the display is not ready
(before construction is finished).
The second problem addressed is book-keeping for
DisplayContentsAnimators in WindowAnimator. Currently, a getter
method is used internally to reference these animators, which
generates them if not present and adds them to the animation
iteration. In the case we set an animation on a display that no
longer exists (which can be the case after unfreezing), we end up
recreating this object. This can lead to us trying to animate a
non-existent DisplayContent. This CL prevents creating an animator
for a non-existent display and adjusts the methods using this getter
to handle this case.
Fixes:
62460846
Fixes:
62461229
Bug:
35486733
Bug:
62541591
Test: go/wm-smoke
Test: open and close projected android auto mode repeatedly and
ensure display correctness
Test: cts-tradefed run singleCommand cts-dev --module CtsMediaTestCases --test android.media.cts.EncodeVirtualDisplayTest#testEncodeVirtualDisplay
Change-Id: I60ade6f97440c8fa01b10e36c019865cf1fd0730
Android Build Merger (Role) [Tue, 13 Jun 2017 10:52:24 +0000 (10:52 +0000)]
Merge "Merge "Eagerly serialize historical sessions" into oc-dev am:
c7ea7effde am:
7ba9c4dc62" into oc-dr1-dev-plus-aosp
Narayan Kamath [Tue, 13 Jun 2017 10:50:44 +0000 (10:50 +0000)]
Merge "Eagerly serialize historical sessions" into oc-dev am:
c7ea7effde
am:
17652d85ec
Change-Id: Ieb233fb57cddf68e282779ce0eb193abd1300de6
Narayan Kamath [Tue, 13 Jun 2017 10:50:43 +0000 (10:50 +0000)]
Merge "Eagerly serialize historical sessions" into oc-dev am:
c7ea7effde
am:
7ba9c4dc62
Change-Id: I57639e4d18b04adf94d4da235cce5e957e88641e
Narayan Kamath [Tue, 13 Jun 2017 10:40:48 +0000 (10:40 +0000)]
Merge "Eagerly serialize historical sessions" into oc-dev
am:
c7ea7effde
Change-Id: Ice68d0de34795a23d9d7364244d564bc48a7d436
Narayan Kamath [Tue, 13 Jun 2017 10:40:46 +0000 (10:40 +0000)]
Merge "Eagerly serialize historical sessions" into oc-dev
am:
c7ea7effde
Change-Id: Iff55674bc989986e14d0bcea3c71bad5751d4dcb
Narayan Kamath [Tue, 13 Jun 2017 10:32:22 +0000 (10:32 +0000)]
Merge "Eagerly serialize historical sessions" into oc-dev
Narayan Kamath [Mon, 12 Jun 2017 12:34:29 +0000 (13:34 +0100)]
Eagerly serialize historical sessions
mHistoricalSessions maintained a strong reference to a PackageInstallerSession,
which in turn kept references to Bitmaps and other heavy-weight objects around.
Since this field is primarily used for debugging, this change replaces it with
a String dump of the session in question. Each dump takes about 600bytes, which
is comparable to the sizes of the un-serialized raw objects.
Bug:
62485552
Test: Manual
Change-Id: I4949a64b538ab4a97384f4f8bc9a6ef155a4b128
Erik Kline [Tue, 13 Jun 2017 08:42:44 +0000 (08:42 +0000)]
Merge "make UpsreamNetworkMonitor the sole source of upstream network information" am:
30a1cf96bb am:
cfaeabb3e3
am:
4bcce2b2ef
Change-Id: Ifeb49f1b19ab36e438763b569c78a335b094f7d0
Erik Kline [Tue, 13 Jun 2017 08:36:14 +0000 (08:36 +0000)]
Merge "make UpsreamNetworkMonitor the sole source of upstream network information" am:
30a1cf96bb
am:
cfaeabb3e3
Change-Id: Idfebb9b79074f21aeccf773cac98aa7839bda9da
Erik Kline [Tue, 13 Jun 2017 08:29:06 +0000 (08:29 +0000)]
Merge "make UpsreamNetworkMonitor the sole source of upstream network information"
am:
30a1cf96bb
Change-Id: I0f7234363f94694ecc4e97d87c7ffb6bb244895d
Erik Kline [Tue, 13 Jun 2017 08:20:40 +0000 (08:20 +0000)]
Merge "make UpsreamNetworkMonitor the sole source of upstream network information"
Adam Vartanian [Tue, 13 Jun 2017 08:19:16 +0000 (08:19 +0000)]
Merge "DO NOT MERGE Remove createSocket(Socket, InputStream, boolean) from APIs." into oc-dr1-dev
am:
87587fbda2
Change-Id: I669d80114ed83231205da0a608ee8e7cdfa8956c
Adam Vartanian [Tue, 13 Jun 2017 08:13:28 +0000 (08:13 +0000)]
Merge "DO NOT MERGE Remove createSocket(Socket, InputStream, boolean) from APIs." into oc-dr1-dev
Erik Kline [Tue, 13 Jun 2017 03:41:18 +0000 (03:41 +0000)]
Merge "Only disable Wi-Fi IP serving on specific interface, if available" am:
6428e1a4d4 am:
e675273dbc
am:
e13b93c585
Change-Id: Iac19359fd8712fa6a135f31bed9f0da97b3f2977
Erik Kline [Tue, 13 Jun 2017 03:34:55 +0000 (03:34 +0000)]
Merge "Only disable Wi-Fi IP serving on specific interface, if available" am:
6428e1a4d4
am:
e675273dbc
Change-Id: I99b170ebacc4135d1a09ce1ec3d43f76c6765de4
Erik Kline [Tue, 13 Jun 2017 03:25:12 +0000 (03:25 +0000)]
Merge "Only disable Wi-Fi IP serving on specific interface, if available"
am:
6428e1a4d4
Change-Id: I51f2e1864f5aaf1369e980f44537ab4f4a0e703e
Treehugger Robot [Tue, 13 Jun 2017 03:13:18 +0000 (03:13 +0000)]
Merge "Only disable Wi-Fi IP serving on specific interface, if available"
Erik Kline [Fri, 9 Jun 2017 08:08:52 +0000 (17:08 +0900)]
make UpsreamNetworkMonitor the sole source of upstream network information
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Change-Id: I66ce682cf9c31887264a095a4e4638d281d8ed39
Android Build Merger (Role) [Tue, 13 Jun 2017 02:41:43 +0000 (02:41 +0000)]
Merge "Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
7fc501184a -s ours" into oc-dr1-dev am:
2eb4ec0e72 -s ours" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 13 Jun 2017 02:41:01 +0000 (02:41 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
7fc501184a -s ours am:
15094560a4 -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Tue, 13 Jun 2017 02:40:48 +0000 (02:40 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
7fc501184a -s ours" into oc-dr1-dev
am:
2eb4ec0e72 -s ours
Change-Id: I2447e12325c6ef7d6152c17c1b7a6236b0aae313
Bill Yi [Tue, 13 Jun 2017 02:38:30 +0000 (02:38 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
7fc501184a -s ours
am:
15094560a4 -s ours
Change-Id: I515e92a539513b308fc79ae7127d074819bc3a73
Bill Yi [Tue, 13 Jun 2017 02:38:29 +0000 (02:38 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
34cfd78f8e -s ours
Change-Id: Iccdd50aca254ad54a1c34ec3dd1d37d494f04f7f
Android Build Merger (Role) [Tue, 13 Jun 2017 02:32:13 +0000 (02:32 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
7fc501184a -s ours" into oc-dr1-dev
Bill Yi [Tue, 13 Jun 2017 02:31:28 +0000 (02:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
7fc501184a -s ours
Change-Id: I62669a422c38856f0d164a149f6415e59e2b81d4
TreeHugger Robot [Tue, 13 Jun 2017 02:31:23 +0000 (02:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Tue, 13 Jun 2017 02:30:19 +0000 (02:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
7fc501184a -s ours
Change-Id: I418c08d5f5bf997d7e870bafc2a0b68f519dd990
Bill Yi [Tue, 13 Jun 2017 02:30:08 +0000 (02:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
1190614529 -s ours
Change-Id: Ide4638e5f3a11cc9457cf9ddbf61ecf748967491
Erik Kline [Fri, 9 Jun 2017 07:36:29 +0000 (16:36 +0900)]
Only disable Wi-Fi IP serving on specific interface, if available
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Change-Id: Ifd9131bad20810ee24c9436d8c0df7a81fae11d5
TreeHugger Robot [Tue, 13 Jun 2017 02:20:34 +0000 (02:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Tue, 13 Jun 2017 02:18:42 +0000 (02:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev