OSDN Git Service
Tyler Gunn [Tue, 13 Jun 2017 22:18:22 +0000 (22:18 +0000)]
Merge "Add EXTRA_HANDOVER_FROM_PHONE_ACCOUNT." into oc-dr1-dev am:
48962fcc3b
am:
4998896d22
Change-Id: I60ba08e839f5fc4c1a27694b42dbba7ea97318a0
Pankaj Kanwar [Tue, 13 Jun 2017 22:13:57 +0000 (22:13 +0000)]
Merge "Radio Interface changes to pass the encryption object, including the key,to the modem." am:
aadb414f02 am:
717b5bf3e0 am:
8532bc3b59
am:
f13b8a78f6 -s ours
Change-Id: I4e426aaf8a9aead120a77722659f5aef7fa110d8
TreeHugger Robot [Tue, 13 Jun 2017 21:57:40 +0000 (21:57 +0000)]
Merge "KEY_INTENT shouldn't grant permissions."
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
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
Adam Lesinski [Tue, 13 Jun 2017 20:48:19 +0000 (20:48 +0000)]
Merge "AAPT2: Disable locale domination for deduping"
Tyler Gunn [Tue, 13 Jun 2017 20:48:12 +0000 (20:48 +0000)]
Merge "Add EXTRA_HANDOVER_FROM_PHONE_ACCOUNT." into oc-dr1-dev
TreeHugger Robot [Tue, 13 Jun 2017 20:46:48 +0000 (20:46 +0000)]
Merge "ASM Priority Boost Tool"
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
Alan Viverette [Tue, 13 Jun 2017 20:33:16 +0000 (20:33 +0000)]
Merge "Federate platform docs against support library API file"
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."
Jeff Sharkey [Mon, 12 Jun 2017 23:33:07 +0000 (17:33 -0600)]
KEY_INTENT shouldn't grant permissions.
KEY_INTENT has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Also fix ordering bug in general-purpose security check that was
allowing FLAG_GRANT_PERSISTABLE to bypass it.
Test: builds, boots
Bug:
32990341,
32879915
Change-Id: I657455a770c81f045ccce6abbd2291407a1cfb42
Adrian Roos [Tue, 13 Jun 2017 19:42:02 +0000 (19:42 +0000)]
Merge "AOD: Use double tap coordinates to trigger Ambient Indication" into oc-dr1-dev am:
2402522553
am:
3aa77a330e
Change-Id: Iccaaedf0c74f0b2b11659d625c03e3907c5d93dc
TreeHugger Robot [Tue, 13 Jun 2017 19:35:50 +0000 (19:35 +0000)]
Merge "Add accessibility titles to PopupWindow"
Andreas Gampe [Tue, 13 Jun 2017 19:27:54 +0000 (19:27 +0000)]
Merge "Merge "Binder: Add more logging on Error" am:
d9f3a3cf37 am:
e3bda6170d am:
6d908413bd" into oc-dr1-dev-plus-aosp
am:
a01f079bc3
Change-Id: Ia6f8824f0394b33b76ff0243312092cf96f65dc1
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
Bryce Lee [Tue, 13 Jun 2017 19:19:37 +0000 (19:19 +0000)]
Merge "Merge "Address issues surrounding freezing by display." into oc-dev am:
8ab4d11145 am:
c717e603b1" into oc-dr1-dev-plus-aosp
am:
137d09aa07
Change-Id: I98d23f7b5d87bb09dc5287319e4f94e6236f0027
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
Bryce Lee [Tue, 13 Jun 2017 19:16:30 +0000 (19:16 +0000)]
Merge "Address issues surrounding freezing by display." into oc-dev am:
8ab4d11145 am:
fb385a6c15
am:
b64e5067f0
Change-Id: I8854c7fd8c55641324c1bcd3191154cc2d77c1f4
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
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"
Eugene Susla [Tue, 13 Jun 2017 18:14:29 +0000 (18:14 +0000)]
Merge "Serialize all standard actions as bit mask"
Adam Lesinski [Mon, 12 Jun 2017 21:55:58 +0000 (14:55 -0700)]
AAPT2: Disable locale domination for deduping
Locale deduping isn't straightforward, as parenting rules
change between platform versions and the selection
preference of a specific locale variant over the default
configuration lead to incorrect results at runtime.
Bug:
62409213
Test: make aapt2_tests
Change-Id: Iec8f1cfba7ae43c847d163529891fdc15f3db826
Jeff Sharkey [Tue, 13 Jun 2017 17:40:51 +0000 (17:40 +0000)]
Merge "Revert "Hide APIs not intended to ship in DR.""
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
TreeHugger Robot [Tue, 13 Jun 2017 17:29:08 +0000 (17:29 +0000)]
Merge "BatteryStats: Cleanup external stats collection"
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)
Mark Goldstein [Tue, 13 Jun 2017 16:56:08 +0000 (16:56 +0000)]
Merge "Fix a few typos in audiofx doc strings."
Narayan Kamath [Tue, 13 Jun 2017 16:02:13 +0000 (16:02 +0000)]
Merge changes I73ae8de1,I58260902 am:
6f11744adc am:
a506180804 am:
d1941e51a6
am:
fec2aa40de
Change-Id: Ia939f79a7ec50d390bbe05734321e8e9ae91a7ee
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
Tomasz Wasilczyk [Tue, 13 Jun 2017 15:42:20 +0000 (15:42 +0000)]
Merge "Implement remaining ITunerCallback methods."
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
Narayan Kamath [Tue, 13 Jun 2017 11:38:41 +0000 (11:38 +0000)]
Merge "BatteryStatsImpl: Keep less history around for low mem devices."
Narayan Kamath [Tue, 13 Jun 2017 10:59:24 +0000 (10:59 +0000)]
Merge "Merge "Eagerly serialize historical sessions" into oc-dev am:
c7ea7effde am:
7ba9c4dc62" into oc-dr1-dev-plus-aosp
am:
bf841692cd
Change-Id: Icbc38c7b742407ed54f3551df50502b0da695d2c
Narayan Kamath [Tue, 13 Jun 2017 10:57:20 +0000 (10:57 +0000)]
Merge "Eagerly serialize historical sessions" into oc-dev am:
c7ea7effde am:
17652d85ec
am:
6ca3567674
Change-Id: I12390e4bb27b5480cad7623db8ea09fa1ccc48e9
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:39:03 +0000 (10:39 +0000)]
Merge "LocalLog: Use LocalDateTime.now() instead of a Calendar."
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
Narayan Kamath [Tue, 13 Jun 2017 09:43:18 +0000 (09:43 +0000)]
Merge "ActivityManagerService: Prune old stack traces."
Erik Kline [Tue, 13 Jun 2017 08:49:46 +0000 (08:49 +0000)]
Merge "make UpsreamNetworkMonitor the sole source of upstream network information" am:
30a1cf96bb am:
cfaeabb3e3 am:
4bcce2b2ef
am:
72240b9eeb
Change-Id: If45443143777e1446c812563742ae8af68d8f73e
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
Adam Vartanian [Tue, 13 Jun 2017 08:27:31 +0000 (08:27 +0000)]
Merge "DO NOT MERGE Remove createSocket(Socket, InputStream, boolean) from APIs." into oc-dr1-dev am:
87587fbda2
am:
0cbfb82f38
Change-Id: I7c7876d9fe871178be0918f0c8c48218527a18e0
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
Hyundo Moon [Tue, 13 Jun 2017 04:34:46 +0000 (04:34 +0000)]
Merge "ExifInterface: Prevent DATETIME value from being set unproperly"
Erik Kline [Tue, 13 Jun 2017 03:48:24 +0000 (03:48 +0000)]
Merge "Only disable Wi-Fi IP serving on specific interface, if available" am:
6428e1a4d4 am:
e675273dbc am:
e13b93c585
am:
118e0e87e7
Change-Id: Id8d9c3f67f7a850af69069abee86adfc62841b28
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
Bill Yi [Tue, 13 Jun 2017 02:59:10 +0000 (02:59 +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
am:
7729edee10 -s ours
Change-Id: If4afa0cf25e4c83097ffebb80fae620865f9e6e4
Bill Yi [Tue, 13 Jun 2017 02:57:02 +0000 (02:57 +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
am:
cea026e027 -s ours
Change-Id: I513fd5f60ed065f483a955f96fcf6db0fbc6ca4a
Bill Yi [Tue, 13 Jun 2017 02:54:06 +0000 (02:54 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
34cfd78f8e -s ours
am:
50a405cf2c -s ours
Change-Id: I3c90feee62ffc8cf88e9f74859f8e818f019d3e6
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
Hyundo Moon [Mon, 12 Jun 2017 11:47:50 +0000 (20:47 +0900)]
ExifInterface: Prevent DATETIME value from being set unproperly
Although the DATETIME and DATETIME_ORIGINAL tags are for different
purposes, the DATETIME value is set to the same value as
DATETIME_ORIGINAL tag's when loading the attributes of an image.
This CL prevents the problem by setting the value of DATETIME tag only
when it does not exist.
Bug:
62137632
Test: Passed ExifInterface CTS
Change-Id: Ic5c43c53cb363a782bcac20915d74ea534ec70e4
Bill Yi [Tue, 13 Jun 2017 02:35:18 +0000 (02:35 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
1190614529 -s ours
am:
47bb41b1bb -s ours
Change-Id: I12c93763e3ab6bb471c9e7049789fdc2e65406e4
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
Winson Chung [Tue, 13 Jun 2017 02:28:13 +0000 (02:28 +0000)]
Merge "Minimal change to ensure events are propagated to the right DividerView." into oc-dev am:
b1cdc17dfb am:
87997ce838
am:
53ee05b34a
Change-Id: Ia0f581109cffb3a695698537aefc55408287cb45
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
Etan Cohen [Tue, 13 Jun 2017 02:25:54 +0000 (02:25 +0000)]
Merge "Merge "[ErrorProne] Fix Error Prone warnings in aware/p2p code" into oc-dr1-dev am:
43dc06a9a9" into oc-dr1-dev-plus-aosp
am:
1bbc25d903
Change-Id: I6db6577b701977806cd14014a4700d71619915c4
Winson Chung [Tue, 13 Jun 2017 02:22:41 +0000 (02:22 +0000)]
Merge "Minimal change to ensure events are propagated to the right DividerView." into oc-dev am:
b1cdc17dfb am:
ebc74796e4
am:
94bbf483e3
Change-Id: I9996b6f19b3558e922e229839f8ae0f52cc7c812
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
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.'
Bug:
62514767
Test: m
Change-Id: I12026bb7a8ec9438db493f135ed5d0177187f702
Marie Janssen [Tue, 13 Jun 2017 01:54:18 +0000 (01:54 +0000)]
Merge "Merge "Protect broadcast used in settings for bond cancel" into oc-dev am:
68a4c91bb4 am:
2ddb92f2d9" into oc-dr1-dev-plus-aosp
am:
d681a81d89
Change-Id: Ic8891f09e36a7610418c8168722628e60c079131
Wale Ogunwale [Tue, 13 Jun 2017 01:51:59 +0000 (01:51 +0000)]
Merge "Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev am:
e1e0db8ca9 am:
5323b2d4cd" into oc-dr1-dev-plus-aosp
am:
1324c577e7
Change-Id: If243540cf28bd67bd659c1647c1b175ff72daba3
Winson Chung [Tue, 13 Jun 2017 01:51:00 +0000 (01:51 +0000)]
Merge "Minimal change to ensure events are propagated to the right DividerView." into oc-dev am:
b1cdc17dfb
am:
87997ce838
Change-Id: Ib22c951e0e17c90a13b9b4e5697eb5127a1011ba
Marie Janssen [Tue, 13 Jun 2017 01:49:30 +0000 (01:49 +0000)]
Merge "Merge "Protect broadcast used in settings for bond cancel" into oc-dev am:
68a4c91bb4 am:
4c342c8a98" into oc-dr1-dev-plus-aosp
am:
61c6f9f204
Change-Id: I883466888853a4914c87ab99ec81795d2af95123
Android Build Merger (Role) [Tue, 13 Jun 2017 01:48:14 +0000 (01:48 +0000)]
Merge "Merge "[ErrorProne] Fix Error Prone warnings in aware/p2p code" into oc-dr1-dev am:
43dc06a9a9" into oc-dr1-dev-plus-aosp