Bill Yi
f3f8e65478
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
...
am: dfa5f5d102 -s ours
Change-Id: I14296ee29df5b968168c0e9815f96cb88972bd0a
2017-12-21 20:28:58 +00:00
Bill Yi
4d141531e8
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
...
am: 6868ade468 -s ours
Change-Id: I91ee1333af3dfb29d70d5929a228c91edd9ce10d
2017-12-21 20:27:51 +00:00
Bill Yi
eebdf6c457
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
...
am: 833ba96cba -s ours
Change-Id: I38b2c9a6f75f6d38ca4e79dc204b2603de633ce1
2017-12-21 20:26:17 +00:00
Android Build Merger (Role)
0991a4e531
Merge "Merge "SMS over IMS APIs revision" am: 2bf7f03e63 am: f9eba1a18f am: ca88d359c0"
2017-12-21 20:10:29 +00:00
abdalkader
e1a5469101
Merge "SMS over IMS APIs revision" am: 2bf7f03e63 am: f9eba1a18f
...
am: ca88d359c0
Change-Id: Iea7624e10230294505982f0373b97a2486d6996f
2017-12-21 20:10:03 +00:00
Tyler Gunn
5d7c823e16
Merge "Add logging and disconnect reason for null connections." am: 7661e81f85
...
am: c840efcf7e
Change-Id: I5038667db6b15d74aada29e245b8ff81ca2f3bd8
2017-12-21 20:06:18 +00:00
Android Build Merger (Role)
f168bdf39d
Merge "Merge "Add Notification Flag behavior test" am: 89bb1971d0 am: dee5f9a738 am: a33e1dd26f -s ours"
2017-12-21 20:06:07 +00:00
Yan Sun
19b73d0f1d
Merge "Add Notification Flag behavior test" am: 89bb1971d0 am: dee5f9a738
...
am: a33e1dd26f -s ours
Change-Id: I98caf6c319a21ebd5f85c1c740691ddcd31894ba
2017-12-21 20:05:39 +00:00
Android Build Merger (Role)
d0545d6333
Merge "Merge "Fix random systemui crashes during cts test DO NOT MERGE" am: d8514e82aa -s ours am: e9940be86d am: cb9ded1d30 -s ours"
2017-12-21 20:01:19 +00:00
Chrison.chai
6b4879fcf1
Merge "Fix random systemui crashes during cts test DO NOT MERGE" am: d8514e82aa -s ours am: e9940be86d
...
am: cb9ded1d30 -s ours
Change-Id: I879999d0033e242d02c50bf6ea4a2c40a433a871
2017-12-21 20:00:54 +00:00
Tyler Gunn
c840efcf7e
Merge "Add logging and disconnect reason for null connections."
...
am: 7661e81f85
Change-Id: Id1f754f62869c38499f30d6ee33046c89024efc6
2017-12-21 20:00:28 +00:00
Android Build Merger (Role)
bd1278ade7
Merge "Merge "Testables lib should not statically link mockito" am: 47d04fc5c0 am: b42cd23425 am: 0a6f66e9a9 -s ours"
2017-12-21 19:59:57 +00:00
Bill Yi
a1834cfc3f
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
2017-12-21 19:59:54 +00:00
Philip P. Moltmann
255108df3d
Merge "Testables lib should not statically link mockito" am: 47d04fc5c0 am: b42cd23425
...
am: 0a6f66e9a9 -s ours
Change-Id: I86a59fd6006a3ba59b237044c61ab1d5c2a61333
2017-12-21 19:59:29 +00:00
Bill Yi
97ae42b0d6
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
2017-12-21 19:58:39 +00:00
Bill Yi
1598332a7f
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
2017-12-21 19:56:02 +00:00
Android Build Merger (Role)
f9b8f6363e
Merge "Merge "Receiving side Call handover API implementation." am: 3c7bc2dc06 am: 151c15445a am: c65e740f98 -s ours"
2017-12-21 19:54:55 +00:00
Bill Yi
29f70cb6fb
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
2017-12-21 19:54:14 +00:00
Sanket Padawe
c6cd39a58e
Merge "Receiving side Call handover API implementation." am: 3c7bc2dc06 am: 151c15445a
...
am: c65e740f98 -s ours
Change-Id: I457622e41c15891142a51140b083d1d6b465e10e
2017-12-21 19:54:03 +00:00
Siddharth Ray
331962242a
Merge "Obtain cellular related battery statistics"
2017-12-21 19:53:54 +00:00
Bill Yi
6ba039da20
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
2017-12-21 19:52:47 +00:00
Bill Yi
b4db20359a
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
2017-12-21 19:51:02 +00:00
Bill Yi
5dd6a1c735
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
2017-12-21 19:49:35 +00:00
Chenbo Feng
71436b32e9
Merge "Use NetworkStatsService to get stats for apps" am: 693d8a2ab1 am: fa7f4015fc
...
am: 09a81e4da1
Change-Id: I90ce68a72afbf596e28d987e925795709d24dd52
2017-12-21 19:49:25 +00:00
Bill Yi
dfa5f5d102
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
2017-12-21 19:47:45 +00:00
Bill Yi
6868ade468
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
2017-12-21 19:46:22 +00:00
TreeHugger Robot
7ac84ce422
Merge "Move ServiceListing to SettingsLib and add tests"
2017-12-21 19:44:38 +00:00
Bill Yi
833ba96cba
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
2017-12-21 19:44:05 +00:00
abdalkader
ca88d359c0
Merge "SMS over IMS APIs revision" am: 2bf7f03e63
...
am: f9eba1a18f
Change-Id: Ia7bdaeee0ca3942d72d9e92faa78a947fe1d4616
2017-12-21 19:40:25 +00:00
yinxu
ee079333e0
Add new RIL requests
...
Bug: 68998818
Test: Basic telephony sanity
Change-Id: Icad4ad8a9d8dd1bdc36a3e073cf14db31f590929
2017-12-21 11:40:21 -08:00
Tyler Gunn
7661e81f85
Merge "Add logging and disconnect reason for null connections."
2017-12-21 19:39:32 +00:00
Wei Wang
ade0538011
Always synchronize the OemUnlockAllowed bit to the FRP partition
...
ag/3023334 tried to synchronize the OemUnlockAllowed bit to the FRP
partition when deice is being unlocked.
However it missed a case when device was unlocked before ag/3023334
landed.
This CL will sync synchronize the OemUnlockAllowed bit on
isOemUnlockAllowed(), and it avoids redundant write by checking if
the bit is already synced.
Bug: 67043266
Bug: 68245782
Test: do factory reset on a device unlocked before ag/3023334 and FRP is
not enforced
Change-Id: If209757cfbb202e180a5b2c1b5259af6d00aa599
2017-12-21 11:39:04 -08:00
Yan Sun
a33e1dd26f
Merge "Add Notification Flag behavior test" am: 89bb1971d0
...
am: dee5f9a738
Change-Id: Ib7aa75882fb1b8d3c3380ec680969abe252cbff1
2017-12-21 19:36:32 +00:00
Chrison.chai
cb9ded1d30
Merge "Fix random systemui crashes during cts test DO NOT MERGE" am: d8514e82aa -s ours
...
am: e9940be86d
Change-Id: I77051a94b2e8694d378973c79310befca933515b
2017-12-21 19:32:18 +00:00
Bill Yi
9c166446fd
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
2017-12-21 19:28:46 +00:00
Philip P. Moltmann
0a6f66e9a9
Merge "Testables lib should not statically link mockito" am: 47d04fc5c0
...
am: b42cd23425
Change-Id: I7d7096cf24234925256895c3527f44e72cf07493
2017-12-21 19:28:17 +00:00
Bill Yi
66acdceb9b
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
2017-12-21 19:26:54 +00:00
Andrew Solovay
8acb2e1342
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
2017-12-21 19:25:49 +00:00
Bill Yi
5af20c1c28
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
2017-12-21 19:25:25 +00:00
Arthur Ishiguro
ddb737ff0f
Change ContextHubTransaction Callback to Listener
...
Bug: 67734082
Test: None
Change-Id: I2266bfec41c5012f988d298c5ad1b596cec0d0a0
2017-12-21 11:24:07 -08:00
TreeHugger Robot
1034bf17fa
Merge "Add TestApi to disable the TextClock clock tick."
2017-12-21 19:23:41 +00:00
Bill Yi
f24783846d
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
2017-12-21 19:22:55 +00:00
Bill Yi
59f4b0c11f
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
2017-12-21 19:20:42 +00:00
abdalkader
f9eba1a18f
Merge "SMS over IMS APIs revision"
...
am: 2bf7f03e63
Change-Id: I7296426e1c1fc903d92e324a09598e357e75389b
2017-12-21 19:20:36 +00:00
Sanket Padawe
c65e740f98
Merge "Receiving side Call handover API implementation." am: 3c7bc2dc06
...
am: 151c15445a
Change-Id: Ie5c522cd1c9c3b0da254cf1fa9f1a756361a4e3f
2017-12-21 19:19:54 +00:00
Bill Yi
37e0c23902
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
2017-12-21 19:19:10 +00:00
Yan Sun
dee5f9a738
Merge "Add Notification Flag behavior test"
...
am: 89bb1971d0
Change-Id: I0948f245fee622b5acd1a1bb414e7a2e20090dc8
2017-12-21 19:17:32 +00:00
Bill Yi
95b4c706b8
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
2017-12-21 19:17:16 +00:00
Bill Yi
a963a02442
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
2017-12-21 19:15:41 +00:00
Chenbo Feng
09a81e4da1
Merge "Use NetworkStatsService to get stats for apps" am: 693d8a2ab1
...
am: fa7f4015fc
Change-Id: I14f614a86214bd4f006415c48b9a8323e06c737f
2017-12-21 19:15:29 +00:00
