OSDN Git Service
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
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
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: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
abdalkader [Thu, 21 Dec 2017 18:12:07 +0000 (18:12 +0000)]
Merge "SMS over IMS APIs revision"
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: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: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: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: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
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:44:11 +0000 (23:44 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Philip P. Moltmann [Wed, 20 Dec 2017 23:41:32 +0000 (15:41 -0800)]
Testables lib should not statically link mockito
- All users of the lib already statically link mockito
- We should allow the users to decide what flavor they use
Test: m -j checkbuild
Change-Id: Ibbdb8be8022432a13b872865ade47b92b28976c6
Merged-In: Ibbdb8be8022432a13b872865ade47b92b28976c6
Sanket Padawe [Wed, 20 Dec 2017 21:54:38 +0000 (21:54 +0000)]
Merge "Receiving side Call handover API implementation."
Andrew Solovay [Wed, 20 Dec 2017 21:34:26 +0000 (21:34 +0000)]
Merge "doc: Fixing Javadoc formatting problems." into oc-mr1-dev
Treehugger Robot [Wed, 20 Dec 2017 20:30:54 +0000 (20:30 +0000)]
Merge "Use NetworkStatsService to get stats for apps"
Bill Yi [Wed, 20 Dec 2017 19:30:50 +0000 (19:30 +0000)]
Import translations. DO NOT MERGE am:
406659b709 -s ours am:
1fccf167ff -s ours am:
daa1d87e50 -s ours am:
0e62ea2f4c -s ours
am:
c5dff435b0 -s ours
Change-Id: I1ad653cc62c3cbdbffb486f1fa02013be8e953b1
Bill Yi [Wed, 20 Dec 2017 19:29:47 +0000 (19:29 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
1f204cd1ea -s ours
Change-Id: I0f8053bf3d65cd451e704ad682cd54b29953e944
Bill Yi [Wed, 20 Dec 2017 19:26:37 +0000 (19:26 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
9593ca1955 -s ours
am:
7244723549 -s ours
Change-Id: Id717ceb76ced6f3fb2b10689efd916e7e7cc5cfe
Bill Yi [Wed, 20 Dec 2017 19:25:28 +0000 (19:25 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
496af8623f -s ours am:
c81e5ae281 -s ours
am:
13062c93e5 -s ours
Change-Id: I524e2276bb358a4373036c7943b1b00f53ebaa17
Bill Yi [Wed, 20 Dec 2017 19:22:02 +0000 (19:22 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
970261b46c -s ours
Change-Id: I1f37c148c9d2086d198443c596880fbc57cbad4b
Bill Yi [Wed, 20 Dec 2017 19:19:15 +0000 (19:19 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
0c1f4c2931 -s ours
am:
2d00ab621a -s ours
Change-Id: Ib3d980494cfeb7ddc621e1185429635cc5b3ab8d
Philip P. Moltmann [Wed, 20 Dec 2017 19:18:45 +0000 (19:18 +0000)]
Merge "Don't include mockito in frameworks-base-testutils" am:
f924642729
am:
cf7aa7c09e
Change-Id: I6b2486c69af1a05f8282a0d648403522adf2b471
Bill Yi [Wed, 20 Dec 2017 19:17:58 +0000 (19:17 +0000)]
Import translations. DO NOT MERGE am:
406659b709 -s ours am:
1fccf167ff -s ours am:
daa1d87e50 -s ours
am:
0e62ea2f4c -s ours
Change-Id: Ia89c48363a381a246f132a2d8619d7b650ed19ab
Bill Yi [Wed, 20 Dec 2017 19:17:58 +0000 (19:17 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
9593ca1955 -s ours
Change-Id: Ie8c5ea32885dc3c6ee7b688beaf13f179dc95475
Bill Yi [Wed, 20 Dec 2017 19:16:46 +0000 (19:16 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
496af8623f -s ours
am:
c81e5ae281 -s ours
Change-Id: I90e825b5d0b540318f8a75f10bac95323e110cfa
Bill Yi [Wed, 20 Dec 2017 19:12:46 +0000 (19:12 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
0c1f4c2931 -s ours
Change-Id: Ib2fcf638c1433c444796d90fa8578c035c60b3df
Bill Yi [Wed, 20 Dec 2017 19:12:00 +0000 (19:12 +0000)]
Import translations. DO NOT MERGE am:
406659b709 -s ours am:
1fccf167ff -s ours
am:
daa1d87e50 -s ours
Change-Id: Ieeaf1281b3ef3256264850f8910c7075e07eabe6
Bill Yi [Wed, 20 Dec 2017 19:10:42 +0000 (19:10 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
496af8623f -s ours
Change-Id: I3acd580690e2bca34b21d600225f53ac7b467185
Philip P. Moltmann [Wed, 20 Dec 2017 19:09:03 +0000 (19:09 +0000)]
Merge "Don't include mockito in frameworks-base-testutils"
am:
f924642729
Change-Id: I4470f63baac7bc33dff0dac94da3a0d93c322dc7
Bill Yi [Wed, 20 Dec 2017 19:07:26 +0000 (19:07 +0000)]
Import translations. DO NOT MERGE am:
406659b709 -s ours
am:
1fccf167ff -s ours
Change-Id: I295d71779c2361915f61c3b1f76ca90103b716ea
TreeHugger Robot [Wed, 20 Dec 2017 19:07:04 +0000 (19:07 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 20 Dec 2017 19:05:04 +0000 (19:05 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 20 Dec 2017 19:04:41 +0000 (19:04 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Wed, 20 Dec 2017 19:03:39 +0000 (19:03 +0000)]
Import translations. DO NOT MERGE
am:
406659b709 -s ours
Change-Id: Ida0956b8a3ba81a7a5f78753236c0cac001c2b1a
TreeHugger Robot [Wed, 20 Dec 2017 18:59:40 +0000 (18:59 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 20 Dec 2017 18:59:10 +0000 (18:59 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Treehugger Robot [Wed, 20 Dec 2017 18:55:14 +0000 (18:55 +0000)]
Merge "Don't include mockito in frameworks-base-testutils"
Benedict Wong [Wed, 20 Dec 2017 18:42:26 +0000 (18:42 +0000)]
Merge "[ipsec-doze] Add fchown to IpSecService to support doze" am:
4edb4c8ec4
am:
5949912523
Change-Id: I9036fc2768dd9664ab7407b359f3c689c7ce700e
Benedict Wong [Wed, 20 Dec 2017 18:35:45 +0000 (18:35 +0000)]
Merge "[ipsec-doze] Add fchown to IpSecService to support doze"
am:
4edb4c8ec4
Change-Id: I75a3cb9e9d9d7d3b6c0ede86074a00ddcd86028e
Benedict Wong [Wed, 20 Dec 2017 18:25:32 +0000 (18:25 +0000)]
Merge "[ipsec-doze] Add fchown to IpSecService to support doze"
Sanket Padawe [Wed, 20 Dec 2017 18:13:05 +0000 (10:13 -0800)]
Receiving side Call handover API implementation.
Bug:
65415068
Test: Manual
Design doc:
https://docs.google.com/document/d/1qY3oAzjff_4A1ttYb_CGrE_OwTRmXMG_KGsIuPT1ey8/edit#Bug:
Change-Id: Ic0c4af19098252389648007628affc19a44f89dd
Merged-in: Ic0c4af19098252389648007628affc19a44f89dd
Andrew Solovay [Tue, 19 Dec 2017 01:23:35 +0000 (17:23 -0800)]
doc: Fixing Javadoc formatting problems.
No code changes, just fixing typos in the doc comments.
Doc is staged to:
http://go/dac-stage/reference/android/service/autofill/AutofillService.html
http://go/dac-stage/reference/android/service/autofill/FillRequest.html
Test: make ds-docs
Bug:
70812346
Merged-In: Ia76121c60197275c6be1717c8003fe1c4baf5f97
Change-Id: I5ee04bb96234441c5740665540b5e803fcf9710f
Sanket Padawe [Wed, 20 Dec 2017 17:48:58 +0000 (17:48 +0000)]
Merge "Implement Call handover initiation side APIs." am:
e2d080481a
am:
9053309827
Change-Id: I98828fd1ef99d42ffbfb8650731c1d2b848bc062
Sanket Padawe [Wed, 20 Dec 2017 17:41:13 +0000 (17:41 +0000)]
Merge "Implement Call handover initiation side APIs."
am:
e2d080481a
Change-Id: Ib9840c4ce4abf64f36e21cbc3256050e4216314b
Sanket Padawe [Wed, 20 Dec 2017 17:33:45 +0000 (17:33 +0000)]
Merge "Implement Call handover initiation side APIs."
Alex Light [Wed, 20 Dec 2017 15:21:59 +0000 (15:21 +0000)]
Merge "Add support for selecting alternate JDWP implementations" am:
cbeea23861
am:
f5ec7f2e26
Change-Id: I95d3064791d497986d0ece010be05749904d1ed3
Alex Light [Wed, 20 Dec 2017 15:13:34 +0000 (15:13 +0000)]
Merge "Add support for selecting alternate JDWP implementations"
am:
cbeea23861
Change-Id: Ifa4ffb6610152f1e919bc10fc7c8697c4bb99a0d
Alex Light [Wed, 20 Dec 2017 15:04:10 +0000 (15:04 +0000)]
Merge "Add support for selecting alternate JDWP implementations"
Bill Yi [Wed, 20 Dec 2017 12:39:09 +0000 (04:39 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6891787af9011c1559364b4966808a907949b07e
Auto-generated-cl: translation import
Bill Yi [Wed, 20 Dec 2017 12:29:19 +0000 (04:29 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia614e1fe986931cbc5bb2dee16c9fb5c69e6c4b7
Auto-generated-cl: translation import
Bill Yi [Wed, 20 Dec 2017 12:10:52 +0000 (04:10 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ifd1b4a854360927ae4479ca8d1bf0637c98aa5e5
Auto-generated-cl: translation import
Bill Yi [Wed, 20 Dec 2017 11:56:50 +0000 (03:56 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4246a775e430d1db88a7c64144a4dca6824be297
Auto-generated-cl: translation import
Bill Yi [Wed, 20 Dec 2017 11:43:02 +0000 (03:43 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7c5bfc2833a1fa01d3f1cabd451fa88ce8535094
Auto-generated-cl: translation import
Bill Yi [Wed, 20 Dec 2017 11:38:01 +0000 (03:38 -0800)]
Import translations. DO NOT MERGE
Change-Id: I200b939582ec1b2a016f83f62ebb586da842bfae
Auto-generated-cl: translation import
Bill Yi [Wed, 20 Dec 2017 11:32:57 +0000 (03:32 -0800)]
Import translations. DO NOT MERGE
Change-Id: I63d54555e4cb7071f114b81d17b1364475a4380f
Auto-generated-cl: translation import
Chenbo Feng [Wed, 15 Nov 2017 01:54:17 +0000 (17:54 -0800)]
Use NetworkStatsService to get stats for apps
Move the native implementation of TrafficStats to NetworkStatsService
and apps need to get the NetworkStatsService binder interface from
system_server in order to get the network usage stats since boot. This
implementation can hide the detail of retrieving network traffic
information from apps and the NetworkStatsService can choose which
methoed it use to get the data depending on the kernel version of the
device.
Bug:
30950746
Test: CtsNetTestCases -t android.net.cts.TrafficStatsTest
Change-Id: I53bbefd19aa0b783b9b4b42ea4d76db3e9ec07a3
Holly Jiuyu Sun [Wed, 20 Dec 2017 03:06:37 +0000 (03:06 +0000)]
Merge "Use getter instead of member for IEuiccController stub." am:
6991266aa6
am:
fe8ee59db5
Change-Id: I96f4cca6ca0f1f75e2fd32123e6cc3d8769ce348
Holly Jiuyu Sun [Wed, 20 Dec 2017 02:59:14 +0000 (02:59 +0000)]
Merge "Use getter instead of member for IEuiccController stub."
am:
6991266aa6
Change-Id: I253f3bceb0f3c1855fada016c792bf29876e4aa1
Holly Jiuyu Sun [Wed, 20 Dec 2017 02:49:50 +0000 (02:49 +0000)]
Merge "Use getter instead of member for IEuiccController stub."
Sanket Padawe [Fri, 1 Dec 2017 21:59:27 +0000 (13:59 -0800)]
Implement Call handover initiation side APIs.
Bug:
65415068
Test: Manual
Design doc:
https://docs.google.com/document/d/1qY3oAzjff_4A1ttYb_CGrE_OwTRmXMG_KGsIuPT1ey8/edit#
Change-Id: I692bb14fba66733154378c2dda525aa85c471a38
Merged-in: I692bb14fba66733154378c2dda525aa85c471a38
Philip P. Moltmann [Tue, 19 Dec 2017 21:20:22 +0000 (13:20 -0800)]
Don't include mockito in frameworks-base-testutils
So that each test can pick if they want mockito-inline or not.
Test: m -j checkbuild
Change-Id: I1ac02acebbe5cd01f3032a10932a1c612d8d3a4d
Merged-In: I1ac02acebbe5cd01f3032a10932a1c612d8d3a4d
vichang [Tue, 19 Dec 2017 18:35:40 +0000 (18:35 +0000)]
Merge "API updated for ICU4J 60.1" am:
71b25c06a7
am:
68f1995d19
Change-Id: I572007ea58f4011d24004c90730b14e154cfae92
vichang [Tue, 19 Dec 2017 18:24:59 +0000 (18:24 +0000)]
Merge "API updated for ICU4J 60.1"
am:
71b25c06a7
Change-Id: I3968eda2e73fe3641abd45684f6ae992d6e780d3
vichang [Tue, 19 Dec 2017 13:13:13 +0000 (13:13 +0000)]
Merge "API updated for ICU4J 60.1"
Steve Paik [Tue, 19 Dec 2017 00:40:59 +0000 (00:40 +0000)]
Merge "Rename set_wakeup_callback" am:
7e3de17f3d
am:
5611305abe
Change-Id: I3434d6657ca905b12fb73beca65473f3149202bb
Elliott Hughes [Tue, 19 Dec 2017 00:35:58 +0000 (00:35 +0000)]
Merge "Private API became public..." am:
eb44ebbfcd
am:
85fc4d6dd6
Change-Id: I9ccfc88dc7d86462e323e32ce2b13726e05ec1c3
Steve Paik [Tue, 19 Dec 2017 00:29:22 +0000 (00:29 +0000)]
Merge "Rename set_wakeup_callback"
am:
7e3de17f3d
Change-Id: Ic4a3d630d76e333e71a746a237d45a5fb3414994
Benedict Wong [Tue, 19 Dec 2017 00:27:57 +0000 (00:27 +0000)]
Merge "[ipsec-qtaguid] Tag sockets upon creation of encap sockets" am:
d0ac50bcad
am:
8caa274ade
Change-Id: I2f27c76a1f493ff4f0bd423c06f159e629866d4d
Elliott Hughes [Tue, 19 Dec 2017 00:24:28 +0000 (00:24 +0000)]
Merge "Private API became public..."
am:
eb44ebbfcd
Change-Id: I9ec4e8bb8609a29ed48d2862913c007d8f4e83c6
Benedict Wong [Tue, 19 Dec 2017 00:16:29 +0000 (00:16 +0000)]
Merge "[ipsec-qtaguid] Tag sockets upon creation of encap sockets"
am:
d0ac50bcad
Change-Id: If2f71108d0c3d5742ee39b041f5fa886aac820cb
OSDN Git Service
