OSDN Git Service
Nicolas Geoffray [Tue, 19 Sep 2017 12:11:51 +0000 (12:11 +0000)]
Merge "Special handling of priv-apps in Zygote." am:
46af70cad9 am:
79d4ef6caa
am:
836f2fe701
Change-Id: Ieb8b53e69ac14be6e4e0e0210f12343e7e863b66
Nicolas Geoffray [Tue, 19 Sep 2017 12:03:38 +0000 (12:03 +0000)]
Merge "Special handling of priv-apps in Zygote." am:
46af70cad9
am:
79d4ef6caa
Change-Id: Ice349c6b6160ad89ba1c8543acf3e678a1473a25
Nicolas Geoffray [Tue, 19 Sep 2017 11:56:05 +0000 (11:56 +0000)]
Merge "Special handling of priv-apps in Zygote."
am:
46af70cad9
Change-Id: I1dbf2313c9ee1c014854630eac5f1429548ae7f6
Nicolas Geoffray [Tue, 19 Sep 2017 11:47:58 +0000 (11:47 +0000)]
Merge "Special handling of priv-apps in Zygote."
Charles He [Tue, 19 Sep 2017 08:25:16 +0000 (08:25 +0000)]
Merge changes from topic "vpn-dialog" am:
19bb1a0b99 am:
7e75870d11
am:
a9f6384b6a
Change-Id: I853f48a75865008ac8b976eec1af56fb1870a1b3
Charles He [Tue, 19 Sep 2017 08:17:12 +0000 (08:17 +0000)]
Merge changes from topic "always-on-vpn" am:
cc15c7f8c1 am:
692b55390f
am:
01014743c0
Change-Id: Ide329f8e32538f4643e727697b35bfc2b7007f57
Charles He [Tue, 19 Sep 2017 08:17:05 +0000 (08:17 +0000)]
Merge changes from topic "vpn-dialog" am:
19bb1a0b99
am:
7e75870d11
Change-Id: Ifb581e7b40d52b2378b347ff62669713be344093
Charles He [Tue, 19 Sep 2017 08:09:45 +0000 (08:09 +0000)]
Merge changes from topic "vpn-dialog"
am:
19bb1a0b99
Change-Id: I168072aa2bfdb9ed7630cf50547cb9732fb29280
Charles He [Tue, 19 Sep 2017 08:09:41 +0000 (08:09 +0000)]
Merge changes from topic "always-on-vpn" am:
cc15c7f8c1
am:
692b55390f
Change-Id: I3931c053c4daff092b06e3e1d673817708762a62
Charles He [Tue, 19 Sep 2017 08:01:45 +0000 (08:01 +0000)]
Merge changes from topic "always-on-vpn"
am:
cc15c7f8c1
Change-Id: I7391ce7ecab4f8e73912f420d49150ed7210ea6c
Charles He [Tue, 19 Sep 2017 07:56:44 +0000 (07:56 +0000)]
Merge changes from topic "vpn-dialog"
* changes:
Unbreak VPN unit tests.
Add alert dialog when always-on VPN disconnects.
Charles He [Wed, 16 Aug 2017 12:14:13 +0000 (13:14 +0100)]
Unbreak VPN unit tests.
VpnTest was broken earlier due to a change to always-on VPN
notifications. This CL adds the corresponding mocks to the unit test to
fix it.
Bug:
36650087
Bug:
65439160
Test: runtest frameworks-net
Change-Id: Icff57c7e927c135d75a7d70ff347a579c5d45134
Merged-In: Icff57c7e927c135d75a7d70ff347a579c5d45134
(cherry picked from commit
3da6a1fc82b7e0c7adc88b92e50cceec8173672e)
Charles He [Tue, 19 Sep 2017 07:50:13 +0000 (07:50 +0000)]
Merge changes from topic "always-on-vpn"
* changes:
Opt-out for always-on VPN: rename API.
Opt-out for always-on VPN
Hugo Benichi [Tue, 19 Sep 2017 07:36:12 +0000 (07:36 +0000)]
Merge "Wakeup packet events: addressing a few comments" am:
67d16ec1ab am:
a35bbadeba
am:
19625788a1
Change-Id: I8ca2a01a95acaaca2599563efd6a21e4372d1f95
Hugo Benichi [Tue, 19 Sep 2017 07:29:09 +0000 (07:29 +0000)]
Merge "Wakeup packet events: addressing a few comments" am:
67d16ec1ab
am:
a35bbadeba
Change-Id: I33eeb421cff21efdaa409d27fb130ff4754ac6b0
Hugo Benichi [Tue, 19 Sep 2017 07:21:12 +0000 (07:21 +0000)]
Merge "Wakeup packet events: addressing a few comments"
am:
67d16ec1ab
Change-Id: I67b2e54d45a39005e2091a46e8b90d8cc75fe079
Hugo Benichi [Tue, 19 Sep 2017 07:12:03 +0000 (07:12 +0000)]
Merge "Wakeup packet events: addressing a few comments"
Rubin Xu [Tue, 19 Sep 2017 06:51:07 +0000 (06:51 +0000)]
Merge "Fix LinkPropertiesTest.testCompareResult" am:
430d8472b2 am:
082234f4aa
am:
3db86833e6
Change-Id: I72b0ca1b9b50dacb7067eb6ca12ca48a072b5d26
Rubin Xu [Tue, 19 Sep 2017 06:45:04 +0000 (06:45 +0000)]
Merge "Fix LinkPropertiesTest.testCompareResult" am:
430d8472b2
am:
082234f4aa
Change-Id: Iedfbc9a6505611d1a30c348ab15f4fb5b62238eb
Rubin Xu [Tue, 19 Sep 2017 06:37:40 +0000 (06:37 +0000)]
Merge "Fix LinkPropertiesTest.testCompareResult"
am:
430d8472b2
Change-Id: If87f8c43371ee1f5e2e893232c9e340a1a7339f4
Treehugger Robot [Tue, 19 Sep 2017 06:28:21 +0000 (06:28 +0000)]
Merge "Fix LinkPropertiesTest.testCompareResult"
Hugo Benichi [Tue, 19 Sep 2017 04:15:26 +0000 (13:15 +0900)]
Wakeup packet events: addressing a few comments
This patch addresses a few post-submit comment for
commits
f562ac34a51dc and
60c9f63b66921.
Bug:
34901696
Bug:
62179647
Test: runtest frameworks-net
Change-Id: I4abec57e0c6bc869dc57b5eb54582dd977b64c30
Steven Moreland [Tue, 19 Sep 2017 03:35:00 +0000 (03:35 +0000)]
Merge "Remove unused variable from screencap." am:
376234fc74 am:
32bdb1e9b0
am:
0fcb7719e0
Change-Id: I6aebd6df0bf9734e1567db31d31bfe85609cbb48
Steven Moreland [Tue, 19 Sep 2017 03:29:20 +0000 (03:29 +0000)]
Merge "Remove unused variable from screencap." am:
376234fc74
am:
32bdb1e9b0
Change-Id: If4c2b39333270982975feb1745b3bbaaa3a177b8
Matthew Ng [Tue, 19 Sep 2017 03:24:28 +0000 (03:24 +0000)]
Merge "Set use low res snapshots for low ram devices missing in theme snapshot" into oc-mr1-dev
am:
745388d5aa
Change-Id: I3ced2443d28b3e62c29fdb509d582db7b52c5da8
Steven Moreland [Tue, 19 Sep 2017 03:22:42 +0000 (03:22 +0000)]
Merge "Remove unused variable from screencap."
am:
376234fc74
Change-Id: I5afb38c24ab6924925ab2852c5fe0ef29a91a2ff
TreeHugger Robot [Tue, 19 Sep 2017 03:15:41 +0000 (03:15 +0000)]
Merge "Set use low res snapshots for low ram devices missing in theme snapshot" into oc-mr1-dev
Treehugger Robot [Tue, 19 Sep 2017 03:12:18 +0000 (03:12 +0000)]
Merge "Remove unused variable from screencap."
Pengquan Meng [Tue, 19 Sep 2017 01:38:10 +0000 (01:38 +0000)]
Merge "Incorrect decoding when TP-OA contains non-integer information" am:
2bcc7fac89 am:
74bd3daaac
am:
b3bc234dfa
Change-Id: I5df968dbf00665d3bfdd451dc4e03fda055c371a
Pengquan Meng [Tue, 19 Sep 2017 01:31:24 +0000 (01:31 +0000)]
Merge "Incorrect decoding when TP-OA contains non-integer information" am:
2bcc7fac89
am:
74bd3daaac
Change-Id: Idc00a34295cdcbefa19636643bff3c3bf2323446
Pengquan Meng [Tue, 19 Sep 2017 01:23:53 +0000 (01:23 +0000)]
Merge "Incorrect decoding when TP-OA contains non-integer information"
am:
2bcc7fac89
Change-Id: I4bddee5b8cf19715db56e7286a05f76be530928d
Pawin Vongmasa [Tue, 19 Sep 2017 01:22:34 +0000 (01:22 +0000)]
Merge "Rename "bitrate-control" to "bitrate-modes"" into oc-mr1-dev
am:
9b1a9b4fb9
Change-Id: Ibdfb6f003c7467f58c9232d807d52b327e2187af
Pengquan Meng [Tue, 19 Sep 2017 01:14:34 +0000 (01:14 +0000)]
Merge "Incorrect decoding when TP-OA contains non-integer information"
TreeHugger Robot [Tue, 19 Sep 2017 01:14:05 +0000 (01:14 +0000)]
Merge "Rename "bitrate-control" to "bitrate-modes"" into oc-mr1-dev
Santos Cordon [Tue, 19 Sep 2017 00:47:52 +0000 (00:47 +0000)]
Merge "Fix missing RequiredPermission annotation." into oc-mr1-dev
am:
f7771c9f77
Change-Id: Ib569f91269f75ee288dc515505f9a46b0dbe61c9
TreeHugger Robot [Tue, 19 Sep 2017 00:41:04 +0000 (00:41 +0000)]
Merge "Fix missing RequiredPermission annotation." into oc-mr1-dev
Bill Yi [Tue, 19 Sep 2017 00:26:02 +0000 (00:26 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
ae1e26564b -s ours
Change-Id: I2fff03813084209468b1835d6f2089a4c841fe3c
TreeHugger Robot [Tue, 19 Sep 2017 00:19:44 +0000 (00:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Matthew Ng [Mon, 18 Sep 2017 23:29:46 +0000 (16:29 -0700)]
Set use low res snapshots for low ram devices missing in theme snapshot
Creating new tasksnapshot from app theme was missing to set the reduced
flag to true.
Test: settings to smart lock and pass pattern/password
Bug:
65534047
Change-Id: I78e9fed223ffc4c7a9cb8d31836b18f1fc4e7d34
Santos Cordon [Mon, 18 Sep 2017 22:38:36 +0000 (22:38 +0000)]
Merge "Move VR Display Policy check to after wakefulness." into oc-mr1-dev
am:
bbd01422d3
Change-Id: I41c6869f6514496a5dfc615ef7763f06b6fe1dbd
Felipe Leme [Mon, 18 Sep 2017 22:30:27 +0000 (22:30 +0000)]
Merge "Fixed padding of autofill service icon on Save affordance." into oc-mr1-dev
am:
e15b1c953f
Change-Id: Ia5d23edaca925ca762c14071e8bf0556019e6e0c
TreeHugger Robot [Mon, 18 Sep 2017 22:23:58 +0000 (22:23 +0000)]
Merge "Move VR Display Policy check to after wakefulness." into oc-mr1-dev
Erika Avenberg [Sat, 30 Aug 2014 10:00:47 +0000 (12:00 +0200)]
Incorrect decoding when TP-OA contains non-integer information
When receiving a GSM SMS message where the TP-Originating-Address
(TP-OA) field contains non-integer information, it is currently
decoded incorrectly.
This CL adds support for decoding BCD according to spec:
ETSI TS 123 040 V9.3.0
Section: 9.1.2.3 Semi-octet representation
"If a mobile receives an address field containing non-integer
information in the semi-octets other than "1111" (e.g. 1110)
it shall display the semi-octet as the representation given
in GSM 44.008 [12] under "called BCD number", viz 1010="*",
1011="#", 1100="a", 1101="b", 1110="c"."
Bug:
65042708
Test: runtest --path frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/GsmSmsTest.java --test-method testAddressing
Change-Id: Ied2d6ca4d84d5c3ca6cc5c4d9875d2ff2a8e5df9
TreeHugger Robot [Mon, 18 Sep 2017 22:13:31 +0000 (22:13 +0000)]
Merge "Fixed padding of autofill service icon on Save affordance." into oc-mr1-dev
Eric Laurent [Mon, 18 Sep 2017 22:09:30 +0000 (22:09 +0000)]
Merge "AudioService: reduce EU volume warning thresdhold for USB headsets" into oc-mr1-dev
am:
64254ff6a4
Change-Id: Ie33d6f662fb7ca3f52ed3a71c29d7f2d8c722a8d
TreeHugger Robot [Mon, 18 Sep 2017 21:53:33 +0000 (21:53 +0000)]
Merge "AudioService: reduce EU volume warning thresdhold for USB headsets" into oc-mr1-dev
Felipe Leme [Mon, 18 Sep 2017 21:20:23 +0000 (21:20 +0000)]
Merge "Added more metrics for Autofill:" into oc-mr1-dev
am:
d4f72ac3c4
Change-Id: I46c2bb4e865c06a84245800dddb0fe018d8a52af
TreeHugger Robot [Mon, 18 Sep 2017 21:05:44 +0000 (21:05 +0000)]
Merge "Added more metrics for Autofill:" into oc-mr1-dev
Bill Yi [Mon, 18 Sep 2017 20:31:42 +0000 (20:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
69ca32dcea -s ours am:
60af01bec9 -s ours
am:
6c4c6b047c -s ours
Change-Id: I033bbb7c0fa44047a3d160795f4ef4da5ed8aa92
Android Build Merger (Role) [Mon, 18 Sep 2017 20:27:53 +0000 (20:27 +0000)]
Merge "Import translations. DO NOT MERGE am:
791ebeed32 -s ours am:
fee3748d04 -s ours am:
456c147827 -s ours am:
c49cdb6749 -s ours am:
cda0464f7d -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Mon, 18 Sep 2017 20:26:07 +0000 (20:26 +0000)]
Import translations. DO NOT MERGE am:
791ebeed32 -s ours am:
fee3748d04 -s ours am:
456c147827 -s ours am:
c49cdb6749 -s ours
am:
cda0464f7d -s ours
Change-Id: Iaf01d0652c1f3bf3ea9ed8f635a154f07b47f9d7
Bill Yi [Mon, 18 Sep 2017 20:24:21 +0000 (20:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
69ca32dcea -s ours am:
60af01bec9 -s ours
am:
728b23a934 -s ours
Change-Id: I2d7def5a1bce48ce826a43541e1255a8a4e1e44f
Android Build Merger (Role) [Mon, 18 Sep 2017 20:19:10 +0000 (20:19 +0000)]
Merge "Merge "Clarified how to set for autofill views representing creditcard expiration dates." into oc-mr1-dev am:
daf9b2ee15" into oc-mr1-dev-plus-aosp
Felipe Leme [Mon, 18 Sep 2017 20:17:37 +0000 (20:17 +0000)]
Merge "Clarified how to set for autofill views representing creditcard expiration dates." into oc-mr1-dev
am:
daf9b2ee15
Change-Id: I5fa55acdf7b8328be82410144155ee019d096c2d
Bill Yi [Mon, 18 Sep 2017 20:16:43 +0000 (20:16 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
69ca32dcea -s ours
am:
60af01bec9 -s ours
Change-Id: Ib420dbea84af5bec2926bb2abcf804038c977634
Bill Yi [Mon, 18 Sep 2017 20:16:41 +0000 (20:16 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
69ca32dcea -s ours
am:
60af01bec9 -s ours
Change-Id: I920bb3060556824d8185701b10ea71828e242591
Bill Yi [Mon, 18 Sep 2017 20:16:10 +0000 (20:16 +0000)]
Import translations. DO NOT MERGE am:
791ebeed32 -s ours am:
fee3748d04 -s ours am:
456c147827 -s ours am:
c49cdb6749 -s ours
am:
d65cbc4442 -s ours
Change-Id: I188322b3a1efdb1dea4fbe3b85f2d749ffffbe45
Bill Yi [Mon, 18 Sep 2017 20:07:14 +0000 (20:07 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
69ca32dcea -s ours
Change-Id: I59c5213db2534724e11d0eadf049d9d5489ffa18
Eino-Ville Talvala [Mon, 18 Sep 2017 20:06:43 +0000 (20:06 +0000)]
Merge "DngCreator: Don't use default locale for writing date/time into DNG" into oc-mr1-dev
am:
7c1f9cd750
Change-Id: I4a8dab62082f80452bf3eb003486e5d0febdd820
Bill Yi [Mon, 18 Sep 2017 20:05:45 +0000 (20:05 +0000)]
Import translations. DO NOT MERGE am:
791ebeed32 -s ours am:
fee3748d04 -s ours am:
456c147827 -s ours
am:
c49cdb6749 -s ours
Change-Id: Ief5061ef3933b7e1447e235923a52d741fc8fa7e
Bill Yi [Mon, 18 Sep 2017 20:05:44 +0000 (20:05 +0000)]
Import translations. DO NOT MERGE am:
791ebeed32 -s ours am:
fee3748d04 -s ours am:
456c147827 -s ours
am:
c49cdb6749 -s ours
Change-Id: I74302ee3485e173533f9ba3bbe26f83d11e1ebe4
Bill Yi [Mon, 18 Sep 2017 19:56:59 +0000 (19:56 +0000)]
Import translations. DO NOT MERGE am:
791ebeed32 -s ours am:
fee3748d04 -s ours
am:
456c147827 -s ours
Change-Id: I029764bb19cc295e4749d8974461f6d6be23d5c2
TreeHugger Robot [Mon, 18 Sep 2017 19:31:18 +0000 (19:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Mon, 18 Sep 2017 19:29:46 +0000 (19:29 +0000)]
Merge "Clarified how to set for autofill views representing creditcard expiration dates." into oc-mr1-dev
Bill Yi [Mon, 18 Sep 2017 19:22:28 +0000 (12:22 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ib6808e51d755433df1e51f6f3ba3478c40233527
Bill Yi [Mon, 18 Sep 2017 19:16:08 +0000 (19:16 +0000)]
Import translations. DO NOT MERGE am:
791ebeed32 -s ours
am:
fee3748d04 -s ours
Change-Id: I4d666020e912f122850cc140e3f62d65aea029ca
Felipe Leme [Sat, 16 Sep 2017 01:56:26 +0000 (18:56 -0700)]
Fixed padding of autofill service icon on Save affordance.
Test: manual verification
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases
Fixes:
65739885
Change-Id: Ia2b63750665eefd36143074c4cf0e1310de056b2
TreeHugger Robot [Mon, 18 Sep 2017 19:10:11 +0000 (19:10 +0000)]
Merge "DngCreator: Don't use default locale for writing date/time into DNG" into oc-mr1-dev
Bill Yi [Mon, 18 Sep 2017 19:09:21 +0000 (19:09 +0000)]
Import translations. DO NOT MERGE
am:
791ebeed32 -s ours
Change-Id: Iff6d60fe8fd1444c88ffa76634a50a4bb377334d
Selim Cinek [Mon, 18 Sep 2017 18:40:09 +0000 (18:40 +0000)]
Merge "Fixes an issue where the guts could disappear" into oc-mr1-dev
am:
6b3501ab91
Change-Id: I3011c9437aac2405c35c93df746a7a865256ab48
Santos Cordon [Thu, 31 Aug 2017 23:36:01 +0000 (16:36 -0700)]
Fix missing RequiredPermission annotation.
Bug:
64360244
Test: Manual compilation.
Change-Id: I7091e366baf5bcaf29945e9a0e2a283309e54452
Santos Cordon [Wed, 13 Sep 2017 18:59:39 +0000 (11:59 -0700)]
Move VR Display Policy check to after wakefulness.
Being in VR was preventing sleep and doze functionalities to function.
Sleep and doze is what commonly happens when the user hits power button
and without this fix hitting the power button resulted in PowerManager
not turning off the display.
Bug:
65635259
Test: Manual. Ensure that hitting power button while in 2D-in-VR turns
screen off on smartphones.
Test: runtest --path
frameworks/base/services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java
Change-Id: If3a14a5a423b0394926b323b97ed11b98177e43b
Android Build Merger (Role) [Mon, 18 Sep 2017 18:33:11 +0000 (18:33 +0000)]
Merge "Merge "Fix nomanservice notificationrecord leak" into oc-dev am:
9c32669043 -s ours am:
beb14f16fd am:
c13e51f734" into oc-mr1-dev-plus-aosp
Julia Reynolds [Mon, 18 Sep 2017 18:29:29 +0000 (18:29 +0000)]
Merge "Fix nomanservice notificationrecord leak" into oc-dev am:
9c32669043 -s ours am:
beb14f16fd
am:
c13e51f734
Change-Id: Ibdfe082f03ea9717e9313ca78060b1cc9c50118c
Android Build Merger (Role) [Mon, 18 Sep 2017 18:28:48 +0000 (18:28 +0000)]
Merge "Merge "Fix nomanservice notificationrecord leak" into oc-dev am:
9c32669043 -s ours am:
beb14f16fd am:
b35af33888" into oc-mr1-dev-plus-aosp
Julia Reynolds [Mon, 18 Sep 2017 18:27:06 +0000 (18:27 +0000)]
Merge "Fix nomanservice notificationrecord leak" into oc-dev am:
9c32669043 -s ours am:
beb14f16fd
am:
b35af33888
Change-Id: I07fb24843fec304c269c586f29bf4095876bf743
fionaxu [Mon, 18 Sep 2017 18:25:27 +0000 (18:25 +0000)]
resolve merge conflicts of
6df58d8da10d to oc-dr1-dev am:
6e40562a73 -s ours
am:
0318d4ec91
Change-Id: I78ec7783d47fd5a72c192018e75c0c36fb1a6cdb
Selim Cinek [Mon, 18 Sep 2017 18:24:50 +0000 (18:24 +0000)]
Merge "Fixes an issue where the guts could disappear" into oc-mr1-dev
Android Build Merger (Role) [Mon, 18 Sep 2017 18:19:52 +0000 (18:19 +0000)]
Merge "Merge "Fix NPE which could occur when showing notification guts" into oc-mr1-dev am:
cf6a6d244e" into oc-mr1-dev-plus-aosp
Julia Reynolds [Mon, 18 Sep 2017 18:19:17 +0000 (18:19 +0000)]
Merge "Fix nomanservice notificationrecord leak" into oc-dev am:
9c32669043 -s ours
am:
beb14f16fd
Change-Id: Icd720ef0e675473039613fe2f77789735f8c559e
Selim Cinek [Mon, 18 Sep 2017 18:17:14 +0000 (18:17 +0000)]
Merge "Fix NPE which could occur when showing notification guts" into oc-mr1-dev
am:
cf6a6d244e
Change-Id: Ic3ac8d59c56cec95357bbecafa60d2228810e61c
Julia Reynolds [Mon, 18 Sep 2017 18:16:38 +0000 (18:16 +0000)]
Merge "Fix nomanservice notificationrecord leak" into oc-dev am:
9c32669043 -s ours
am:
beb14f16fd
Change-Id: I4389c9502a6b8dd0224ec4323bbbe2599133de15
fionaxu [Mon, 18 Sep 2017 18:14:50 +0000 (18:14 +0000)]
resolve merge conflicts of
6df58d8da10d to oc-dr1-dev am:
6e40562a73
am:
1a7379d788
Change-Id: I7c3afba872aa8bcc13c5bbe39f91e50a3c02efe1
fionaxu [Mon, 18 Sep 2017 18:12:24 +0000 (18:12 +0000)]
resolve merge conflicts of
6df58d8da10d to oc-dr1-dev
am:
6e40562a73 -s ours
Change-Id: I65b0adc062d2bfc83590b24d04030d01790e5bd7
Julia Reynolds [Mon, 18 Sep 2017 18:09:02 +0000 (18:09 +0000)]
Merge "Fix nomanservice notificationrecord leak" into oc-dev
am:
9c32669043 -s ours
Change-Id: I890f0e8e36b5c397365af8d9eb7f84d1d9a7a719
Selim Cinek [Mon, 18 Sep 2017 18:08:29 +0000 (18:08 +0000)]
Merge "Fix NPE which could occur when showing notification guts" into oc-mr1-dev
Ruina Liu [Mon, 18 Sep 2017 18:06:30 +0000 (18:06 +0000)]
Merge "Fix extracting 32-bit uuid error via calling method uuidToBytes" am:
ac421b8f44 am:
8c65620d31
am:
311d031d22
Change-Id: I151f0dc74bfeca44db6aa0c428f8cfbb8b2d3891
fionaxu [Mon, 18 Sep 2017 18:06:26 +0000 (18:06 +0000)]
resolve merge conflicts of
6df58d8da10d to oc-dr1-dev
am:
6e40562a73
Change-Id: I804a1cebba2b8fb297bd8dda9a74ae8736334e3b
Ruina Liu [Mon, 18 Sep 2017 18:00:58 +0000 (18:00 +0000)]
Merge "Fix extracting 32-bit uuid error via calling method uuidToBytes" am:
ac421b8f44
am:
8c65620d31
Change-Id: I70ded26f7487e0cf0cbb2f3fa1184c85ed00b765
fionaxu [Fri, 15 Sep 2017 20:52:04 +0000 (13:52 -0700)]
resolve merge conflicts of
6df58d8da10d to oc-dr1-dev
Test: I solemnly swear I tested this conflict resolution.
Bug:
65113738
Merged-in: I6bc2d8ba45958eaf09e09e3ea2e57c79e0ac461e
Merged-in: I445c7bce01e0bf36214f5f4f6327a0582c774dae
Change-Id: I100ef303e5e50ddac12bc2e9f1dbeb21d6b801aa
Ruina Liu [Mon, 18 Sep 2017 17:53:31 +0000 (17:53 +0000)]
Merge "Fix extracting 32-bit uuid error via calling method uuidToBytes"
am:
ac421b8f44
Change-Id: I9c6b453e0ef71a70cd972a47763d042943fe3f36
Treehugger Robot [Mon, 18 Sep 2017 17:37:26 +0000 (17:37 +0000)]
Merge "Fix extracting 32-bit uuid error via calling method uuidToBytes"
TreeHugger Robot [Mon, 18 Sep 2017 17:35:06 +0000 (17:35 +0000)]
Merge "Fix nomanservice notificationrecord leak" into oc-dev
Jason Monk [Mon, 18 Sep 2017 17:27:30 +0000 (17:27 +0000)]
Merge "Refinement of auto-dimming nav" into oc-mr1-dev
am:
5b4b6bda2d
Change-Id: Id986f78ecc87693f0442534875d473c5a0fe16ab
Winson Chung [Mon, 18 Sep 2017 17:17:32 +0000 (17:17 +0000)]
Merge "Add low-ram check for PiP support even if feature is enabled." into oc-mr1-dev
am:
9448052132
Change-Id: I55bc3be04dc14c834f0e6ecd52954d36fad84569
TreeHugger Robot [Mon, 18 Sep 2017 17:13:25 +0000 (17:13 +0000)]
Merge "Refinement of auto-dimming nav" into oc-mr1-dev
Winson Chung [Mon, 18 Sep 2017 17:10:30 +0000 (17:10 +0000)]
Merge "Add low-ram check for PiP support even if feature is enabled." into oc-mr1-dev
Felipe Leme [Mon, 18 Sep 2017 16:58:08 +0000 (16:58 +0000)]
Merge "Minor fixes on WebView.onProvideAutofillVirtualStructure() javadoc." into oc-mr1-dev
am:
d96b0d1b47
Change-Id: Ia209d29b9bd71e4fde44cadf8c5c07c5967f6d47
TreeHugger Robot [Mon, 18 Sep 2017 16:47:40 +0000 (16:47 +0000)]
Merge "Minor fixes on WebView.onProvideAutofillVirtualStructure() javadoc." into oc-mr1-dev
Bill Yi [Mon, 18 Sep 2017 15:21:35 +0000 (08:21 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I6a56e46644120a42a4a0cff43dfd5f8b61ca6f8f
OSDN Git Service
