OSDN Git Service
Tyler Gunn [Tue, 29 Aug 2017 22:07:41 +0000 (22:07 +0000)]
Merge "Handle alternate status values." into oc-mr1-dev
am:
0240dc99db
Change-Id: Ie386bdb4c77df1305d80f604f48174794c3ee0c1
Android Build Merger (Role) [Tue, 29 Aug 2017 21:28:36 +0000 (21:28 +0000)]
Merge "Merge "Clear focused-in-cluster on focusability changes" into oc-mr1-dev am:
102520f88e" into oc-mr1-dev-plus-aosp
Evan Rosky [Tue, 29 Aug 2017 21:21:19 +0000 (21:21 +0000)]
Merge "Clear focused-in-cluster on focusability changes" into oc-mr1-dev
am:
102520f88e
Change-Id: Ib6fd927e1d8af019ea2a644b95cd6dfc7ae8851d
Bill Yi [Tue, 29 Aug 2017 21:20:26 +0000 (21:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
db61e7ec73 -s ours
am:
8c49bbb74a -s ours
Change-Id: I87f7b91e87b04a51ddb9f24a944df48764b06380
Bill Yi [Tue, 29 Aug 2017 21:06:33 +0000 (21:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
db61e7ec73 -s ours
Change-Id: Ifb8aae76ed66234e0e39d538d84e2567f9e26003
Tyler Gunn [Tue, 29 Aug 2017 21:06:20 +0000 (21:06 +0000)]
Merge "Handle alternate status values." into oc-mr1-dev
TreeHugger Robot [Tue, 29 Aug 2017 21:01:05 +0000 (21:01 +0000)]
Merge "Clear focused-in-cluster on focusability changes" into oc-mr1-dev
TreeHugger Robot [Tue, 29 Aug 2017 20:53:24 +0000 (20:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Jiongxuan Gao [Tue, 29 Aug 2017 20:18:27 +0000 (20:18 +0000)]
Merge "Fix ListView can not be moved after rotation." into oc-mr1-dev
am:
10477217f5
Change-Id: Ifb68ab61a474a559586b6ad76a6b25cc6fd167d3
TreeHugger Robot [Tue, 29 Aug 2017 20:09:56 +0000 (20:09 +0000)]
Merge "Fix ListView can not be moved after rotation." into oc-mr1-dev
Hyunyoung Song [Tue, 29 Aug 2017 20:01:25 +0000 (20:01 +0000)]
Merge "Add shadow to adaptive icons to the shared sheet Test: manual Bug:
65015602" into oc-mr1-dev
am:
cc4f60fe4b
Change-Id: Id657cc6bb5c5a63c408048c39908d24b2bc0cdb0
TreeHugger Robot [Tue, 29 Aug 2017 19:54:26 +0000 (19:54 +0000)]
Merge "Add shadow to adaptive icons to the shared sheet Test: manual Bug:
65015602" into oc-mr1-dev
Vladislav Kaznacheev [Tue, 29 Aug 2017 19:21:09 +0000 (19:21 +0000)]
Merge "Fix tooltips for views in a popup window" into oc-mr1-dev
am:
6a1dad9194
Change-Id: I3ac05ae79fe908819d56f90c90f80cc1368670ba
TreeHugger Robot [Tue, 29 Aug 2017 19:08:30 +0000 (19:08 +0000)]
Merge "Fix tooltips for views in a popup window" into oc-mr1-dev
Sudheer Shanka [Tue, 29 Aug 2017 18:01:14 +0000 (18:01 +0000)]
Merge "KernelUidCpuFreqTimeReader: Put logs under debug flag." into oc-mr1-dev
am:
903dc2fdd2
Change-Id: I2810e61300d5c2317639b261898931e66d075cb5
TreeHugger Robot [Tue, 29 Aug 2017 17:58:06 +0000 (17:58 +0000)]
Merge "resolve merge conflicts of
1a5e87918ebe to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp
Jakub Pawlowski [Tue, 29 Aug 2017 17:41:39 +0000 (17:41 +0000)]
Fix GATT client leakage when scan is throttled (1/2)
am:
f507490404 -s ours
Change-Id: Ieae0bc1ff8131e86c4253cc5f5b1760e366b3c58
Sudheer Shanka [Tue, 29 Aug 2017 17:40:33 +0000 (17:40 +0000)]
Merge "KernelUidCpuFreqTimeReader: Put logs under debug flag." into oc-mr1-dev
Jiongxuan Gao [Thu, 24 Nov 2016 11:20:27 +0000 (20:20 +0900)]
Fix ListView can not be moved after rotation.
Symptom:
"Share with" popup displayed incompletely, and cannot be slid after
rotated the screen twice.
Root cause:
Since ChooserActivity's configChanges attribute contains
"screenSize|orientation" , when user rotates device, Android will
not recreate ChooserActivity, its content view ResolverDrawerLayout
is also not recreated. In ResolverDrawerLayout's onMeasure, it will
call getHeightUsed to calculate the ListView's height. getHeightUsed
will check against the lowest child view plus padding and margin
instead of the actual measured height of the ListView. This lets the
ListView hang off the edge when all of the content would fit on-screen
. Because of ResolverDrawerLayout has not been drawn yet, we can not
get the actual showing items' count of ListView before it's drawn, the
result of getChildCount for ListView will return the value in landscape
mode. The heightUsed of ListView might be smaller. mCollapsibleHeight
will be 0. When received a move action, the mCollapseOffset and new
position might both be 0.
Solution:
When configuration changed, we should rebuild the list and refresh
adapter's data set. Just like onRestart does.
Bug:
34365764
Change-Id: I4be0f9afc68588fbb0d8d152c41509650d04c754
Jakub Pawlowski [Mon, 28 Aug 2017 11:12:49 +0000 (04:12 -0700)]
Fix GATT client leakage when scan is throttled (1/2)
Currently, scan throttling happens after client is registered, but
before the scan is started. This might lead to scan client being leaked.
This patch fixed that by moving check before client registration.
Bug:
64887233
Test: manual
Change-Id: I22ae624a0c51110cb69679f796926e3b2b36d0ac
Merged-In: I22ae624a0c51110cb69679f796926e3b2b36d0ac
(cherry picked from commit
ee02e1ce774777e85b10be6d1ad5c6083fa08c18)
Bryce Lee [Tue, 29 Aug 2017 17:23:14 +0000 (17:23 +0000)]
Merge "Remove activity from stopping activities once resumed." into oc-mr1-dev
am:
02584a23b3
Change-Id: I6210e77f2d4a2cea52f2a314b2d329b51f79c93a
Bryce Lee [Tue, 29 Aug 2017 17:13:58 +0000 (17:13 +0000)]
Merge "Remove activity from stopping activities once resumed." into oc-mr1-dev
Nick Desaulniers [Tue, 29 Aug 2017 16:48:35 +0000 (16:48 +0000)]
Merge "DeviceInfoUtils.java: support to show kernel version compiled with clang" into oc-mr1-dev
am:
a7e34096af
Change-Id: I54b9de0a3ff162ce8d91b08095831413fceefa88
Jean-Michel Trivi [Tue, 29 Aug 2017 16:43:44 +0000 (16:43 +0000)]
Merge "AudioService: log volume commands and origin" into oc-mr1-dev
am:
c3fcd65e61
Change-Id: I8cd88be04af0aea7bde9b10bc82b839613898eb4
Nick Desaulniers [Tue, 29 Aug 2017 16:37:28 +0000 (16:37 +0000)]
Merge "DeviceInfoUtils.java: support to show kernel version compiled with clang" into oc-mr1-dev
Jean-Michel Trivi [Tue, 29 Aug 2017 16:35:45 +0000 (16:35 +0000)]
Merge "AudioService: log volume commands and origin" into oc-mr1-dev
Jason Monk [Tue, 29 Aug 2017 15:30:52 +0000 (11:30 -0400)]
resolve merge conflicts of
1a5e87918ebe to oc-mr1-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I4d79b74e70e910db662713a2d5ffdcfe287b084f
Jason Monk [Tue, 29 Aug 2017 14:49:42 +0000 (14:49 +0000)]
Merge "Fix QS user icon in guest mode" am:
7d4e9b81b4
am:
526cd8923f
Change-Id: I91836c0d28cefbe5965586609d6eb521c8c2158a
Jason Monk [Tue, 29 Aug 2017 14:40:47 +0000 (14:40 +0000)]
Merge "Fix QS user icon in guest mode"
am:
7d4e9b81b4
Change-Id: I144ab6fea2e9ece6f01004c03c85da72a8c069f2
Jason Monk [Tue, 29 Aug 2017 14:25:12 +0000 (14:25 +0000)]
Merge "Fix QS user icon in guest mode"
Joachim Sauer [Tue, 29 Aug 2017 14:16:18 +0000 (14:16 +0000)]
Merge "Adapt ICU 59 API update to Doclava changes." am:
e048261656 am:
0fc0cc9dd8
am:
02b2b3d703
Change-Id: I09d38e6ed0426bc826722c1cdb5e7c79cf90adb6
Joachim Sauer [Tue, 29 Aug 2017 14:04:40 +0000 (14:04 +0000)]
Merge "Adapt ICU 59 API update to Doclava changes." am:
e048261656
am:
0fc0cc9dd8
Change-Id: I93b14c129711fad75fee3aa34f3a0fed04eb1182
Joachim Sauer [Tue, 29 Aug 2017 13:54:14 +0000 (13:54 +0000)]
Merge "Adapt ICU 59 API update to Doclava changes."
am:
e048261656
Change-Id: Iea671a7029e083bffee2bcaacfaa0df41f45c1cc
Joachim Sauer [Tue, 29 Aug 2017 13:42:26 +0000 (13:42 +0000)]
Merge "Adapt ICU 59 API update to Doclava changes."
Jorim Jaggi [Tue, 29 Aug 2017 11:41:26 +0000 (11:41 +0000)]
Merge changes I36ec1bf3,Ic5f11074 into oc-mr1-dev
am:
54f40fa1e6
Change-Id: I908fe0868bbc85b959e9d41afa709019669131da
Jorim Jaggi [Tue, 29 Aug 2017 11:32:07 +0000 (11:32 +0000)]
Merge changes I36ec1bf3,Ic5f11074 into oc-mr1-dev
* changes:
Fix transition between two occluding activities
Use Keyguard orientation when unoccluding
Akari Tsuneta [Thu, 10 Aug 2017 11:51:44 +0000 (20:51 +0900)]
Fix QS user icon in guest mode
When the profile is updated in guest mode, the user icon in QS footer
is not displayed correctly. To fix this issue, the tinting of
guest icon is applied only when the drawable is not UserIconDrawable.
Fixes:
65148947
Test: manual - switch to guest and update the profile.
Change-Id: I9690e9fd286703a25ee08d877c3dd7f4729e2b31
Joachim Sauer [Tue, 29 Aug 2017 10:26:29 +0000 (11:26 +0100)]
Adapt ICU 59 API update to Doclava changes.
Add methods that were missing from the previous API update because the
update-api version used for that had different behaviour from the
current one.
Specifically overrides for methods that differ only in sychronization
are now considered API-worthy and weren't before (b/
62576297).
All methods added in this commit are methods that exist in the base
class without synchronization and are synchronized in the class they are
now being added in.
Bug:
64807220
Test: m checkapi
Change-Id: I9bf1b3d02e6a8f04b93ec36c0adffb7eedad3ad3
Merged-In: Iff584fb72dc8d651f9482b573f4b8cec89840ca6
Jakub Pawlowski [Tue, 29 Aug 2017 08:31:19 +0000 (08:31 +0000)]
Merge "Fix GATT client leakage when scan is throttled (1/2)" am:
3cc1ad87f0 am:
d019cce887
am:
ced5e47a3d
Change-Id: Ie1316a273325cd5308cf9faab61dd0f43f899365
Jakub Pawlowski [Tue, 29 Aug 2017 08:19:50 +0000 (08:19 +0000)]
Merge "Fix GATT client leakage when scan is throttled (1/2)" am:
3cc1ad87f0
am:
d019cce887
Change-Id: I24d4dbf1344b13c558aa6974dfee6fd0e8549056
Jakub Pawlowski [Tue, 29 Aug 2017 08:09:15 +0000 (08:09 +0000)]
Merge "Fix GATT client leakage when scan is throttled (1/2)"
am:
3cc1ad87f0
Change-Id: Ieda555f6f8bda35201327c6c6e0c97621b88671e
Jakub Pawlowski [Tue, 29 Aug 2017 08:00:55 +0000 (08:00 +0000)]
Merge "Fix GATT client leakage when scan is throttled (1/2)"
Sudheer Shanka [Tue, 29 Aug 2017 01:10:18 +0000 (18:10 -0700)]
KernelUidCpuFreqTimeReader: Put logs under debug flag.
Bug:
63041570
Test: N/A
Change-Id: Ifdeacb227bb936de82af9c9505621b327de3a9d2
Hugo Benichi [Tue, 29 Aug 2017 05:42:07 +0000 (05:42 +0000)]
Merge "Nat464Xlat: interface notification handler on ConnectivityService" am:
91817b3129 am:
02f6cfa49e
am:
f55c1ae9b6
Change-Id: I9116a493ca1cbdf6a25664a1b0017aa6c9b38eb4
Hugo Benichi [Tue, 29 Aug 2017 05:31:38 +0000 (05:31 +0000)]
Merge "Nat464Xlat: interface notification handler on ConnectivityService" am:
91817b3129
am:
02f6cfa49e
Change-Id: Ib224392c9a185f6bd79fd60cd5cb5549f2a7851e
Hugo Benichi [Tue, 29 Aug 2017 05:20:32 +0000 (05:20 +0000)]
Merge "Nat464Xlat: interface notification handler on ConnectivityService"
am:
91817b3129
Change-Id: I2f002cd197e2eeaaadadd747a6b33d264cd34433
Hugo Benichi [Tue, 29 Aug 2017 05:08:00 +0000 (05:08 +0000)]
Merge "Nat464Xlat: interface notification handler on ConnectivityService"
Felipe Leme [Tue, 29 Aug 2017 03:24:00 +0000 (03:24 +0000)]
Merge "Hides the Save UI while handling a pending intent from CustomDescription." into oc-mr1-dev
am:
55309e79cf
Change-Id: I77d7a6e10d33b5e983d7652613c752829a886b01
TreeHugger Robot [Tue, 29 Aug 2017 03:13:57 +0000 (03:13 +0000)]
Merge "Hides the Save UI while handling a pending intent from CustomDescription." into oc-mr1-dev
Svetoslav Ganov [Tue, 29 Aug 2017 01:08:57 +0000 (01:08 +0000)]
Merge "Grant location to default launcher" into oc-mr1-dev
am:
25e5a3446e
Change-Id: I25f08bcfd2d0774800f975cde195bc01f23734a9
Felipe Leme [Thu, 3 Aug 2017 21:27:57 +0000 (14:27 -0700)]
Hides the Save UI while handling a pending intent from CustomDescription.
When the AutofillService sets a PendingIntent to launch an activity when
clicking a chield view (for example, to lauch a web page displayign the terms
and conditions of saving something), the system must hide the Save UI and
restore it after the new activity is dismissed.
That sounds simple in the surface, but it requires a huge refactoring behind
the scenes, such as injecting a token in the activity intent and using that
token to hide / cancel the UI during some activity lifecycle events.
Test: lotta of brand-new shinning tests on CtsAutoFillServiceTestCases
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases
Change-Id: Ie8ec7aeb2c63cab68467046c1a9dcf85dbcc24ec
Fixes:
64309238
Svetoslav Ganov [Tue, 29 Aug 2017 00:47:25 +0000 (00:47 +0000)]
Merge "Grant location to default launcher" into oc-mr1-dev
Colin Cross [Tue, 29 Aug 2017 00:38:13 +0000 (00:38 +0000)]
Merge "Use guava 21.0" am:
edb2e0c722 am:
f1c99fb47f
am:
a119b38d9e
Change-Id: If9ac959f83de3627ff9950ee727acb3ab07c7b9c
Colin Cross [Tue, 29 Aug 2017 00:15:35 +0000 (00:15 +0000)]
Merge "Use guava 21.0" am:
edb2e0c722
am:
f1c99fb47f
Change-Id: I8349115cf2b7678ac6e24ea2aa06ed59bffa5930
Colin Cross [Tue, 29 Aug 2017 00:03:24 +0000 (00:03 +0000)]
Merge "Use guava 21.0"
am:
edb2e0c722
Change-Id: Icf8873b268677a631659a7ee0f7816495f6acd38
Hugo Benichi [Wed, 5 Jul 2017 02:08:48 +0000 (11:08 +0900)]
Nat464Xlat: interface notification handler on ConnectivityService
This patch adds a layer of asynchonicity to the NetworkBaseObserver
callbacks implemented by Nat464Xlat in order to allow these callbacks
to run on the main ConnectivityService handler.
This allows to run interfaceLinkStateChanged and interfaceRemoved
callbacks in the same thread context as other Nat464Xlat methods and
solves the following issues:
- NPE risk due to race between fixupLinkProperties called on the
ConnectivityService thread and interfaceRemoved called as a
callback by NetworkManagementService.
- stale LinkProperties reads in both callbacks not called on
ConnectivityService handler.
- removes the race between stop() and interfaceRemoved().
This patch also:
- removes/simplifies comments related to the threading
model which are no obsolete.
- extract clatd management logic from ConnectivityService into
NetworkAgentInfo
Bug:
62997041
Bug:
64571917
Test: runtest frameworks-net
manually connected to ipv6 network and went to test-ipv6.com
Change-Id: I889d98e47423ff3d4746d6ed8015b265286e7c52
Colin Cross [Mon, 28 Aug 2017 23:50:52 +0000 (23:50 +0000)]
Merge "Use guava 21.0"
Zheng Zhang [Mon, 28 Aug 2017 23:39:26 +0000 (23:39 +0000)]
Merge "Listen TRANSPORT_BLUETOOTH network change in GnssLocationProvider" into oc-mr1-dev
am:
61492c85ba
Change-Id: I7e3e6413d6edab90ae4ebd38d49aaf6157aed26c
Yongqin Liu [Thu, 8 Jun 2017 08:15:29 +0000 (16:15 +0800)]
DeviceInfoUtils.java: support to show kernel version compiled with clang
The kernel version displayed in settings is only shown correctly
when built with gcc, this change adds support for a kernel built
with clang.
Test: manually on hikey with following command:
adb shell am instrument -w -e class com.android.settings.DeviceInfoSettingsTest com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner
Fixes:
32547905
Test: manual inspection of clang and gcc build kernel Settings.
Change-Id: I9b7991681cb5abdf44e7d1d1bff84c7c866be2ed
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Matthew Ng [Mon, 28 Aug 2017 23:33:36 +0000 (23:33 +0000)]
Merge "Low ram devices recents list is throwable" into oc-mr1-dev
am:
b49fa21828
Change-Id: Id97947d9f2d06c21777750ca17d877f6a13fbdf7
Jean-Michel Trivi [Fri, 25 Aug 2017 00:24:57 +0000 (17:24 -0700)]
AudioService: log volume commands and origin
Add volume logger for volume events.
Move AudioService event definitions to separate file.
Test: change volume with volume buttons and dumpsys audio
Bug:
64470715
Change-Id: I25db849bffb4a41a737d226cfc40e2c6f7e0ecc0
TreeHugger Robot [Mon, 28 Aug 2017 23:20:18 +0000 (23:20 +0000)]
Merge "Listen TRANSPORT_BLUETOOTH network change in GnssLocationProvider" into oc-mr1-dev
Zheng Zhang [Tue, 22 Aug 2017 17:27:14 +0000 (10:27 -0700)]
Listen TRANSPORT_BLUETOOTH network change in GnssLocationProvider
TRANSPORT_BLUETOOTH is a essential network type for wearable device.
For non-master branch, only listen to Bluetooth on wearable device.
Bug:
64881794
Test: Trigger Bluetooth on/off on watch, check if UpdateNetworkState()
got called.
Merged-In: I30e39943220597987320ea7843d7d36827fdd0c7
Change-Id: I30e39943220597987320ea7843d7d36827fdd0c7
(cherry picked from commit
d6886710b5c9ed9d1567c4ee59773071bae7070c)
Hugo Benichi [Mon, 28 Aug 2017 23:12:13 +0000 (23:12 +0000)]
Merge "Nat464Xlat: internal state guards cleanup + state enum" am:
aee703e7e4 am:
20d4df8cc1
am:
68c8b4ad5d
Change-Id: Ib04b9a3d56e9daf61b299a30e24a3c8839819a00
TreeHugger Robot [Mon, 28 Aug 2017 23:07:50 +0000 (23:07 +0000)]
Merge "Low ram devices recents list is throwable" into oc-mr1-dev
Hugo Benichi [Mon, 28 Aug 2017 23:01:36 +0000 (23:01 +0000)]
Merge "Nat464Xlat: internal state guards cleanup + state enum" am:
aee703e7e4
am:
20d4df8cc1
Change-Id: Ic2246a97618c596dbdbf48cda39c2f5b66e3bfb6
Android Build Merger (Role) [Mon, 28 Aug 2017 22:54:10 +0000 (22:54 +0000)]
Merge "Merge "Bump special windows layer adjustment" into oc-mr1-dev am:
f3f7a101fb" into oc-mr1-dev-plus-aosp
Hugo Benichi [Mon, 28 Aug 2017 22:49:50 +0000 (22:49 +0000)]
Merge "Nat464Xlat: internal state guards cleanup + state enum"
am:
aee703e7e4
Change-Id: I188ac4c367db11cb33b67fe92df3a120e3c6fbce
Winson Chung [Mon, 28 Aug 2017 22:48:45 +0000 (22:48 +0000)]
Merge "Bump special windows layer adjustment" into oc-mr1-dev
am:
f3f7a101fb
Change-Id: I233c1302fd7f86854255e64c06ef5c5130f77a29
bokyung.kim [Mon, 28 Aug 2017 22:47:34 +0000 (22:47 +0000)]
Merge "Fixed mimetype error of PPT file" am:
3c28e2b280 am:
148414cd2c
am:
1190da1b1e
Change-Id: I0eb5f50a6ac95d5512fbae9888b37a3c64917902
bokyung.kim [Mon, 28 Aug 2017 22:37:39 +0000 (22:37 +0000)]
Merge "Fixed mimetype error of PPT file" am:
3c28e2b280
am:
148414cd2c
Change-Id: I73f527fd006a39f00dafbe0b8c85cd583cf283f7
TreeHugger Robot [Mon, 28 Aug 2017 22:33:14 +0000 (22:33 +0000)]
Merge "Bump special windows layer adjustment" into oc-mr1-dev
Hugo Benichi [Mon, 28 Aug 2017 22:30:27 +0000 (22:30 +0000)]
Merge "Nat464Xlat: internal state guards cleanup + state enum"
bokyung.kim [Mon, 28 Aug 2017 22:27:38 +0000 (22:27 +0000)]
Merge "Fixed mimetype error of PPT file"
am:
3c28e2b280
Change-Id: I24b9dcf6506c53e26b901f74442f64bb28198611
Treehugger Robot [Mon, 28 Aug 2017 22:12:37 +0000 (22:12 +0000)]
Merge "Fixed mimetype error of PPT file"
Svet Ganov [Mon, 28 Aug 2017 19:39:35 +0000 (12:39 -0700)]
Grant location to default launcher
Test: updated DefaultPermissionGrantPolicy test which passes
bug:
62959599
Change-Id: Ifaac04758348049dd170a7e7b7ac234dced5f759
Android Build Merger (Role) [Mon, 28 Aug 2017 20:48:29 +0000 (20:48 +0000)]
Merge "Import translations. DO NOT MERGE am:
e0fec63824 -s ours am:
156955898f -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Mon, 28 Aug 2017 20:45:02 +0000 (20:45 +0000)]
Import translations. DO NOT MERGE am:
e0fec63824 -s ours
am:
156955898f -s ours
Change-Id: I5b5e2db47336ca156750b0f476dc1915b6743afa
Bill Yi [Mon, 28 Aug 2017 20:40:58 +0000 (20:40 +0000)]
Import translations. DO NOT MERGE am:
e0fec63824 -s ours
am:
b22505ca14 -s ours
Change-Id: I3207da4df3a1086a3ad218054734f12b95c4fbed
Bill Yi [Mon, 28 Aug 2017 20:29:53 +0000 (20:29 +0000)]
Import translations. DO NOT MERGE
am:
e0fec63824 -s ours
Change-Id: I6c1b10a7eef1aa0b75bff31db698d7601ae89ead
Bill Yi [Mon, 28 Aug 2017 20:23:48 +0000 (20:23 +0000)]
Import translations. DO NOT MERGE
am:
e0fec63824 -s ours
Change-Id: Iac255ef2407c7e3ff393fb01124d9a052bcde728
xulicheng [Mon, 28 Aug 2017 20:21:45 +0000 (20:21 +0000)]
Merge "Ensure the generation is not changed before put value to cache" am:
11ae580f81 am:
489f2c2c48
am:
848cde3beb
Change-Id: I52b5811ab3aab9bda73d1c4706858e3e8a70bef2
bokyung.kim [Wed, 26 Jul 2017 01:18:39 +0000 (10:18 +0900)]
Fixed mimetype error of PPT file
Change mimetype of PPT file to match MS specification.
(MimeUtils.java matched the MS specification)
Test: Check mimetype of DB after saving PPT file.
Change-Id: Ie559499ae39bc527fcc656ba37f28845af209e6c
Signed-off-by: bokyung.kim <bokyung.kim@lge.com>
xulicheng [Mon, 28 Aug 2017 20:11:08 +0000 (20:11 +0000)]
Merge "Ensure the generation is not changed before put value to cache" am:
11ae580f81
am:
489f2c2c48
Change-Id: Idab1a2d1f4ee8cc28a38c3c82ea9a8ad7f9d3bf4
xulicheng [Mon, 28 Aug 2017 19:58:06 +0000 (19:58 +0000)]
Merge "Ensure the generation is not changed before put value to cache"
am:
11ae580f81
Change-Id: I5bf2c557f6f46f1455204761a9045b8b90d7ea32
Eugene Susla [Mon, 28 Aug 2017 19:55:47 +0000 (19:55 +0000)]
Merge "Avoid running hasCompanionDevices on main thread" into oc-mr1-dev
am:
933108ed14
Change-Id: I244acf8ad34e1e2098c996b7e5c5549fdac4abfd
Nate Fischer [Mon, 28 Aug 2017 19:49:26 +0000 (19:49 +0000)]
Merge "WebView: require APKs to target OMR1" into oc-mr1-dev
am:
c233f44a26
Change-Id: I54f07a5f3672af8fa953b0861bcf2be4b90d0ac6
Eugene Susla [Mon, 28 Aug 2017 19:43:31 +0000 (19:43 +0000)]
Merge "Avoid running hasCompanionDevices on main thread" into oc-mr1-dev
Treehugger Robot [Mon, 28 Aug 2017 19:42:11 +0000 (19:42 +0000)]
Merge "Ensure the generation is not changed before put value to cache"
Nate Fischer [Mon, 28 Aug 2017 19:36:29 +0000 (19:36 +0000)]
Merge "WebView: require APKs to target OMR1" into oc-mr1-dev
Ajay Panicker [Mon, 28 Aug 2017 19:34:07 +0000 (19:34 +0000)]
Merge "Add equal overloads to some MediaDescription and MediaQueue objects (2/3)" into oc-mr1-dev
am:
619503b279
Change-Id: Id148586a545c653dc57768533da9a066c1e7a662
TreeHugger Robot [Mon, 28 Aug 2017 19:26:41 +0000 (19:26 +0000)]
Merge "Add equal overloads to some MediaDescription and MediaQueue objects (2/3)" into oc-mr1-dev
Hyunyoung Song [Fri, 25 Aug 2017 01:08:35 +0000 (18:08 -0700)]
Add shadow to adaptive icons to the shared sheet
Test: manual
Bug:
65015602
Change-Id: I01de79edc0a13817680106b1ef46e3212487b62f
Nate Fischer [Mon, 28 Aug 2017 19:15:56 +0000 (12:15 -0700)]
WebView: require APKs to target OMR1
This disallows WebView/Monochrome APKs targeting O or below to be chosen
as WebView providers.
Bug:
65080651
Test: Open WebView shell with webview from system image, no crash
Test: Install Monochrome compiled for O, it's not in the webview provider list
Change-Id: I79162cedaa801ce227ad4c2eb3cbea9c08704da8
Fyodor Kupolov [Mon, 28 Aug 2017 18:50:48 +0000 (18:50 +0000)]
Merge "Added tron metrics for shutdown time" into oc-mr1-dev
am:
30c565d399
Change-Id: I10d4479c79c1997325f74477a94e4f74eb043f46
Fyodor Kupolov [Mon, 28 Aug 2017 18:41:52 +0000 (18:41 +0000)]
Merge "Added tron metrics for shutdown time" into oc-mr1-dev
Jakub Pawlowski [Mon, 28 Aug 2017 11:12:49 +0000 (04:12 -0700)]
Fix GATT client leakage when scan is throttled (1/2)
Currently, scan throttling happens after client is registered, but
before the scan is started. This might lead to scan client being leaked.
This patch fixed that by moving check before client registration.
Bug:
64887233
Test: manual
Change-Id: I22ae624a0c51110cb69679f796926e3b2b36d0ac
Dan Sandler [Mon, 28 Aug 2017 18:04:22 +0000 (18:04 +0000)]
Merge "Remove extra horz padding on GlobalActions labels." into oc-mr1-dev
am:
0fe2910c37
Change-Id: Ie21704d19dacd062b96538b7784566f193ef7425
TreeHugger Robot [Mon, 28 Aug 2017 17:52:08 +0000 (17:52 +0000)]
Merge "Remove extra horz padding on GlobalActions labels." into oc-mr1-dev
Tyler Gunn [Fri, 25 Aug 2017 22:01:00 +0000 (15:01 -0700)]
Handle alternate status values.
Some carriers use sendrecv to indicate a call in a conference is active,
and sendonly to indicate that the remote party has held the call.
Adding support for these status values.
This ensures that remotely held calls for these carriers are set to held.
Test: Manual
Bug:
33272103
Change-Id: I4a950c4e143d5ac396b30569dbda0b1cf4e92a3e
OSDN Git Service
