OSDN Git Service
Malcolm Chen [Sat, 23 Dec 2017 00:59:00 +0000 (00:59 +0000)]
Merge "Add MetricsEvent ENUMS for "Mobile network" preferences." am:
e4e5291743
am:
675839f0fa
Change-Id: Ie4f70a3e95fe96d9b82488affa226d724a4e4278
Malcolm Chen [Sat, 23 Dec 2017 00:50:25 +0000 (00:50 +0000)]
Merge "Add MetricsEvent ENUMS for "Mobile network" preferences."
am:
e4e5291743
Change-Id: I504256eb76a94002678832ecb13a6ef12f7d3603
Treehugger Robot [Sat, 23 Dec 2017 00:41:49 +0000 (00:41 +0000)]
Merge "Add MetricsEvent ENUMS for "Mobile network" preferences."
Malcolm Chen [Tue, 25 Jul 2017 22:48:44 +0000 (15:48 -0700)]
Add MetricsEvent ENUMS for "Mobile network" preferences.
Bug:
34775714
Test: Manual
Change-Id: I71645de4f07d10c6c3772a6fef119dbdec2db8ef
Merged-In: I71645de4f07d10c6c3772a6fef119dbdec2db8ef
Bill Yi [Fri, 22 Dec 2017 18:11:27 +0000 (18:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
3a8be1ae39 -s ours
am:
cb562a40d9 -s ours
Change-Id: Iba2031a23c32e6ad748339ae7e2107bea8f80eb2
Bill Yi [Fri, 22 Dec 2017 18:02:46 +0000 (18:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
3a8be1ae39 -s ours
Change-Id: I2bfbaa9cc6b920112bc71a0b76b1382eb9d68e95
TreeHugger Robot [Fri, 22 Dec 2017 17:57:02 +0000 (17:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Ying Xu [Fri, 22 Dec 2017 01:17:05 +0000 (01:17 +0000)]
Merge "Expose the scan API and network select API." am:
761b7b50d1
am:
a9083c3145
Change-Id: Iee5e44b4f6a9a8921a89c05640be4d52e0251bb8
Ying Xu [Fri, 22 Dec 2017 01:09:23 +0000 (01:09 +0000)]
Merge "Expose the scan API and network select API."
am:
761b7b50d1
Change-Id: I6cdbcea874ba58874dcfe47da9866b25643a1a96
Ying Xu [Fri, 22 Dec 2017 01:01:09 +0000 (01:01 +0000)]
Merge "Expose the scan API and network select API."
Hall Liu [Fri, 22 Dec 2017 00:54:14 +0000 (00:54 +0000)]
Merge "Add feature flag and EMBMS bug fixes" am:
465f2916e0
am:
3424136a59
Change-Id: Iebc092e58752f32b6abfad612901ae094e083449
Hall Liu [Fri, 22 Dec 2017 00:48:39 +0000 (00:48 +0000)]
Merge "Add feature flag and EMBMS bug fixes"
am:
465f2916e0
Change-Id: I0a590d86b2e39ba77a013ceb2c0d6b6582ef1ae4
Hall Liu [Fri, 22 Dec 2017 00:37:31 +0000 (00:37 +0000)]
Merge "Add feature flag and EMBMS bug fixes"
Brad Ebinger [Thu, 21 Dec 2017 23:59:45 +0000 (23:59 +0000)]
Merge "Add new reason code for call barring" am:
a003d996b9
am:
ddf31e1810
Change-Id: Ieb37e63f6843c21a40e366b08d8cf40b2f6d69d8
Brad Ebinger [Thu, 21 Dec 2017 23:53:13 +0000 (23:53 +0000)]
Merge "Add new reason code for call barring"
am:
a003d996b9
Change-Id: I36fd5803e1a1a535a000dc4e69dc7238fa26efbd
Brad Ebinger [Thu, 21 Dec 2017 23:45:01 +0000 (23:45 +0000)]
Merge "Add new reason code for call barring"
Andrew Solovay [Thu, 21 Dec 2017 22:55:33 +0000 (22:55 +0000)]
Merge "DO NOT MERGE docs: Removing spurious end </pre> tag" into oc-mr1-dev
am:
acc55e61dd
Change-Id: I35d0f71a7da2dcae3ed3bab4aa111290ea4c4c60
Hall Liu [Thu, 21 Dec 2017 22:47:29 +0000 (22:47 +0000)]
Merge "Add feature flag for RTT in call log" am:
138d07f82d
am:
9a5e663d97
Change-Id: Ibdf102659e079844e81faac327b0d9cfb3b0d9de
TreeHugger Robot [Thu, 21 Dec 2017 22:41:15 +0000 (22:41 +0000)]
Merge "DO NOT MERGE docs: Removing spurious end </pre> tag" into oc-mr1-dev
Hall Liu [Thu, 21 Dec 2017 22:40:11 +0000 (22:40 +0000)]
Merge "Add feature flag for RTT in call log"
am:
138d07f82d
Change-Id: Id04b93ecd8cd25f59354fe209cb98c05248afaa8
Hansong Zhang [Thu, 21 Dec 2017 22:31:53 +0000 (22:31 +0000)]
Merge "BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)" am:
045fdae1b3
am:
d6c2722094
Change-Id: I7ef265d36f4a42e7e9a74e63e8b343b28b63c8b3
Hall Liu [Thu, 21 Dec 2017 22:31:45 +0000 (22:31 +0000)]
Merge "Add feature flag for RTT in call log"
Hansong Zhang [Thu, 21 Dec 2017 22:08:20 +0000 (22:08 +0000)]
Merge "BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)"
am:
045fdae1b3
Change-Id: I8f7a28ce56435bd4d1f01631b188a62f35c3f100
Treehugger Robot [Thu, 21 Dec 2017 21:56:10 +0000 (21:56 +0000)]
Merge "BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)"
Holly Jiuyu Sun [Thu, 21 Dec 2017 21:29:24 +0000 (21:29 +0000)]
Merge "Add asn1 to platform." am:
bdd0da8fa7
am:
ea1d85d484
Change-Id: Ib2968038bcacdc81e2249dc5e3a40f25ceb191b7
Holly Jiuyu Sun [Thu, 21 Dec 2017 21:19:28 +0000 (21:19 +0000)]
Merge "Add asn1 to platform."
am:
bdd0da8fa7
Change-Id: Ic34f9bd45e7fb46bae2afe5be0cc453d87b276bd
Bill Yi [Thu, 21 Dec 2017 21:17:15 +0000 (21:17 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
c0745b94c2 -s ours
Change-Id: Ia1425c1a21585764700000bf98fb25d3346bd639
TreeHugger Robot [Thu, 21 Dec 2017 21:08:50 +0000 (21:08 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Holly Jiuyu Sun [Thu, 21 Dec 2017 21:01:40 +0000 (21:01 +0000)]
Merge "Add asn1 to platform."
Tyler Gunn [Thu, 21 Dec 2017 20:06:18 +0000 (20:06 +0000)]
Merge "Add logging and disconnect reason for null connections." am:
7661e81f85
am:
c840efcf7e
Change-Id: I5038667db6b15d74aada29e245b8ff81ca2f3bd8
Tyler Gunn [Thu, 21 Dec 2017 20:00:28 +0000 (20:00 +0000)]
Merge "Add logging and disconnect reason for null connections."
am:
7661e81f85
Change-Id: Id1f754f62869c38499f30d6ee33046c89024efc6
Bill Yi [Thu, 21 Dec 2017 19:59:54 +0000 (19:59 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
45d962274f -s ours am:
0a1948e515 -s ours am:
7cb6513f6d -s ours am:
f0687d1201 -s ours
am:
9c166446fd -s ours
Change-Id: Ide4d30d971d02840f7f70733e15e5083ecbca5ea
Bill Yi [Thu, 21 Dec 2017 19:58:39 +0000 (19:58 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
81b98ffb09 -s ours am:
ea2e302eff -s ours am:
b6dab6b3ee -s ours am:
1f9ae3b912 -s ours
am:
66acdceb9b -s ours
Change-Id: I64312d2118512439ba4c4c7746d2c3550a525295
Bill Yi [Thu, 21 Dec 2017 19:56:02 +0000 (19:56 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
599fb37c01 -s ours am:
d21211470c -s ours am:
f1c75d66ec -s ours am:
b7a560fb10 -s ours
am:
5af20c1c28 -s ours
Change-Id: I8d98d9728d058add17b64172221733bedb07b4f3
Bill Yi [Thu, 21 Dec 2017 19:54:14 +0000 (19:54 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
e1ca34b5c7 -s ours am:
d5a7faea83 -s ours am:
bd14c44fd8 -s ours am:
f6c335b353 -s ours
am:
f24783846d -s ours
Change-Id: I47bd5497b0ac5ef061975b4ef7aed22cb016d2db
Bill Yi [Thu, 21 Dec 2017 19:52:47 +0000 (19:52 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
7ce772e941 -s ours am:
51fc07ad61 -s ours am:
c344f9b1c7 -s ours am:
39d480e67c -s ours
am:
59f4b0c11f -s ours
Change-Id: I6c0cbf7c26fc7f2b010126e5aa7ceb444aa71ab3
Bill Yi [Thu, 21 Dec 2017 19:51:02 +0000 (19:51 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1f204cd1ea -s ours am:
5943ef281a -s ours am:
2c97ca3b62 -s ours am:
934729c535 -s ours
am:
37e0c23902 -s ours
Change-Id: I2e96d32fcbb128a84828172f17b45db12ee790fd
Bill Yi [Thu, 21 Dec 2017 19:49:35 +0000 (19:49 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
970261b46c -s ours am:
a683975c54 -s ours am:
0bfcd7eef7 -s ours am:
f123f221db -s ours
am:
95b4c706b8 -s ours
Change-Id: Ia66e2c284c14aa911c92f49150ce9b8ee6c345e8
Bill Yi [Thu, 21 Dec 2017 19:47:45 +0000 (19:47 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
9593ca1955 -s ours am:
7244723549 -s ours am:
05e41d0531 -s ours am:
7baaa51e62 -s ours
am:
a963a02442 -s ours
Change-Id: Ife6d85d42f5f0beffdaf5da0c031e79d74d3c8d9
Bill Yi [Thu, 21 Dec 2017 19:46:22 +0000 (19:46 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
0c1f4c2931 -s ours am:
2d00ab621a -s ours am:
e135a35edf -s ours am:
301dfae698 -s ours
am:
5f38be9fdb -s ours
Change-Id: I835ba14d3bed4c5ebf901d60a2603c6692135b4e
Bill Yi [Thu, 21 Dec 2017 19:44:05 +0000 (19:44 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
496af8623f -s ours am:
c81e5ae281 -s ours am:
13062c93e5 -s ours am:
25d7b576ec -s ours
am:
50f7d64f05 -s ours
Change-Id: Ie2458ad57d6b64678243429e257e0701edd357a5
abdalkader [Thu, 21 Dec 2017 19:40:25 +0000 (19:40 +0000)]
Merge "SMS over IMS APIs revision" am:
2bf7f03e63
am:
f9eba1a18f
Change-Id: Ia7bdaeee0ca3942d72d9e92faa78a947fe1d4616
Tyler Gunn [Thu, 21 Dec 2017 19:39:32 +0000 (19:39 +0000)]
Merge "Add logging and disconnect reason for null connections."
Yan Sun [Thu, 21 Dec 2017 19:36:32 +0000 (19:36 +0000)]
Merge "Add Notification Flag behavior test" am:
89bb1971d0
am:
dee5f9a738
Change-Id: Ib7aa75882fb1b8d3c3380ec680969abe252cbff1
Chrison.chai [Thu, 21 Dec 2017 19:32:18 +0000 (19:32 +0000)]
Merge "Fix random systemui crashes during cts test DO NOT MERGE" am:
d8514e82aa -s ours
am:
e9940be86d
Change-Id: I77051a94b2e8694d378973c79310befca933515b
Bill Yi [Thu, 21 Dec 2017 19:28:46 +0000 (19:28 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
45d962274f -s ours am:
0a1948e515 -s ours am:
7cb6513f6d -s ours
am:
f0687d1201 -s ours
Change-Id: Ia6678879fac5025f54f6d40b8dbc8ef7a1b9832d
Philip P. Moltmann [Thu, 21 Dec 2017 19:28:17 +0000 (19:28 +0000)]
Merge "Testables lib should not statically link mockito" am:
47d04fc5c0
am:
b42cd23425
Change-Id: I7d7096cf24234925256895c3527f44e72cf07493
Bill Yi [Thu, 21 Dec 2017 19:26:54 +0000 (19:26 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
81b98ffb09 -s ours am:
ea2e302eff -s ours am:
b6dab6b3ee -s ours
am:
1f9ae3b912 -s ours
Change-Id: I74c034b1c5247fb0ce7ace539014f9052092413e
Andrew Solovay [Thu, 21 Dec 2017 01:22:54 +0000 (17:22 -0800)]
DO NOT MERGE docs: Removing spurious end </pre> tag
Owing to a merge mixup, ended up adding a spurious </pre> where it
had no effect. Removing it just for hygiene's sake.
This doc error is only in oc-mr1-dev, not in master, so the fix
doesn't need to be merged.
Test: make ds-docs
Bug:
70812346
Change-Id: I5b54ed8fb1f068698d4dd4536383b52165b4d81f
Bill Yi [Thu, 21 Dec 2017 19:25:25 +0000 (19:25 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
599fb37c01 -s ours am:
d21211470c -s ours am:
f1c75d66ec -s ours
am:
b7a560fb10 -s ours
Change-Id: I612fa092984c77c735a27c0da5998890c518ffd4
Bill Yi [Thu, 21 Dec 2017 19:22:55 +0000 (19:22 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
e1ca34b5c7 -s ours am:
d5a7faea83 -s ours am:
bd14c44fd8 -s ours
am:
f6c335b353 -s ours
Change-Id: I7b218e76069fce17d24c3bc12fa28af797ee69d4
Bill Yi [Thu, 21 Dec 2017 19:20:42 +0000 (19:20 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
7ce772e941 -s ours am:
51fc07ad61 -s ours am:
c344f9b1c7 -s ours
am:
39d480e67c -s ours
Change-Id: I521cbe71ba8abbaa04deb8e4ae232764687a29d2
abdalkader [Thu, 21 Dec 2017 19:20:36 +0000 (19:20 +0000)]
Merge "SMS over IMS APIs revision"
am:
2bf7f03e63
Change-Id: I7296426e1c1fc903d92e324a09598e357e75389b
Sanket Padawe [Thu, 21 Dec 2017 19:19:54 +0000 (19:19 +0000)]
Merge "Receiving side Call handover API implementation." am:
3c7bc2dc06
am:
151c15445a
Change-Id: Ie5c522cd1c9c3b0da254cf1fa9f1a756361a4e3f
Bill Yi [Thu, 21 Dec 2017 19:19:10 +0000 (19:19 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1f204cd1ea -s ours am:
5943ef281a -s ours am:
2c97ca3b62 -s ours
am:
934729c535 -s ours
Change-Id: Id05ac1fc16e2e054febc631943424b85008d34b2
Yan Sun [Thu, 21 Dec 2017 19:17:32 +0000 (19:17 +0000)]
Merge "Add Notification Flag behavior test"
am:
89bb1971d0
Change-Id: I0948f245fee622b5acd1a1bb414e7a2e20090dc8
Bill Yi [Thu, 21 Dec 2017 19:17:16 +0000 (19:17 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
970261b46c -s ours am:
a683975c54 -s ours am:
0bfcd7eef7 -s ours
am:
f123f221db -s ours
Change-Id: Iaa7ea701db9f070098ae53d98b8e019a865bb704
Bill Yi [Thu, 21 Dec 2017 19:15:41 +0000 (19:15 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
9593ca1955 -s ours am:
7244723549 -s ours am:
05e41d0531 -s ours
am:
7baaa51e62 -s ours
Change-Id: I6ae9f1fbaa5335f0906dc4af678226dd101c8cd2
Chenbo Feng [Thu, 21 Dec 2017 19:15:29 +0000 (19:15 +0000)]
Merge "Use NetworkStatsService to get stats for apps" am:
693d8a2ab1
am:
fa7f4015fc
Change-Id: I14f614a86214bd4f006415c48b9a8323e06c737f
Chrison.chai [Thu, 21 Dec 2017 19:14:40 +0000 (19:14 +0000)]
Merge "Fix random systemui crashes during cts test DO NOT MERGE"
am:
d8514e82aa -s ours
Change-Id: Ib0b5affb287771dfc965ebe0a05791849aa919c8
Bill Yi [Thu, 21 Dec 2017 19:13:50 +0000 (19:13 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
0c1f4c2931 -s ours am:
2d00ab621a -s ours am:
e135a35edf -s ours
am:
301dfae698 -s ours
Change-Id: I47dc0cc519fd0707c83e3aab976934b3b3ce2150
Philip P. Moltmann [Thu, 21 Dec 2017 19:12:57 +0000 (19:12 +0000)]
Merge "Testables lib should not statically link mockito"
am:
47d04fc5c0
Change-Id: I4aee182a94fa62a8a254f0bbc480b4de1a4ed688
Bill Yi [Thu, 21 Dec 2017 19:12:14 +0000 (19:12 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
496af8623f -s ours am:
c81e5ae281 -s ours am:
13062c93e5 -s ours
am:
25d7b576ec -s ours
Change-Id: Iaf6c344263bc6d3e32f0df8d14cc27327a30b3ec
Holly Jiuyu Sun [Mon, 11 Dec 2017 21:28:03 +0000 (13:28 -0800)]
Add asn1 to platform.
Add unit test.
Bug:
38206971
Test: unit test
Change-Id: I140b74b6bda263a4044aaed7265de3c77d1adc63
Merged-In: Ifb7c7d13ad0f980ba986b3aa6c3213ad26658489
Bill Yi [Thu, 21 Dec 2017 18:18:04 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
45d962274f -s ours am:
0a1948e515 -s ours
am:
7cb6513f6d -s ours
Change-Id: I9cf46be95cd8d62bd8380b63740e4d97b68fa958
Bill Yi [Thu, 21 Dec 2017 18:15:02 +0000 (18:15 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
45d962274f -s ours
am:
0a1948e515 -s ours
Change-Id: If6c330da79edb94911ec1fb076a29e8c485ca725
abdalkader [Thu, 21 Dec 2017 18:12:07 +0000 (18:12 +0000)]
Merge "SMS over IMS APIs revision"
Bill Yi [Thu, 21 Dec 2017 18:11:27 +0000 (18:11 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
45d962274f -s ours
Change-Id: I43d3d8e14417f7aed30a470191386753c9957701
TreeHugger Robot [Thu, 21 Dec 2017 18:04:34 +0000 (18:04 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Thu, 21 Dec 2017 18:01:15 +0000 (18:01 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
81b98ffb09 -s ours am:
ea2e302eff -s ours
am:
b6dab6b3ee -s ours
Change-Id: Ic796115ab4b86083a0823a4ace631c8a3a15ba66
Bill Yi [Thu, 21 Dec 2017 17:57:41 +0000 (17:57 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
81b98ffb09 -s ours
am:
ea2e302eff -s ours
Change-Id: I9d23c6267a38545927029782293ef8a15961cca7
Bill Yi [Thu, 21 Dec 2017 17:57:33 +0000 (17:57 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
599fb37c01 -s ours am:
d21211470c -s ours
am:
f1c75d66ec -s ours
Change-Id: Iaae57c91c09a4b1780c0c8e474700c56133b264e
Bill Yi [Thu, 21 Dec 2017 17:55:45 +0000 (17:55 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
e1ca34b5c7 -s ours am:
d5a7faea83 -s ours
am:
bd14c44fd8 -s ours
Change-Id: I0560d15c8c2df65b61818ccbb12f5057d1a0c5c8
Treehugger Robot [Thu, 21 Dec 2017 17:54:34 +0000 (17:54 +0000)]
Merge "Add Notification Flag behavior test"
Bill Yi [Thu, 21 Dec 2017 17:52:15 +0000 (17:52 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
7ce772e941 -s ours am:
51fc07ad61 -s ours
am:
c344f9b1c7 -s ours
Change-Id: I0f33f5e6ba5168e27ed60cb36b762708b641d34a
Bill Yi [Thu, 21 Dec 2017 17:51:21 +0000 (17:51 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
599fb37c01 -s ours
am:
d21211470c -s ours
Change-Id: Ife7d7f70c599c556abebf10eee525072a127b34d
Bill Yi [Thu, 21 Dec 2017 17:50:54 +0000 (17:50 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1f204cd1ea -s ours am:
5943ef281a -s ours
am:
2c97ca3b62 -s ours
Change-Id: Ia71bb418e6bf22e2347436d883e1bcd1c9937d61
Bill Yi [Thu, 21 Dec 2017 17:50:03 +0000 (17:50 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
e1ca34b5c7 -s ours
am:
d5a7faea83 -s ours
Change-Id: Ie8542f341e8be8ea5d28f300773c0d49c6a16aab
Bill Yi [Thu, 21 Dec 2017 17:48:29 +0000 (17:48 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
7ce772e941 -s ours
am:
51fc07ad61 -s ours
Change-Id: I336996e228fd3c69f192d3614207f24cec0b4ed8
Bill Yi [Thu, 21 Dec 2017 17:46:04 +0000 (17:46 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
81b98ffb09 -s ours
Change-Id: I6369ce728c37d066932736566e465f73e7843eb5
Bill Yi [Thu, 21 Dec 2017 17:44:40 +0000 (17:44 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
599fb37c01 -s ours
Change-Id: Icc605bca96905c647601df651186850c874b5442
Bill Yi [Thu, 21 Dec 2017 17:44:38 +0000 (17:44 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
970261b46c -s ours am:
a683975c54 -s ours
am:
0bfcd7eef7 -s ours
Change-Id: I30395fbf54d028c4f2e8bd21aa362e9d8e993195
Andrew Solovay [Thu, 21 Dec 2017 17:42:46 +0000 (17:42 +0000)]
Merge "doc: Fixing Javadoc formatting problems." into oc-mr1-dev
am:
7835c650b2
Change-Id: I662ac186b079d88fc503fa546b52b1297b98a036
Bill Yi [Thu, 21 Dec 2017 17:42:25 +0000 (17:42 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
e1ca34b5c7 -s ours
Change-Id: Ie97a72b89d17e982dbe499c26c956dafffe5effa
Bill Yi [Thu, 21 Dec 2017 17:42:12 +0000 (17:42 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1f204cd1ea -s ours
am:
5943ef281a -s ours
Change-Id: I9758d713fb9328b7f2218dae49e334f16a703476
Bill Yi [Thu, 21 Dec 2017 17:42:08 +0000 (17:42 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
9593ca1955 -s ours am:
7244723549 -s ours
am:
05e41d0531 -s ours
Change-Id: I730f5dcee5ea85c408f7cf21dafab011e869d66d
Sanket Padawe [Thu, 21 Dec 2017 17:41:40 +0000 (17:41 +0000)]
Merge "Receiving side Call handover API implementation."
am:
3c7bc2dc06
Change-Id: I7badcfaf9d308fb05745b0f37ee99603f5eee1c2
Bill Yi [Thu, 21 Dec 2017 17:41:01 +0000 (17:41 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
7ce772e941 -s ours
Change-Id: I0a8e327692fb18d67b9e724ce3254f3c342206b9
Chenbo Feng [Thu, 21 Dec 2017 17:38:12 +0000 (17:38 +0000)]
Merge "Use NetworkStatsService to get stats for apps"
am:
693d8a2ab1
Change-Id: I81a28a172e69fc405e99eb9c3a4fd0c729ca613d
Bill Yi [Thu, 21 Dec 2017 17:37:26 +0000 (17:37 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
970261b46c -s ours
am:
a683975c54 -s ours
Change-Id: I54b9b28c9ad38ad19c1e7f228e2e095dfd5cabe3
Bill Yi [Thu, 21 Dec 2017 17:35:51 +0000 (17:35 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
0c1f4c2931 -s ours am:
2d00ab621a -s ours
am:
e135a35edf -s ours
Change-Id: Ib75ec7b79501a31cab373f919c06a791a7ad9a4a
Treehugger Robot [Thu, 21 Dec 2017 15:27:44 +0000 (15:27 +0000)]
Merge "Fix random systemui crashes during cts test DO NOT MERGE"
Treehugger Robot [Thu, 21 Dec 2017 15:27:23 +0000 (15:27 +0000)]
Merge "Testables lib should not statically link mockito"
Chrison.chai [Wed, 15 Nov 2017 01:31:26 +0000 (09:31 +0800)]
Fix random systemui crashes during cts test DO NOT MERGE
systemui may crash due
to an uninitialized value of mNavigationBar probably because
of some race condition during initialization caused by emulation
performance issues:
11-01 19:48:58.634 5064 5064 E AndroidRuntime: FATAL EXCEPTION: main
11-01 19:48:58.634 5064 5064 E AndroidRuntime: Process: com.android.systemui, PID: 5064
11-01 19:48:58.634 5064 5064 E AndroidRuntime: java.lang.NullPointerException: Attempt to invoke virtual method 'void com.android.systemui.statusbar.phone.LightBarTransitionsController.dump (java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[])' on a null object reference
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at com.android.systemui.statusbar.phone.LightBarController.dump(LightBarController.java:241)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at com.android.systemui.statusbar.phone.StatusBar.dump(StatusBar.java:3448)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at com.android.systemui.SystemBars.dump(SystemBars.java:48)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at com.android.systemui.SystemUIService.dump(SystemUIService.java:52)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at android.app.ActivityThread.handleDumpService(ActivityThread.java:3488)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at android.app.ActivityThread.-wrap9(Unknown Source:0)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at android.app.ActivityThread.handleMessage(ActivityThread.java:1726)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at android.os.Handler.dispatchMessage(Handler.java:105)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at android.os.Looper.loop(Looper.java:164)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at android.app.ActivityThread.main(ActivityThread.java:6541)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at java.lang.reflect.Method.invoke(Native Method)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at com.android.internal.os.Zygote.run(Zygote.java:240)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:767)
This patches adds an explicit checks for (mNavigationBar != null)
everywhere it is used.
Test: cts test.
Change-Id: I8056aef54a10bbb1970bc2ce4913e7a618498fd3
Bill Yi [Thu, 21 Dec 2017 09:42:20 +0000 (01:42 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ib6ac723de671ad98410e531aeeceb643f8eb0209
Bill Yi [Thu, 21 Dec 2017 01:23:17 +0000 (17:23 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I38c81359b80048ce33a01f85d18de21e51c623fe
Brad Ebinger [Wed, 29 Nov 2017 03:15:47 +0000 (19:15 -0800)]
SMS over IMS APIs revision
- Move from being a feature to being a capability
- Move format to the constructor and make final
- Initial hooking up of APIs provided by platform for ims providers.
- Add constants for send status result
- Rename SmsListener callbacks.
- Split acknowledgeSms for sms and sms reports.
- Add reason for onSendSmsResult
Bug:
69846044
Test: None
Change-Id: I861664264a117d5483e392d4aabff59bfaf4373e
TreeHugger Robot [Wed, 20 Dec 2017 23:45:59 +0000 (23:45 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 20 Dec 2017 23:44:55 +0000 (23:44 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 20 Dec 2017 23:44:18 +0000 (23:44 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
OSDN Git Service
