OSDN Git Service
Emilian Peev [Wed, 28 Feb 2018 14:53:30 +0000 (14:53 +0000)]
Camera: SessionConfiguration should use Executors
Handlers from clients should not be used any more.
Executors are the preferred method for invoking any
registered callbacks. Replace handlers as much as
possible with executors.
Bug:
73953366
Test: Camera CTS
Change-Id: I96aee1bc46e83dfb76a4c40c7f8ebbe18610788b
TreeHugger Robot [Tue, 6 Mar 2018 08:59:13 +0000 (08:59 +0000)]
Merge "MediaSession2: Update Builder" into pi-dev
TreeHugger Robot [Tue, 6 Mar 2018 07:55:14 +0000 (07:55 +0000)]
Merge "VideoView2: Move MediaContolView2's hidden constant" into pi-dev
TreeHugger Robot [Tue, 6 Mar 2018 07:44:28 +0000 (07:44 +0000)]
Merge "Power profile audio & video support" into pi-dev
Hyundo Moon [Tue, 6 Mar 2018 06:37:43 +0000 (15:37 +0900)]
MediaSession2: Update Builder
This CL updates following APIs of session builder:
- setPlayer
- setPlaylistController
- setVolumeController
Bug:
74093082
Test: runtest-MediaComponents
Change-Id: I88365e740df7e14edf439cbed2106f788d027f53
Erik Kline [Tue, 6 Mar 2018 05:53:29 +0000 (05:53 +0000)]
Merge "Fail if the interface is not available when starting" into pi-dev
Insun Kang [Mon, 5 Mar 2018 04:41:39 +0000 (13:41 +0900)]
VideoView2: Move MediaContolView2's hidden constant
Bug:
74173212
Test: VideoViewTest app
Change-Id: Ic91e0b0bfb910d555c1dbe77f028a017f2a18b79
(cherry picked from commit
a0fdcc97f0e49162198142726381cd5746971a2c)
TreeHugger Robot [Tue, 6 Mar 2018 04:14:27 +0000 (04:14 +0000)]
Merge "Shows the correct home icon when quickstep is enabled on startup" into pi-dev
Wei Jia [Tue, 6 Mar 2018 03:42:25 +0000 (03:42 +0000)]
Merge "MediaPlayer2: clarify sync/async for API's" into pi-dev
TreeHugger Robot [Tue, 6 Mar 2018 03:33:42 +0000 (03:33 +0000)]
Merge "Bluetooth: Use enums for adapter connection states" into pi-dev
Bill Yi [Tue, 6 Mar 2018 03:29:14 +0000 (03:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
f7995d280c -s ours
Change-Id: I707bc618a85429e55a5ec60b4a430fe952e65fc2
Felipe Leme [Tue, 6 Mar 2018 02:51:22 +0000 (02:51 +0000)]
Merge "Destroy fill UI when app dies." into pi-dev
Erik Kline [Fri, 2 Mar 2018 07:51:13 +0000 (16:51 +0900)]
Fail if the interface is not available when starting
Addresses a long-standing TODO. Now, when calling IpClient's
startProvisioning(), the interface has to be available (i.e.
InterfaceParams#getByName() must return non-null).
Also:
- add a test
- refactor for testability
- delete some constructors no longer used
- properly handle passed-in null IpClient.Callback
- some more IpManager -> IpClient renaming
- permit recording metrics before starting a provisioning
attempt (logging immediate errors) without Log.wtf().
Test: as follows
- built
- flashed
- booted
- runtest frameworks/opt/net/wifi/tests/wifitests/runtests.sh passes
- runtest frameworks-net passes
- basic WiFi IpClient connections works fine
Bug:
62476366
Bug:
73487570
Merged-In: I68e5e24122dc31e730cdbe8d75e33847e6332da4
Merged-In: Ifd27f5d908947cd7b4e1b8d54f9fa87e43ebb11b
Merged-In: Ief3c8e1652f69af0276fe35946ae1bf6e6b1b57e
Change-Id: Ic83ad2a65637277dcb273feb27b2d1bb7a11eb2b
(cherry picked from commit
b152cd0aa4f333b721615bb17773b35a989245fb)
Mike Ma [Sat, 3 Mar 2018 00:57:31 +0000 (16:57 -0800)]
Power profile audio & video support
Add power consumed by audio and video hardware to power profile.
Attribute these power to specific app.
Bug:
70531798
Test: PowerProfileTest
Test: BatteryStatsHelperTest
Test: PowerCalculatorTest
Change-Id: I4811efa14ce97983258cd59bfd328181fe95baf4
TreeHugger Robot [Tue, 6 Mar 2018 02:03:02 +0000 (02:03 +0000)]
Merge "Adjust recents onboarding logic" into pi-dev
TreeHugger Robot [Tue, 6 Mar 2018 01:59:14 +0000 (01:59 +0000)]
Merge "Check mMediaProvider for null" into pi-dev
Jack He [Fri, 2 Mar 2018 21:11:27 +0000 (13:11 -0800)]
Bluetooth: Use enums for adapter connection states
Bug:
69478930
Test: make, no user visible change
Change-Id: I999d0c445fe3b24aca72961c40c3428901542bc1
(cherry picked from commit
ee81f9915041875a8c9b6b71a39cb0508f6d7b22)
TreeHugger Robot [Tue, 6 Mar 2018 01:23:57 +0000 (01:23 +0000)]
Merge "Bluetooth: Enable Multi-A2DP/HFP support for up to 5 devices" into pi-dev
Matthew Ng [Fri, 2 Mar 2018 23:16:03 +0000 (15:16 -0800)]
Shows the correct home icon when quickstep is enabled on startup
The wrong home icon was shown on startup because it takes sometime for
the disabled flags to set disable recents flag that determines if
overview is enabled. When it changes to be true update nav bar icons.
Test: boot phone and look at nav bar
Change-Id: Ib1c00cfa1c3eb0444ccc985dfaf1b3c74e790692
Fixes:
74071465
Wei Jia [Thu, 1 Mar 2018 17:20:13 +0000 (09:20 -0800)]
MediaPlayer2: clarify sync/async for API's
Test: MediaPlayer2 plays
Bug:
63934228
Change-Id: I48b73c75311dbb31dcebe7c7a38e444d7dc65ed8
Fyodor Kupolov [Tue, 6 Mar 2018 00:28:51 +0000 (00:28 +0000)]
Merge "Revert "Allow restoring of apps that rotated key"" into pi-dev
TreeHugger Robot [Tue, 6 Mar 2018 00:19:54 +0000 (00:19 +0000)]
Merge changes Iecf8b207,I2f2a05ef into pi-dev
* changes:
Make MP2.prepare|play handled with task queue
Remove unused imports in MediaPlayer2.
TreeHugger Robot [Mon, 5 Mar 2018 23:16:14 +0000 (23:16 +0000)]
Merge "Improve javadocs of some DPM APIs" into pi-dev
Jack He [Wed, 28 Feb 2018 03:34:49 +0000 (19:34 -0800)]
Bluetooth: Enable Multi-A2DP/HFP support for up to 5 devices
* Set config_bluetooth_max_connected_audio_devices to 5
Bug:
64767509
Test: runtest -j32 bluetooth
connect and disconnect to multiple headsets and car kits
TestTracker/146725
Change-Id: I211c5683490fd4be00d3379e11e843081c6fb3a6
(cherry picked from commit
48574ae23397207279c52daeb9f901a4f194db0d)
Tony Wickham [Thu, 1 Mar 2018 23:45:04 +0000 (15:45 -0800)]
Adjust recents onboarding logic
- After dismissing, don't show again until 5 app launches
- Don't count the same task id towards that 5 (or the 2 before
showing the first time)
Test: manual, launch a couple apps and verify onboarding shows;
continues showing until I dismiss it; shows again after launching
5 apps (different activities in the same app don't count)
Bug:
73392035
Bug:
70180942
Change-Id: Icff567e3418097c3503d2f322cf829a9efc195e7
Jerry Zhang [Fri, 2 Mar 2018 23:40:03 +0000 (15:40 -0800)]
Check mMediaProvider for null
Getting the content provider could
return null in some cases where the user
is locked, so check for that when closing.
Bug:
73656609
Test: no crash
Change-Id: I607cd2da5348520616a1c171d0d8a1afacabe592
TreeHugger Robot [Mon, 5 Mar 2018 22:20:31 +0000 (22:20 +0000)]
Merge "Metric constants for dnd system and duration" into pi-dev
Mike Digman [Mon, 5 Mar 2018 22:15:06 +0000 (22:15 +0000)]
Merge "Increase rotate suggestion timeout in fullscreen" into pi-dev
Felipe Leme [Mon, 26 Feb 2018 21:17:39 +0000 (13:17 -0800)]
Destroy fill UI when app dies.
This is a regression caused by the autofill compat feature change, as the
Fill UI window was changed from a sub-panel which is auto managed by the window
manager to an overlay, to ensure the fill UI covers all app windows, so compat
mode would work for apps without app changes.
Test: atest CtsAutoFillServiceTestCases:SessionLifecycleTest#testDatasetGoesAwayWhenAutofilledAppIsKilled
Test: atest CtsAutoFillServiceTestCases:SessionLifecycleTest#testSaveRemainsWhenAutofilledAppIsKilled
Test: atest CtsAutoFillServiceTestCases # usual flakiness
Test: manual verification by adb shell kiling an app while UI is shown
Fixes:
73566982
Change-Id: I42f0acbaf3d0b19c081b8cb3613bebb01ceb487a
(cherry picked from commit
57dae0b6f0678d2c43e4556fe7a9efee5214dbd8)
TreeHugger Robot [Mon, 5 Mar 2018 21:05:17 +0000 (21:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Amith Yamasani [Mon, 5 Mar 2018 20:39:04 +0000 (20:39 +0000)]
Revert "Allow restoring of apps that rotated key"
This reverts commit
313d225cd19885979596cf690103a8d77e19c3dc.
Reason for revert: b/
74159113
Change-Id: I483ecdd80d26fca8451cd270b4fcbe34379839cb
Wei Jia [Mon, 5 Mar 2018 20:34:51 +0000 (20:34 +0000)]
Merge "OWNER: add wjia" into pi-dev
Tony Mak [Wed, 28 Feb 2018 14:17:17 +0000 (14:17 +0000)]
Improve javadocs of some DPM APIs
FIX:
70332970
FIX:
73919570
FIX:
67495520
FIX:
71566404
Test: None
Change-Id: Ic9b485ff7c15e0d244cba9e71def8d5c41e52070
(cherry picked from commit
8309c8f7608cea212056ace1cedb8af4df1215e3)
Wei Jia [Mon, 5 Mar 2018 20:15:20 +0000 (12:15 -0800)]
OWNER: add wjia
Test: none
Bug:
63934228
Change-Id: I58fbe0ddd3303cfe8765dac1942cff71e6cbbd9c
Mike Digman [Mon, 5 Mar 2018 19:14:39 +0000 (11:14 -0800)]
Increase rotate suggestion timeout in fullscreen
To use the rotate nav button in fullscreen the navbar must
become visible. This normally requires a user gesture which
makes it hard to hit the button given its normal timeout
duration. Make it easier to tap by effectively extending the
timeout if the suggestion is given when the navbar is
invisible.
Test: manual with fullscreen testing app
Change-Id: I54ac3dfb590df9b9a039c53984623497ca18fcb5
TreeHugger Robot [Mon, 5 Mar 2018 19:34:48 +0000 (19:34 +0000)]
Merge "Tint keyguard icons" into pi-dev
Dongwon Kang [Sat, 3 Mar 2018 02:10:49 +0000 (18:10 -0800)]
Make MP2.prepare|play handled with task queue
Test: plays video
Bug:
63934228
Change-Id: Iecf8b2079e87241365ab6b7b7b0a5a669c948427
Beverly [Mon, 5 Mar 2018 19:32:35 +0000 (14:32 -0500)]
Metric constants for dnd system and duration
Test: none
Bug:
73741459
Bug:
73362490
Change-Id: I01b7602e7bd05531c67fbb0c20b4d31ac7f5befe
Bill Yi [Mon, 5 Mar 2018 19:14:08 +0000 (19:14 +0000)]
Merge changes from topic "am-
d9c6be77-633d-4f98-8eb7-
b9106af9ba0f" into oc-dev am:
99cc6cb2a1 am:
c3f0a8e200
am:
659c534a47
Change-Id: I25798e2a43ed487320bd408a154140392a72f9cb
Dongwon Kang [Fri, 2 Mar 2018 18:08:53 +0000 (10:08 -0800)]
Remove unused imports in MediaPlayer2.
Test: build.
Change-Id: I2f2a05ef4fc41d14f91e6805217852adf5bbb28e
Bill Yi [Mon, 5 Mar 2018 19:07:26 +0000 (19:07 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c9f5891a7f skipped:
0a1d5cc852 am:
4532cd3395 -s ours am:
87addf6d04 -s ours
am:
dd865d9fe7 -s ours
Change-Id: Idd316e6f5de4640ae1c4521fb817a181e00cfc63
Bill Yi [Mon, 5 Mar 2018 19:01:28 +0000 (19:01 +0000)]
Merge changes from topic "am-
d9c6be77-633d-4f98-8eb7-
b9106af9ba0f" into oc-dev am:
99cc6cb2a1
am:
c3f0a8e200
Change-Id: Ia23c96b2880f13df80c3955c5acb0822bb6f2dd9
Bill Yi [Mon, 5 Mar 2018 18:56:01 +0000 (18:56 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c9f5891a7f skipped:
0a1d5cc852 am:
4532cd3395 -s ours
am:
87addf6d04 -s ours
Change-Id: I0cb81b26368af76cfef8b4104df9ac0722f1ac3f
Bill Yi [Mon, 5 Mar 2018 18:37:15 +0000 (18:37 +0000)]
Merge changes from topic "am-
d9c6be77-633d-4f98-8eb7-
b9106af9ba0f" into oc-dev
am:
99cc6cb2a1
Change-Id: I618380bb159e5f394fabcc9ff69bde6f2d0679d5
Bill Yi [Mon, 5 Mar 2018 18:35:22 +0000 (18:35 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c9f5891a7f skipped:
0a1d5cc852
am:
4532cd3395 -s ours
Change-Id: Ia8e72bfd84aeb59e7138e04f943abd73fd1cceb9
TreeHugger Robot [Mon, 5 Mar 2018 17:57:45 +0000 (17:57 +0000)]
Merge changes from topic "am-
d9c6be77-633d-4f98-8eb7-
b9106af9ba0f" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
c9f5891a7f skipped:
0a1d5cc852
[automerger skipped] Import translations. DO NOT MERGE skipped:
c9f5891a7f
Import translations. DO NOT MERGE
TreeHugger Robot [Mon, 5 Mar 2018 17:50:57 +0000 (17:50 +0000)]
Merge "Metrics for DND suppressed visual effects" into pi-dev
Lucas Dupin [Sat, 3 Mar 2018 22:05:04 +0000 (14:05 -0800)]
Tint keyguard icons
Test: visual
Change-Id: I7915c4ad1cd4bcb852a7bdd68e9f57fda7f985c6
Fixes:
71599427
(cherry picked from commit
914b708645f3f183719dd53623900a1609c6579b)
Julia Reynolds [Fri, 2 Mar 2018 19:53:15 +0000 (14:53 -0500)]
Metrics for DND suppressed visual effects
Bug:
74075050
Test: make
Change-Id: I6421401197207124e879326ea782bf2e4c5cc402
Adrian Roos [Fri, 2 Mar 2018 13:31:37 +0000 (14:31 +0100)]
DisplayCutout API: Make constructor public and adjust javadoc
Change-Id: I093cf4f9ea60f00e187aeb4a548f3f5789d87fa1
Fixes:
73953880
Test: make update-api
(cherry picked from commit
d61db603fecefc72ce6454d34b24bab821337295)
Hyundo Moon [Mon, 5 Mar 2018 05:44:41 +0000 (05:44 +0000)]
Merge "MediaController2: Ensure NonNull for parameters of public methods"
TreeHugger Robot [Mon, 5 Mar 2018 05:43:44 +0000 (05:43 +0000)]
Merge "Add #alerts to StatsdStats printout"
Hyundo Moon [Wed, 28 Feb 2018 08:31:00 +0000 (17:31 +0900)]
MediaController2: Ensure NonNull for parameters of public methods
Bug:
73863865
Test: Passed MediaBrowser2Test
Change-Id: I65cd43045f4e7b9f16b8cf3f43688815e59dc643
TreeHugger Robot [Mon, 5 Mar 2018 01:23:19 +0000 (01:23 +0000)]
Merge "AID: Change loop to repeat and set from xml"
TreeHugger Robot [Mon, 5 Mar 2018 01:12:19 +0000 (01:12 +0000)]
Merge "Make OnHeaderDecodedListener NonNull"
TreeHugger Robot [Sun, 4 Mar 2018 22:53:05 +0000 (22:53 +0000)]
Merge "Adds two more metrics categories for ATV Settings."
TreeHugger Robot [Sun, 4 Mar 2018 17:47:14 +0000 (17:47 +0000)]
Merge "Fix crash with AppComponentFactory"
Jaewan Kim [Fri, 2 Mar 2018 06:55:12 +0000 (15:55 +0900)]
MediaSession2: Clean up TODOs under frameworks/base/services
This CL includes following changes
- Remove outdated TODOs
- Added buganizer issue if the remaining work takes more than 5m
Test: Run MediaComponents tests
Change-Id: I0bda68dba58a71824107b58527f71cc1f8d1f949
Jaewan Kim [Fri, 2 Mar 2018 05:13:10 +0000 (14:13 +0900)]
MediaSession2: Clean up TODOs under frameworks/base/media
This CL includes following changes
- Remove outdated TODOs
- Added buganizer issue if the remaining work take more than 5m
Test: Run MediaComponents tests
Change-Id: I8968e12aabcbc67f69dbf14485b3716d0e95779b
TreeHugger Robot [Sun, 4 Mar 2018 04:29:55 +0000 (04:29 +0000)]
Merge "Fix link-type check warning on com.android.nfc_extras"
Yuan Lu [Sun, 4 Mar 2018 01:29:08 +0000 (01:29 +0000)]
Merge "Add the flag for only alowing wifi on charger/network request option"
Lucas Dupin [Sun, 4 Mar 2018 00:44:51 +0000 (00:44 +0000)]
Merge "Delete legacy code"
TreeHugger Robot [Sat, 3 Mar 2018 23:36:37 +0000 (23:36 +0000)]
Merge "Revert "Introduce InputConnection#reportLanguageHint()""
Bryce Lee [Sat, 3 Mar 2018 14:50:57 +0000 (14:50 +0000)]
Merge "Address destroying activities multiple times."
Bill Yi [Sat, 3 Mar 2018 13:26:44 +0000 (13:26 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
5b67a302d4 -s ours
am:
5f311906c0 -s ours
Change-Id: I437186c5c0ce68e4b9a3136aa44cef70a997a890
Bill Yi [Sat, 3 Mar 2018 13:18:11 +0000 (13:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
5b67a302d4 -s ours
Change-Id: Ieab93fb1ab78ad5633e328eee9c59616239ea487
Bill Yi [Sat, 3 Mar 2018 12:12:28 +0000 (04:12 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I5a2659669ab0380f04874900b12fa385f5e8b199
TreeHugger Robot [Sat, 3 Mar 2018 12:01:20 +0000 (12:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sat, 3 Mar 2018 09:18:51 +0000 (09:18 +0000)]
Merge changes from topic "am-
6f0d1125-8060-4e8b-afe5-
8e18597ac90b" into oc-dev am:
ee97cf22ba am:
ceb2e462f8 am:
462e72e57d
am:
5c9582b417
Change-Id: I9205bf86b72a9f727a19a7b2a7dc61555be1792b
Bill Yi [Sat, 3 Mar 2018 09:12:25 +0000 (09:12 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
dfffd1a532 skipped:
b8f08e00fd am:
4cd38db343 -s ours am:
d1ed6e90b2 -s ours am:
7e354b0ffe -s ours
am:
8dcf817d44 -s ours
Change-Id: I1f340310ff1a1e528e647728de149e5ef588ae4e
Bill Yi [Sat, 3 Mar 2018 08:52:05 +0000 (08:52 +0000)]
Merge changes from topic "am-
9b4b0f8c-4823-4712-936a-
f4aafe519eff" into oc-dev am:
13ac18d299 am:
585ba6b3ec am:
cfa5b7fa32
am:
f611143dcb
Change-Id: I0ef4467e0affe88d14c132b277774ca208d4e83a
Bill Yi [Sat, 3 Mar 2018 08:51:12 +0000 (08:51 +0000)]
Merge changes from topic "am-
6f0d1125-8060-4e8b-afe5-
8e18597ac90b" into oc-dev am:
ee97cf22ba am:
ceb2e462f8
am:
462e72e57d
Change-Id: I50253fa1812ff0b944219513c2c99598e0b75d8e
Bill Yi [Sat, 3 Mar 2018 08:44:59 +0000 (08:44 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
dfffd1a532 skipped:
b8f08e00fd am:
4cd38db343 -s ours am:
d1ed6e90b2 -s ours
am:
7e354b0ffe -s ours
Change-Id: Ic8151011ed5e74939d74d567765f10817abced9e
Bill Yi [Sat, 3 Mar 2018 08:44:57 +0000 (08:44 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
7a217545ed skipped:
b0046a8e4e am:
dbea58fe4b -s ours am:
6a223c3aaa -s ours am:
3d12b053bc -s ours
am:
b8d90e47ef -s ours
Change-Id: I27d3617e32d59dde9324bf63a3912d12c6604816
Bill Yi [Sat, 3 Mar 2018 08:23:19 +0000 (08:23 +0000)]
Merge changes from topic "am-
2cc1b50f-d7fa-4824-840a-
51adc851b2fa" into oc-dev am:
b59324afa1 am:
bf7981bf90 am:
aed8d39fe7
am:
b1974396f9
Change-Id: I158fa5d27c9d02c1c76f362f035de6c00a2f29e5
Bill Yi [Sat, 3 Mar 2018 08:22:31 +0000 (08:22 +0000)]
Merge changes from topic "am-
9b4b0f8c-4823-4712-936a-
f4aafe519eff" into oc-dev am:
13ac18d299 am:
585ba6b3ec
am:
cfa5b7fa32
Change-Id: I12fa15bd34e438b3a26dbb0bcfafb2e6b0148deb
Bill Yi [Sat, 3 Mar 2018 08:21:46 +0000 (08:21 +0000)]
Merge changes from topic "am-
6f0d1125-8060-4e8b-afe5-
8e18597ac90b" into oc-dev am:
ee97cf22ba
am:
ceb2e462f8
Change-Id: I1d0313a868fd0083b78994912746f1fbe5acf714
Bill Yi [Sat, 3 Mar 2018 08:15:59 +0000 (08:15 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
dfffd1a532 skipped:
b8f08e00fd am:
4cd38db343 -s ours
am:
d1ed6e90b2 -s ours
Change-Id: I6afd2c8ac6b486398cd0cc9d051d5ebef456bfaa
Bill Yi [Sat, 3 Mar 2018 08:15:50 +0000 (08:15 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5d8bb93905 skipped:
2a68a8d9ad am:
551e9b00ee -s ours am:
7d05ce8473 -s ours am:
db8a0233a4 -s ours
am:
515556988f -s ours
Change-Id: Ic42ab0f8da9f3473ffcbfca130298ea185851802
Bill Yi [Sat, 3 Mar 2018 08:15:40 +0000 (08:15 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
7a217545ed skipped:
b0046a8e4e am:
dbea58fe4b -s ours am:
6a223c3aaa -s ours
am:
3d12b053bc -s ours
Change-Id: Id2eeb3af6cd35bae85d1dedbcf8bf450534195b8
Bill Yi [Sat, 3 Mar 2018 08:09:41 +0000 (08:09 +0000)]
Merge changes from topic "am-
9b4b0f8c-4823-4712-936a-
f4aafe519eff" into oc-dev am:
13ac18d299
am:
585ba6b3ec
Change-Id: I70d1513b0c85f9a31eafe5cb1785e47ab7e29ed9
Bill Yi [Sat, 3 Mar 2018 08:05:08 +0000 (08:05 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
7a217545ed skipped:
b0046a8e4e am:
dbea58fe4b -s ours
am:
6a223c3aaa -s ours
Change-Id: Idf18f2f7f59f15c12ed1f18c337f6a08913b7f34
Bill Yi [Sat, 3 Mar 2018 07:56:54 +0000 (07:56 +0000)]
Merge changes from topic "am-
72eed970-759d-4148-b4df-
72c2aa104b56" into oc-dev am:
3850cf69e3 am:
bad5ea4cb1 am:
0c557735b7
am:
83e2dc6874
Change-Id: I1b634dcf6691cd68c72d6241045f8cfe467d97fc
Bill Yi [Sat, 3 Mar 2018 07:55:51 +0000 (07:55 +0000)]
Merge changes from topic "am-
2cc1b50f-d7fa-4824-840a-
51adc851b2fa" into oc-dev am:
b59324afa1 am:
bf7981bf90
am:
aed8d39fe7
Change-Id: Id390a60af18718f4eb375318c3ea8eb1a2f85e10
Bill Yi [Sat, 3 Mar 2018 07:49:06 +0000 (07:49 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
73534775a6 skipped:
9c8f34f724 am:
ac782db7b2 -s ours am:
1f6fdce0b0 -s ours am:
b90a10513e -s ours
am:
9d9ea4c320 -s ours
Change-Id: I98975c0659945be13e318b5a296fa849768eea3a
Bill Yi [Sat, 3 Mar 2018 07:49:05 +0000 (07:49 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5d8bb93905 skipped:
2a68a8d9ad am:
551e9b00ee -s ours am:
7d05ce8473 -s ours
am:
db8a0233a4 -s ours
Change-Id: I8e64f428f1fc95d5387459a3f25c94e9bace9377
Bill Yi [Sat, 3 Mar 2018 07:37:08 +0000 (07:37 +0000)]
Merge changes from topic "am-
2cc1b50f-d7fa-4824-840a-
51adc851b2fa" into oc-dev am:
b59324afa1
am:
bf7981bf90
Change-Id: Ib3e91f95f6bb6cde1c65be0d3cd9a9e3b45b0e7e
Bill Yi [Sat, 3 Mar 2018 07:36:55 +0000 (07:36 +0000)]
Merge changes from topic "am-
72eed970-759d-4148-b4df-
72c2aa104b56" into oc-dev am:
3850cf69e3 am:
bad5ea4cb1
am:
0c557735b7
Change-Id: I84b3def855146d6db4d9bd623e9e96c89e8081d4
Bill Yi [Sat, 3 Mar 2018 07:32:32 +0000 (07:32 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
52ebdfd973 skipped:
c400b6da60 am:
fa863f597e -s ours am:
3d82e195f7 -s ours am:
0f9e3adcda -s ours
am:
2bbfea01e4 -s ours
Change-Id: Ib8fd9e360d017c7e8e2170d274485639435e3b44
Bill Yi [Sat, 3 Mar 2018 07:31:51 +0000 (07:31 +0000)]
Merge changes from topic "am-
6f0d1125-8060-4e8b-afe5-
8e18597ac90b" into oc-dev
am:
ee97cf22ba
Change-Id: Ia9e780f378a33f48434d1e98760091d3642c8990
Bill Yi [Sat, 3 Mar 2018 07:30:57 +0000 (07:30 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5d8bb93905 skipped:
2a68a8d9ad am:
551e9b00ee -s ours
am:
7d05ce8473 -s ours
Change-Id: I5c502117018ae3a155feaacd0e72ce14c302728b
Bill Yi [Sat, 3 Mar 2018 07:29:59 +0000 (07:29 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
73534775a6 skipped:
9c8f34f724 am:
ac782db7b2 -s ours am:
1f6fdce0b0 -s ours
am:
b90a10513e -s ours
Change-Id: Iebc8057fc5a7fb58e90bc71db5dd25a456583e12
Bill Yi [Sat, 3 Mar 2018 07:29:56 +0000 (07:29 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
dfffd1a532 skipped:
b8f08e00fd
am:
4cd38db343 -s ours
Change-Id: I1800067c2cb7ca5de32951338f2548390c396fad
Masaho Nishikawa [Sat, 3 Mar 2018 07:28:54 +0000 (07:28 +0000)]
Merge "Add config to show an alert dialog for video charges" am:
1451124f86 am:
2c773d3f96
am:
513044b23a
Change-Id: I94af04cf0fca1dbcb6bb66cddcd473df22790f5f
Bill Yi [Sat, 3 Mar 2018 07:17:16 +0000 (07:17 +0000)]
Merge changes from topic "am-
9b4b0f8c-4823-4712-936a-
f4aafe519eff" into oc-dev
am:
13ac18d299
Change-Id: I1e5b02cb9baad310f20bace33ce89c9668fbb3c0
Bill Yi [Sat, 3 Mar 2018 07:16:45 +0000 (07:16 +0000)]
Merge changes from topic "am-
72eed970-759d-4148-b4df-
72c2aa104b56" into oc-dev am:
3850cf69e3
am:
bad5ea4cb1
Change-Id: I4ab3e06e6a678dfff13d3ab205a497375b711f72
Bill Yi [Sat, 3 Mar 2018 07:15:14 +0000 (07:15 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
7a217545ed skipped:
b0046a8e4e
am:
dbea58fe4b -s ours
Change-Id: Ic72202f29a2a0101edfe89bce777b9a514296ebd
Bill Yi [Sat, 3 Mar 2018 07:11:41 +0000 (07:11 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
73534775a6 skipped:
9c8f34f724 am:
ac782db7b2 -s ours
am:
1f6fdce0b0 -s ours
Change-Id: I890e25939e0ca062b0be8c628089dbe455302fa2
Bill Yi [Sat, 3 Mar 2018 07:03:23 +0000 (07:03 +0000)]
Merge changes from topic "am-
2cc1b50f-d7fa-4824-840a-
51adc851b2fa" into oc-dev
am:
b59324afa1
Change-Id: I34809b7775652fa23e145a73647b67292f41f10e
Bill Yi [Sat, 3 Mar 2018 07:01:41 +0000 (07:01 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5d8bb93905 skipped:
2a68a8d9ad
am:
551e9b00ee -s ours
Change-Id: I482f064fca94761b7d01597177d7642629cf1553