OSDN Git Service
Kweku Adams [Wed, 4 Oct 2017 23:03:57 +0000 (16:03 -0700)]
incidentd: Fix printing of repeated scalar fields.
Also add check for when enum value can't be found and fixing output
formatting for some int types.
BUG:
65633831
Test: check incident_report output of repeated enums.
Change-Id: I329eef9b3bb0026259ea465ab67e71952df1a4e4
TreeHugger Robot [Tue, 3 Oct 2017 01:03:54 +0000 (01:03 +0000)]
Merge "Add 'cancel' job scheduler shell command"
Hansong Zhang [Tue, 3 Oct 2017 00:49:54 +0000 (00:49 +0000)]
Merge "DO NOT MERGE ANYWHERE: Revert "Merge "Bluetooth HID Device: Fix a typo" am:
d30e47ecfc am:
849805b804"" into oc-dr1-dev-plus-aosp am:
684bead629 -s ours
am:
2f09f42267 -s ours
Change-Id: I54b318ac62db69258995b1cf62d21529e875ad2f
Jerry Zhang [Tue, 3 Oct 2017 00:44:23 +0000 (00:44 +0000)]
Merge "Add moveObject method to change object's path and parent." am:
33a200e572 am:
0f09ac317d am:
f9696617bd
am:
3a13ab1fd3
Change-Id: I58a1ca9b3b5e63e73eb4db58ac3588f6bf9e3249
Hansong Zhang [Tue, 3 Oct 2017 00:40:12 +0000 (00:40 +0000)]
Merge "DO NOT MERGE ANYWHERE: Revert "Merge "Bluetooth HID Device: Fix a typo" am:
d30e47ecfc am:
849805b804"" into oc-dr1-dev-plus-aosp
am:
684bead629 -s ours
Change-Id: Ib70696d6a11d9054a5ad6a6241809cfc7ba97908
Hansong Zhang [Tue, 3 Oct 2017 00:39:23 +0000 (00:39 +0000)]
Merge "DO NOT MERGE ANYWHERE: Revert "Merge "Bluetooth HID Device: Fix a typo" am:
d30e47ecfc am:
849805b804 am:
45f17f4533"" into oc-mr1-dev-plus-aosp
am:
df85294d73 -s ours
Change-Id: I6af8436be7910fe6760d1f1cfaed8cfba3909129
Jerry Zhang [Tue, 3 Oct 2017 00:33:02 +0000 (00:33 +0000)]
Merge "Add moveObject method to change object's path and parent." am:
33a200e572 am:
0f09ac317d
am:
f9696617bd
Change-Id: Ia6ba6d0cf89879914894d35a0dbf110d905966ac
TreeHugger Robot [Tue, 3 Oct 2017 00:28:16 +0000 (00:28 +0000)]
Merge "DO NOT MERGE ANYWHERE: Revert "Merge "Bluetooth HID Device: Fix a typo" am:
d30e47ecfc am:
849805b804"" into oc-dr1-dev-plus-aosp
Chris Wren [Tue, 3 Oct 2017 00:28:16 +0000 (00:28 +0000)]
Merge "Enable experimentation on notification snooze options" into oc-mr1-dev am:
9cb14a0c95
am:
4706c262fa
Change-Id: Ic99064fcb8a51b8d66ce5b55e4e2da52cbc1557b
TreeHugger Robot [Tue, 3 Oct 2017 00:27:10 +0000 (00:27 +0000)]
Merge "DO NOT MERGE ANYWHERE: Revert "Merge "Bluetooth HID Device: Fix a typo" am:
d30e47ecfc am:
849805b804 am:
45f17f4533"" into oc-mr1-dev-plus-aosp
Chris Wren [Tue, 3 Oct 2017 00:19:02 +0000 (00:19 +0000)]
Merge "Enable experimentation on notification snooze options" into oc-mr1-dev
am:
9cb14a0c95
Change-Id: Ia54ca5b12479f22c9bef54b1f488bcb74e15423f
Jerry Zhang [Tue, 3 Oct 2017 00:13:50 +0000 (00:13 +0000)]
Merge "Add moveObject method to change object's path and parent." am:
33a200e572
am:
0f09ac317d
Change-Id: Ie2c742826fb4b7cb21e15f4d4777145ebbbd0923
Jerry Zhang [Tue, 3 Oct 2017 00:04:03 +0000 (00:04 +0000)]
Merge "Add moveObject method to change object's path and parent."
am:
33a200e572
Change-Id: Iabb8c9989ad35140ab1c752fb70741f52e56c04d
TreeHugger Robot [Tue, 3 Oct 2017 00:02:08 +0000 (00:02 +0000)]
Merge "Enable experimentation on notification snooze options" into oc-mr1-dev
TreeHugger Robot [Mon, 2 Oct 2017 23:58:51 +0000 (23:58 +0000)]
Merge "Reduce time consuming when a lot of audio port event happen continually."
Treehugger Robot [Mon, 2 Oct 2017 23:53:56 +0000 (23:53 +0000)]
Merge "Add moveObject method to change object's path and parent."
Christopher Tate [Mon, 2 Oct 2017 23:10:13 +0000 (23:10 +0000)]
Merge "Reduce lock interactions in backup transport management" into oc-mr1-dev am:
96b9ddbcb2
am:
4d47cb3ddc -s ours
Change-Id: I1263c171d5f348fc9dd2ef39255bd8ce5d449338
Christopher Tate [Fri, 29 Sep 2017 23:54:26 +0000 (16:54 -0700)]
Add 'cancel' job scheduler shell command
Bug:
65120523
Test: manual
Change-Id: Icb93d0032d71671ba8f68a2b802a323f726af08b
Jeffrey Huang [Mon, 2 Oct 2017 22:59:10 +0000 (22:59 +0000)]
Merge "Add new methods to PkgMgrWrapper for testing"
Christopher Tate [Mon, 2 Oct 2017 22:55:44 +0000 (22:55 +0000)]
Merge "Reduce lock interactions in backup transport management" into oc-mr1-dev
am:
96b9ddbcb2
Change-Id: I40b489172034036d112d367c183110ae9d9408db
Jacky Cheung [Mon, 2 Oct 2017 22:44:01 +0000 (22:44 +0000)]
Merge "Add a configurable default value for MOBILE_DATA_ALWAYS_ON"
TreeHugger Robot [Mon, 2 Oct 2017 22:43:48 +0000 (22:43 +0000)]
Merge "Reduce lock interactions in backup transport management" into oc-mr1-dev
Hansong Zhang [Mon, 2 Oct 2017 22:20:13 +0000 (22:20 +0000)]
DO NOT MERGE ANYWHERE: Revert "Merge "Bluetooth HID Device: Fix a typo" am:
d30e47ecfc am:
849805b804"
This reverts commit
45f17f453342accf5478e0b3a2a80e9e8a4ce8e8.
Merged-In: I06ffc536f5912d53319b4d325f77991d65ab04f2
Change-Id: I74271f26bbe28b02117d688a6aa0bf83f0be3780
Hansong Zhang [Mon, 2 Oct 2017 22:19:38 +0000 (22:19 +0000)]
DO NOT MERGE ANYWHERE: Revert "Merge "Bluetooth HID Device: Fix a typo" am:
d30e47ecfc am:
849805b804 am:
45f17f4533"
This reverts commit
7c55e52d5193c6baa0c6ca45a9c080240df2cac4.
Merged-In: I06ffc536f5912d53319b4d325f77991d65ab04f2
Change-Id: Ib83d5de0dbc0c98c6cf0b4c5f7381cb0f70a5da5
Eino-Ville Talvala [Mon, 2 Oct 2017 22:24:38 +0000 (22:24 +0000)]
Merge "ImageFormat: Document units/coordinate system for DEPTH_POINT_CLOUD" into oc-mr1-dev am:
56afee3c1f
am:
57e79cf0a3
Change-Id: Ic43ab67194613c4888ad5ecf54b4ff66171df31d
Adam Powell [Mon, 2 Oct 2017 22:19:10 +0000 (22:19 +0000)]
Merge "Lower watchdog timeout for ChooserTargetService responses" into oc-mr1-dev am:
cbe8754184
am:
6a6a65e89e
Change-Id: Iad59aa075152428734fe68186d87651ac3f9780d
Eino-Ville Talvala [Mon, 2 Oct 2017 21:47:36 +0000 (21:47 +0000)]
Merge "ImageFormat: Document units/coordinate system for DEPTH_POINT_CLOUD" into oc-mr1-dev
am:
56afee3c1f
Change-Id: I07f2205daf1d751e08a67381048a93ccbd3af86d
Adam Powell [Mon, 2 Oct 2017 21:40:30 +0000 (21:40 +0000)]
Merge "Lower watchdog timeout for ChooserTargetService responses" into oc-mr1-dev
am:
cbe8754184
Change-Id: I96573018654de3cfccdae1be6ce01ae7749c5ffe
Chris Wren [Mon, 2 Oct 2017 21:29:46 +0000 (17:29 -0400)]
Enable experimentation on notification snooze options
Bug:
67003813
Test: runtest systemui
Change-Id: Id46ef3938e2edc633f64cec7b66e10d80c9a0bff
George Mount [Mon, 2 Oct 2017 21:37:16 +0000 (21:37 +0000)]
Merge "Fix Transition test failure." into oc-mr1-dev am:
dbd11d6c8b
am:
8e8e3eff08
Change-Id: Ifbffc328d5d356f77d668deb7104d7d73fc28bf2
George Mount [Mon, 2 Oct 2017 21:23:15 +0000 (21:23 +0000)]
Merge "Fix Transition test failure." into oc-mr1-dev
am:
dbd11d6c8b
Change-Id: I5ae4bde02a4ee2a6d053529ebed0b6aa3dc596c5
TreeHugger Robot [Mon, 2 Oct 2017 21:22:57 +0000 (21:22 +0000)]
Merge "ImageFormat: Document units/coordinate system for DEPTH_POINT_CLOUD" into oc-mr1-dev
Jeffrey Huang [Mon, 2 Oct 2017 20:54:58 +0000 (20:54 +0000)]
Merge "Add new methods to PkgMgrWrapper for testing"
TreeHugger Robot [Mon, 2 Oct 2017 20:46:58 +0000 (20:46 +0000)]
Merge "Remove unused method setPos from MeasuredText."
TreeHugger Robot [Mon, 2 Oct 2017 20:40:37 +0000 (20:40 +0000)]
Merge "Lower watchdog timeout for ChooserTargetService responses" into oc-mr1-dev
TreeHugger Robot [Mon, 2 Oct 2017 20:36:06 +0000 (20:36 +0000)]
Merge "Fix Transition test failure." into oc-mr1-dev
Jacky Cheung [Mon, 2 Oct 2017 17:40:48 +0000 (10:40 -0700)]
Add a configurable default value for MOBILE_DATA_ALWAYS_ON
Some devices (aka watches) don't want the power cost of data
being connected all the time.
Bug:
64685191
Change-Id: I059911eca436d7a28747126f17061a47233bd454
Seigo Nonaka [Mon, 2 Oct 2017 18:52:14 +0000 (11:52 -0700)]
Remove unused method setPos from MeasuredText.
Bug:
65024629
Test: Verified with TreeHugger
Change-Id: I023532c9decbc7b798aa4cb2dedc5ca5fb8d96f0
Colin Cross [Mon, 2 Oct 2017 20:19:10 +0000 (20:19 +0000)]
Delete jack support am:
72ad4a04ee am:
9519197497
am:
98560499aa
Change-Id: If516537ae24fecac291ce60cc624f19f9ab23047
Christopher Tate [Wed, 27 Sep 2017 22:39:54 +0000 (15:39 -0700)]
Reduce lock interactions in backup transport management
1. process package update broadcasts on our background thread rather
than on the main looper thread
2. don't synchronize unnecessarily around access to simple
transport metadata
We mustn't block the main looper thread for anything that might wind
up interlocked with calls to the transport, because those might take
arbitrary amounts of time. We were previously entering such an
implicitly interlocked code path during package-changed broadcast
handling, and in pathological cases were causing the watchdog to
restart the system. This situation is addressed in a couple of ways:
first, by no longer performing package-update work on the main looper
thread at all; and second, by eliminating lock reliance entirely from
data-access paths that don't actually need it.
Bug:
65438129
Bug:
64133971
Test: manual + CTS
Change-Id: I361ad4a0729f319db7339bd341a6d33aa3b64fed
Merged-In: I361ad4a0729f319db7339bd341a6d33aa3b64fed
Chris Tate [Mon, 2 Oct 2017 20:13:43 +0000 (20:13 +0000)]
Merge "Reduce lock interactions in backup transport management"
Colin Cross [Mon, 2 Oct 2017 20:03:49 +0000 (20:03 +0000)]
Delete jack support am:
72ad4a04ee
am:
9519197497
Change-Id: I1602c75659c5f5fb9362444b639f020c5d7ed319
Colin Cross [Mon, 2 Oct 2017 19:51:03 +0000 (19:51 +0000)]
Delete jack support
am:
72ad4a04ee
Change-Id: I58d8bfced33df174b48b797c62d8010233285fca
Felipe Leme [Mon, 2 Oct 2017 19:13:10 +0000 (19:13 +0000)]
Merge "FIxed typo." into oc-mr1-dev am:
683064f605
am:
e238529c8c
Change-Id: Ifc996508d15b210db18e9d025a219b065b9b5443
TreeHugger Robot [Mon, 2 Oct 2017 19:09:43 +0000 (19:09 +0000)]
Merge "Add LoWPAN permissions to shell manifest"
Felipe Leme [Mon, 2 Oct 2017 19:00:58 +0000 (19:00 +0000)]
Merge "FIxed typo." into oc-mr1-dev
am:
683064f605
Change-Id: I445af6174e7f9b0d35e26a6b33feb925e3bc3f66
Jerry Zhang [Wed, 27 Sep 2017 00:49:52 +0000 (17:49 -0700)]
Add moveObject method to change object's path and parent.
This is needed to implement the MTP MOVE_OBJECT operation.
Bug:
66679910
Test: Move objects and folders, verify mediastore is consistent
Change-Id: I2f4f0c43134fb3ff82745166c051712cc1736b7f
TreeHugger Robot [Mon, 2 Oct 2017 18:46:30 +0000 (18:46 +0000)]
Merge "FIxed typo." into oc-mr1-dev
Karthik Ravi Shankar [Mon, 2 Oct 2017 18:45:48 +0000 (18:45 +0000)]
Merge "Fix launch of activities into VR Virtual display" into oc-mr1-dev am:
488665d9e3
am:
129a54d29a
Change-Id: Ie3080c722c45249a32e9531eb1ba4ba080f65fce
Eino-Ville Talvala [Mon, 2 Oct 2017 18:39:41 +0000 (11:39 -0700)]
ImageFormat: Document units/coordinate system for DEPTH_POINT_CLOUD
For camera devices, DEPTH_POINT_CLOUD coordinates are in meters and
are in the camera's local coordinate system.
Test: Built docs, manually verified output.
Bug:
67308479
Change-Id: I028e13a2fb79688a7ce440f905fa82826fc38a03
Bill Yi [Mon, 2 Oct 2017 18:34:33 +0000 (18:34 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
995627c3ee -s ours am:
899f5cf309 -s ours am:
79ef7d950d -s ours
am:
14b444880a -s ours
Change-Id: I12eb8629933a6f48d7aa6dcebde0b5409f9a1bbb
Karthik Ravi Shankar [Mon, 2 Oct 2017 18:32:28 +0000 (18:32 +0000)]
Merge "Fix launch of activities into VR Virtual display" into oc-mr1-dev
am:
488665d9e3
Change-Id: Ia6d5cfffb8dddf2603a73ae88212fc7353948d67
Android Build Merger (Role) [Mon, 2 Oct 2017 18:27:28 +0000 (18:27 +0000)]
Merge "Merge "Merge "Don't crash onServiceDisconnected..." into oc-mr1-dev am:
dab9eff899" into oc-mr1-dev-plus-aosp am:
bb268b9fd6"
Dan Sandler [Mon, 2 Oct 2017 18:23:32 +0000 (18:23 +0000)]
Merge "Merge "Don't crash onServiceDisconnected..." into oc-mr1-dev am:
dab9eff899" into oc-mr1-dev-plus-aosp
am:
bb268b9fd6
Change-Id: Iec740e8d40db93eda07e548e097a8cb7b0c4e3b0
TreeHugger Robot [Mon, 2 Oct 2017 18:22:53 +0000 (18:22 +0000)]
Merge "Statsd can pull kernel wakelock data"
TreeHugger Robot [Mon, 2 Oct 2017 18:16:49 +0000 (18:16 +0000)]
Merge "Prevent NPE at TaskStack#resetAnimationBackgroundAnimator"
Bill Yi [Mon, 2 Oct 2017 18:14:38 +0000 (18:14 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
995627c3ee -s ours am:
899f5cf309 -s ours am:
c260f7c6bb -s ours
am:
c25a18ea89 -s ours
Change-Id: I89e8b263009adfb28d6ac6c4d14a602e01094959
Colin Cross [Wed, 27 Sep 2017 21:43:27 +0000 (14:43 -0700)]
Delete jack support
Remove references to jack makefiles that no longer exist.
Bug:
65302138
Test: m -j checkbuild
Change-Id: I9fbee7db0167300edf59a85badeff87b4b25f846
Merged-In: I9fbee7db0167300edf59a85badeff87b4b25f846
(cherry picked from commit
c6fbe4ef07faaee070f96c380682c5392386be6a)
TreeHugger Robot [Mon, 2 Oct 2017 18:13:04 +0000 (18:13 +0000)]
Merge "Fix launch of activities into VR Virtual display" into oc-mr1-dev
jeffreyhuang [Mon, 2 Oct 2017 17:24:48 +0000 (10:24 -0700)]
Add new methods to PkgMgrWrapper for testing
- add setComponentEnabledSetting
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: Ic9c472159e95717e674fbe54926f3588a21cdaf0
Bill Yi [Mon, 2 Oct 2017 18:08:12 +0000 (18:08 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
995627c3ee -s ours am:
899f5cf309 -s ours
am:
79ef7d950d -s ours
Change-Id: If943b496bc5845af3aecb339b80f4c63ee62d32f
Colin Cross [Mon, 2 Oct 2017 18:06:20 +0000 (18:06 +0000)]
Merge "Delete jack support"
Android Build Merger (Role) [Mon, 2 Oct 2017 18:02:41 +0000 (18:02 +0000)]
Merge "Merge "Don't crash onServiceDisconnected..." into oc-mr1-dev am:
dab9eff899" into oc-mr1-dev-plus-aosp
Bill Yi [Mon, 2 Oct 2017 18:01:09 +0000 (18:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
2174056518 -s ours
am:
659cbdf99f -s ours
Change-Id: I86faa00d3b38a81f63d98458fdfb2f1d8889eb7b
Dan Sandler [Mon, 2 Oct 2017 18:00:56 +0000 (18:00 +0000)]
Merge "Don't crash onServiceDisconnected..." into oc-mr1-dev
am:
dab9eff899
Change-Id: Idfc6a98804928a177153492010e04ec75fa30755
Bill Yi [Mon, 2 Oct 2017 17:59:13 +0000 (17:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
995627c3ee -s ours am:
899f5cf309 -s ours
am:
c260f7c6bb -s ours
Change-Id: I930d8e7a4ad3f4fcea358235574b6698dede8772
Bill Yi [Mon, 2 Oct 2017 17:51:45 +0000 (17:51 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
995627c3ee -s ours
am:
899f5cf309 -s ours
Change-Id: I79586b1902cfed6baa9db8d615e94b4fadab4740
Bill Yi [Mon, 2 Oct 2017 17:51:36 +0000 (17:51 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
995627c3ee -s ours
am:
899f5cf309 -s ours
Change-Id: Ia3d156d8da37e54364775285658dbdfd4f176468
Bill Yi [Mon, 2 Oct 2017 17:51:14 +0000 (17:51 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
2174056518 -s ours
Change-Id: Id5f7695856db3b6f19dec85ed716a77775ceb346
Bill Yi [Mon, 2 Oct 2017 17:45:18 +0000 (17:45 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
995627c3ee -s ours
Change-Id: I1acc544f6cab8fdde4d7b66b110baf46114a3730
TreeHugger Robot [Mon, 2 Oct 2017 17:44:57 +0000 (17:44 +0000)]
Merge "Don't crash onServiceDisconnected..." into oc-mr1-dev
TreeHugger Robot [Mon, 2 Oct 2017 17:41:52 +0000 (17:41 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Adam Powell [Mon, 2 Oct 2017 17:41:03 +0000 (10:41 -0700)]
Lower watchdog timeout for ChooserTargetService responses
Services providing direct share targets were given up to 5 seconds
to respond to a query, and for UI stability we don't show any until
all services have responded. 5 seconds is a long time to wait and
leads to user complaints when there is even one app that doesn't
respond in time.
Lower the timeout to 2 seconds as a more reasonable maximum.
Bug:
67306843
Test: manual, existing CTS
Change-Id: If55f0485240bc3ccbf8a32aa0e15903ea574ec2b
Bill Yi [Mon, 2 Oct 2017 17:34:54 +0000 (17:34 +0000)]
Import translations. DO NOT MERGE am:
45de16dde5 -s ours am:
a8c4c7aa94 -s ours am:
a77aa847f8 -s ours am:
595adddf1c -s ours am:
d4c920df48 -s ours
am:
09aa8ba4aa -s ours
Change-Id: I514c29173f6a992d6ffd1ac4cfb66a4ecb5f0970
TreeHugger Robot [Mon, 2 Oct 2017 17:33:24 +0000 (17:33 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Mon, 2 Oct 2017 17:27:14 +0000 (17:27 +0000)]
Import translations. DO NOT MERGE am:
45de16dde5 -s ours am:
a8c4c7aa94 -s ours am:
a77aa847f8 -s ours am:
595adddf1c -s ours am:
1949b69ddf -s ours
am:
4b62cd360f -s ours
Change-Id: I134eb04cbdd23ff70a32db52bdcdd12c85c73648
Bill Yi [Mon, 2 Oct 2017 17:24:31 +0000 (17:24 +0000)]
Import translations. DO NOT MERGE am:
45de16dde5 -s ours am:
a8c4c7aa94 -s ours am:
a77aa847f8 -s ours am:
595adddf1c -s ours
am:
d4c920df48 -s ours
Change-Id: Ie86e5745b7212bb12f7378fe237e636a081ac185
Bill Yi [Mon, 2 Oct 2017 17:20:05 +0000 (17:20 +0000)]
Import translations. DO NOT MERGE am:
45de16dde5 -s ours am:
a8c4c7aa94 -s ours am:
a77aa847f8 -s ours am:
595adddf1c -s ours
am:
1949b69ddf -s ours
Change-Id: Ied0f338cf53533c3f135f5372f55fa5a5fd0e58e
TreeHugger Robot [Mon, 2 Oct 2017 17:13:14 +0000 (17:13 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 2 Oct 2017 17:12:38 +0000 (17:12 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Mon, 2 Oct 2017 17:12:06 +0000 (17:12 +0000)]
Import translations. DO NOT MERGE am:
45de16dde5 -s ours am:
a8c4c7aa94 -s ours am:
a77aa847f8 -s ours
am:
595adddf1c -s ours
Change-Id: Iacfa5b853c7c7c091a06e4c06e20bfbe24c8adf7
Bill Yi [Mon, 2 Oct 2017 17:12:04 +0000 (17:12 +0000)]
Import translations. DO NOT MERGE am:
45de16dde5 -s ours am:
a8c4c7aa94 -s ours am:
a77aa847f8 -s ours
am:
595adddf1c -s ours
Change-Id: Ia591f2b47dffdeb12b471c4236e2f8e512cb8ffc
TreeHugger Robot [Mon, 2 Oct 2017 17:06:20 +0000 (17:06 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Mon, 2 Oct 2017 17:05:03 +0000 (17:05 +0000)]
Import translations. DO NOT MERGE am:
45de16dde5 -s ours am:
a8c4c7aa94 -s ours
am:
a77aa847f8 -s ours
Change-Id: Iad25d5ad2bdda26aba5a49bf7a118d86d8eb0b2d
TreeHugger Robot [Mon, 2 Oct 2017 16:59:20 +0000 (16:59 +0000)]
Merge "Update javadoc of {set, get}OrganizationName to clearly specify that it is available for PO since N and DO since O."
Bill Yi [Mon, 2 Oct 2017 16:54:38 +0000 (16:54 +0000)]
Import translations. DO NOT MERGE am:
45de16dde5 -s ours
am:
a8c4c7aa94 -s ours
Change-Id: I6485896b6b814d124c5a7a7b69e0e0a5910a383b
Bill Yi [Mon, 2 Oct 2017 16:47:00 +0000 (16:47 +0000)]
Import translations. DO NOT MERGE
am:
45de16dde5 -s ours
Change-Id: Idaa0738ef0b990ef955a0f6c55c7a0905739439a
Erik Wolsheimer [Fri, 29 Sep 2017 19:12:47 +0000 (12:12 -0700)]
Prevent NPE at TaskStack#resetAnimationBackgroundAnimator
Bug:
67034123
Change-Id: Ie1c7d8371d146006bc98f3a1ccc25292771ae3f9
(cherry picked from commit
70f5a4a3e807bfe30cd88431207774b23369075c)
Eric Laurent [Mon, 2 Oct 2017 15:55:59 +0000 (15:55 +0000)]
Merge "AudioService: more logs for audio mode changes" into oc-mr1-dev am:
3e038bd4d6
am:
6a794d2911
Change-Id: I58abe62ec96d1c23b6b229a0b6b2c9d0f8749bd1
Eric Laurent [Mon, 2 Oct 2017 15:44:35 +0000 (15:44 +0000)]
Merge "AudioService: more logs for audio mode changes" into oc-mr1-dev
am:
3e038bd4d6
Change-Id: I900b28cf8f0abd3ac57f99b7761d48e68f046541
TreeHugger Robot [Mon, 2 Oct 2017 15:34:47 +0000 (15:34 +0000)]
Merge "AudioService: more logs for audio mode changes" into oc-mr1-dev
Wen ZHANG [Thu, 21 Sep 2017 17:29:43 +0000 (18:29 +0100)]
Update javadoc of {set, get}OrganizationName to clearly specify that it
is available for PO since N and DO since O.
Test: Change to Javadoc only
Change-Id: Icc54fd8c9f188207f49d623795b17b835fc9b92d
Bill Yi [Mon, 2 Oct 2017 14:18:00 +0000 (07:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: I03334ca5edf73a87cc6d97dfd168be070852c501
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Hugo Benichi [Mon, 2 Oct 2017 11:17:09 +0000 (11:17 +0000)]
Merge "DO NOT MERGE Ignore DUN in describeImmutableDifferences" into oc-mr1-dev am:
9d5f50a9f8
am:
124b3e7738 -s ours
Change-Id: I6c5e9554a55ef253d47b4d65caf4d5a2770bcd87
Bill Yi [Mon, 2 Oct 2017 11:16:10 +0000 (04:16 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I35ffe572de6f4cf7b2d871bae713da183300b353
Hugo Benichi [Mon, 2 Oct 2017 11:10:37 +0000 (11:10 +0000)]
Merge "DO NOT MERGE Ignore DUN in describeImmutableDifferences" into oc-mr1-dev
am:
9d5f50a9f8
Change-Id: I0236132b8b497af5b1c26aa44e6494fe0510cb6d
Hugo Benichi [Mon, 2 Oct 2017 10:58:58 +0000 (10:58 +0000)]
Merge "ConnectivityServiceTest: fix flaky testNetworkRequestMaximum" am:
1211941aa0 am:
0d506fc4f4 am:
eced6cd14a
am:
6833a8dde7
Change-Id: Ifab1ace2ddf79f611d1f05080e2c31a4992810b7
Hugo Benichi [Mon, 2 Oct 2017 10:57:01 +0000 (10:57 +0000)]
Merge "DO NOT MERGE Ignore DUN in describeImmutableDifferences" into oc-mr1-dev
Bill Yi [Mon, 2 Oct 2017 10:55:29 +0000 (03:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: I01a40d6e7e4a694033f5994397d4c0bca745efc4
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Hugo Benichi [Mon, 2 Oct 2017 10:51:21 +0000 (10:51 +0000)]
Merge "ConnectivityServiceTest: fix flaky testNetworkRequestMaximum" am:
1211941aa0 am:
0d506fc4f4
am:
eced6cd14a
Change-Id: I53d0d6755c8e0be34db66da56efa483006e538ac
OSDN Git Service
