OSDN Git Service
Alison Cichowlas [Tue, 23 Jan 2018 22:19:18 +0000 (22:19 +0000)]
Merge "ScreenshotActionReceiver must be listed in manifest."
Rohan Shah [Tue, 23 Jan 2018 22:11:25 +0000 (22:11 +0000)]
Merge "[QS] Update secondary text + label for bluetooth tile"
Android Build Merger (Role) [Tue, 23 Jan 2018 22:09:40 +0000 (22:09 +0000)]
Merge "Merge "Combined flags of data service requests into one reason param" am:
7d441c9b27 am:
28f64b869c am:
eeac3b9d62"
Jack Yu [Tue, 23 Jan 2018 22:09:11 +0000 (22:09 +0000)]
Merge "Combined flags of data service requests into one reason param" am:
7d441c9b27 am:
28f64b869c
am:
eeac3b9d62
Change-Id: I6b33b760ff26e1aaf7fdf3929ca71c7c14d78b36
Julia Reynolds [Tue, 23 Jan 2018 22:08:32 +0000 (22:08 +0000)]
Merge "Remove settings intent"
Jack Yu [Tue, 23 Jan 2018 22:00:39 +0000 (22:00 +0000)]
Merge "Combined flags of data service requests into one reason param" am:
7d441c9b27
am:
28f64b869c
Change-Id: I5823943d1e3bed41f4bd26fa1d718d6a2e6acc48
Robert Sesek [Tue, 23 Jan 2018 22:00:08 +0000 (22:00 +0000)]
Merge "Use the correct value for Process.WEBVIEW_ZYGOTE_UID." am:
572f65fb58 am:
cb7119385e
am:
000552a64d
Change-Id: If279fa06502f3bd39542504352c07a4e15b078dd
Felipe Leme [Tue, 23 Jan 2018 21:52:45 +0000 (21:52 +0000)]
Merge "DO NOT MERGE - fix AFM.getComponentNameFromContext()" into oc-mr1-dev am:
2eeab61b4c
am:
e14921216a -s ours
Change-Id: I4e485a49a8944c46f3c4ce45040194b6f53195ae
Robert Sesek [Tue, 23 Jan 2018 21:52:04 +0000 (21:52 +0000)]
Merge "Use the correct value for Process.WEBVIEW_ZYGOTE_UID." am:
572f65fb58
am:
cb7119385e
Change-Id: Iaf7a31629d06d87400796899f659926e5186ac41
Felipe Leme [Tue, 23 Jan 2018 21:46:43 +0000 (21:46 +0000)]
Merge "DO NOT MERGE - fix AFM.getComponentNameFromContext()" into oc-mr1-dev
am:
2eeab61b4c
Change-Id: Idda0d7fbc0f63bcbad44da6a46cef786770a2851
Jack Yu [Tue, 23 Jan 2018 21:46:18 +0000 (21:46 +0000)]
Merge "Combined flags of data service requests into one reason param"
am:
7d441c9b27
Change-Id: I6e8069639e5d7d57fde69747fb78d044e625680e
Jorim Jaggi [Tue, 23 Jan 2018 21:44:24 +0000 (21:44 +0000)]
Merge changes Ie3943d2b,I158f560f
* changes:
New task switch animation
New activity open/close animation
Robert Sesek [Tue, 23 Jan 2018 21:42:19 +0000 (21:42 +0000)]
Merge "Use the correct value for Process.WEBVIEW_ZYGOTE_UID."
am:
572f65fb58
Change-Id: I822fdad1c22de97884e389f651230ef31cd65deb
TreeHugger Robot [Tue, 23 Jan 2018 21:39:09 +0000 (21:39 +0000)]
Merge "DO NOT MERGE - fix AFM.getComponentNameFromContext()" into oc-mr1-dev
Lucas Dupin [Tue, 23 Jan 2018 21:23:15 +0000 (21:23 +0000)]
Merge "Hide keyguard slice when pulsing"
Dmitry Dementyev [Tue, 23 Jan 2018 20:57:14 +0000 (20:57 +0000)]
Merge "Move APIs to final location in preparation for API review"
TreeHugger Robot [Tue, 23 Jan 2018 20:47:26 +0000 (20:47 +0000)]
Merge "Import translations. DO NOT MERGE"
Benedict Wong [Tue, 23 Jan 2018 20:40:39 +0000 (20:40 +0000)]
Merge "Add checks to ensure SPIs are not reused" am:
0a1dd194aa am:
1a2e3f3b54
am:
0803f21c47
Change-Id: I13738ac37710ec7934998ef269681ae7c41c612e
Amit Mahajan [Tue, 23 Jan 2018 20:35:06 +0000 (20:35 +0000)]
Merge "Added new slot status related broadcast." am:
cdc0a084d1 am:
40effae0f3
am:
b641b585bb -s ours
Change-Id: I989af451943a1100770a302f16772f27a2df0c4c
Android Build Merger (Role) [Tue, 23 Jan 2018 20:22:10 +0000 (20:22 +0000)]
Merge changes from topic "am-
2e62287de9d64a8d9d3aba7f81c8e5cf"
* changes:
Merge changes from topic "multipath-datausage-backport" am:
df984fae26 am:
c46c21c702 am:
ce9b009827 -s ours
Add metered, roaming, and defaultNetwork info to NetworkTemplate. am:
0f9bce6883 am:
e383807d7f am:
f5c668bf38 -s ours
Unbreak frameworks-net tests broken by missing libutilscallstack. am:
f7fab104f9 am:
df4aba36b4 am:
333eb0ee46 -s ours
Disable IpConnectivityMetricsTest. am:
b7a479c293 am:
afb4ba1c35 am:
2d1c6405d6 -s ours
Add the defaultNetwork element to the netstats.proto. am:
9781f785bc am:
adcb94472a am:
5d50149710 -s ours
Add getDefaultNetwork to the NetworkStats public API. am:
d5876bc438 am:
66eab17abc am:
424fbdbd1e -s ours
Lorenzo Colitti [Tue, 23 Jan 2018 20:20:53 +0000 (20:20 +0000)]
Merge changes from topic "multipath-datausage-backport" am:
df984fae26 am:
c46c21c702
am:
ce9b009827 -s ours
Change-Id: Ib16c50de2a3846dae9736e7ca68a4282831f0812
TreeHugger Robot [Tue, 23 Jan 2018 20:19:16 +0000 (20:19 +0000)]
Merge "Accept null brightness configs."
Lorenzo Colitti [Tue, 23 Jan 2018 20:16:55 +0000 (20:16 +0000)]
Add metered, roaming, and defaultNetwork info to NetworkTemplate. am:
0f9bce6883 am:
e383807d7f
am:
f5c668bf38 -s ours
Change-Id: I2710d5205e1d010f0b928acb7f76631a66d6349e
Lorenzo Colitti [Tue, 23 Jan 2018 20:13:23 +0000 (20:13 +0000)]
Unbreak frameworks-net tests broken by missing libutilscallstack. am:
f7fab104f9 am:
df4aba36b4
am:
333eb0ee46 -s ours
Change-Id: I38c1db830a78e3dbde51f957919aebf44e3b874a
Alison Cichowlas [Tue, 23 Jan 2018 20:08:13 +0000 (15:08 -0500)]
ScreenshotActionReceiver must be listed in manifest.
Bug:
72387021
Test: Manual verification against repro in bug
Change-Id: I3e42adec06c63155e4e1bf3c9a5b5abe65fe29c6
Lorenzo Colitti [Tue, 23 Jan 2018 20:10:13 +0000 (20:10 +0000)]
Disable IpConnectivityMetricsTest. am:
b7a479c293 am:
afb4ba1c35
am:
2d1c6405d6 -s ours
Change-Id: Ie9b63bf66eee676568e7262350033dbb286c04c4
Lorenzo Colitti [Tue, 23 Jan 2018 20:06:47 +0000 (20:06 +0000)]
Add the defaultNetwork element to the netstats.proto. am:
9781f785bc am:
adcb94472a
am:
5d50149710 -s ours
Change-Id: Ife16614408062fb3a4a8954008a5d1aa63986edf
Lorenzo Colitti [Tue, 23 Jan 2018 20:03:40 +0000 (20:03 +0000)]
Add getDefaultNetwork to the NetworkStats public API. am:
d5876bc438 am:
66eab17abc
am:
424fbdbd1e -s ours
Change-Id: I5df239d3da75332233b5043a163938d03f889881
Benedict Wong [Tue, 23 Jan 2018 19:55:47 +0000 (19:55 +0000)]
Merge "Add checks to ensure SPIs are not reused" am:
0a1dd194aa
am:
1a2e3f3b54
Change-Id: I8c7243bc600e5f2e9abec03b5a357ed6376aa9bf
Amit Mahajan [Tue, 23 Jan 2018 19:50:57 +0000 (19:50 +0000)]
Merge "Added new slot status related broadcast." am:
cdc0a084d1
am:
40effae0f3
Change-Id: I3a4174eff2dc8ce017aae4c2d31f2facde02dbe5
Treehugger Robot [Tue, 23 Jan 2018 19:43:25 +0000 (19:43 +0000)]
Merge "Combined flags of data service requests into one reason param"
Lorenzo Colitti [Tue, 23 Jan 2018 19:43:13 +0000 (19:43 +0000)]
Merge changes from topic "multipath-datausage-backport" am:
df984fae26
am:
c46c21c702
Change-Id: I45f0c69e3440e9ec69c82e81c41bea682a359389
Lorenzo Colitti [Tue, 23 Jan 2018 19:39:18 +0000 (19:39 +0000)]
Add metered, roaming, and defaultNetwork info to NetworkTemplate. am:
0f9bce6883
am:
e383807d7f
Change-Id: I1faf95edec0e836c69016c84ad2a2c8518f8eb53
Lorenzo Colitti [Tue, 23 Jan 2018 19:36:02 +0000 (19:36 +0000)]
Unbreak frameworks-net tests broken by missing libutilscallstack. am:
f7fab104f9
am:
df4aba36b4
Change-Id: I904ec7dee1f4f565a1db138e45c9e5497fbb2855
Lorenzo Colitti [Tue, 23 Jan 2018 19:33:27 +0000 (19:33 +0000)]
Disable IpConnectivityMetricsTest. am:
b7a479c293
am:
afb4ba1c35
Change-Id: Ic5a24e40ce126bc872281bb353706a245eb345f2
Lorenzo Colitti [Tue, 23 Jan 2018 19:30:57 +0000 (19:30 +0000)]
Add the defaultNetwork element to the netstats.proto. am:
9781f785bc
am:
adcb94472a
Change-Id: I292e903617d3af1867529e68eb20538afb66f665
Lorenzo Colitti [Tue, 23 Jan 2018 19:28:14 +0000 (19:28 +0000)]
Add getDefaultNetwork to the NetworkStats public API. am:
d5876bc438
am:
66eab17abc
Change-Id: If0aa0a4522df0061645d34cb3af8a33f288ed46d
Benedict Wong [Tue, 23 Jan 2018 19:27:51 +0000 (19:27 +0000)]
Merge "Add checks to ensure SPIs are not reused"
am:
0a1dd194aa
Change-Id: I893925014557e5ae13303debc4ee8f50faf9605d
Amit Mahajan [Tue, 23 Jan 2018 19:24:04 +0000 (19:24 +0000)]
Merge "Added new slot status related broadcast."
am:
cdc0a084d1
Change-Id: Ia81c5648a943bf1c13b1434b40dd09c6789a6576
Lorenzo Colitti [Tue, 23 Jan 2018 19:17:54 +0000 (19:17 +0000)]
Merge changes from topic "multipath-datausage-backport"
am:
df984fae26
Change-Id: Ic29d71ade161434b6dea796a887f60b5587ca1d5
Lorenzo Colitti [Tue, 23 Jan 2018 19:13:30 +0000 (19:13 +0000)]
Add metered, roaming, and defaultNetwork info to NetworkTemplate.
am:
0f9bce6883
Change-Id: I28e7f539fc5e0698cb8ef663aafae7a2cd579d68
Lorenzo Colitti [Tue, 23 Jan 2018 19:09:07 +0000 (19:09 +0000)]
Unbreak frameworks-net tests broken by missing libutilscallstack.
am:
f7fab104f9
Change-Id: I3125e9276da6cbbae5ef490cf98583b31c4ad8d2
Lorenzo Colitti [Tue, 23 Jan 2018 19:04:05 +0000 (19:04 +0000)]
Disable IpConnectivityMetricsTest.
am:
b7a479c293
Change-Id: Iba9dad4001c6aa725285eee6df32f116c846532d
Lorenzo Colitti [Tue, 23 Jan 2018 18:57:44 +0000 (18:57 +0000)]
Add the defaultNetwork element to the netstats.proto.
am:
9781f785bc
Change-Id: I725132a756baacbc42c573274f5687cf58225498
Badhri Jagan Sridharan [Tue, 23 Jan 2018 18:56:48 +0000 (18:56 +0000)]
Merge "Add support for UsbDeviceManager to talk to USB GADGET HAL" am:
bf996dd479 -s ours am:
5400d4dc4f
am:
26668b9056
Change-Id: I9611f6840b05566befbd3ab58705a38b81931598
Lorenzo Colitti [Tue, 23 Jan 2018 18:50:20 +0000 (18:50 +0000)]
Add getDefaultNetwork to the NetworkStats public API.
am:
d5876bc438
Change-Id: Ifbe3d8ede39c87d64eee20adcfbdd92479d09e69
Badhri Jagan Sridharan [Tue, 23 Jan 2018 18:45:03 +0000 (18:45 +0000)]
Merge "Add support for UsbDeviceManager to talk to USB GADGET HAL" am:
bf996dd479 -s ours
am:
5400d4dc4f
Change-Id: I4eab9733b7bf766f559c2423f534bc5d9b1a1066
Bryan Eyler [Tue, 23 Jan 2018 18:38:18 +0000 (18:38 +0000)]
Merge changes from topic "User Switcher CP to Master"
* changes:
Fix users not showing up in fullscreen selection.
Update user names on changes in settings/user.
Add expand icon for user switcher.
Cascade animation of users in switcher.
Add pagination dots and fix animation of user switcher.
Badhri Jagan Sridharan [Tue, 23 Jan 2018 18:36:01 +0000 (18:36 +0000)]
Merge "Add support for UsbDeviceManager to talk to USB GADGET HAL"
am:
bf996dd479 -s ours
Change-Id: I174f0a10e4ecb76607ed5e92e60ebf3a9523e6d9
TreeHugger Robot [Tue, 23 Jan 2018 18:26:10 +0000 (18:26 +0000)]
Merge "Enable quickscrub with system prop flag"
Roberto Perez [Tue, 23 Jan 2018 18:21:59 +0000 (18:21 +0000)]
Merge "Adding a new category to mark car-optimized launcher activity"
Treehugger Robot [Tue, 23 Jan 2018 18:14:00 +0000 (18:14 +0000)]
Merge "Use the correct value for Process.WEBVIEW_ZYGOTE_UID."
TreeHugger Robot [Tue, 23 Jan 2018 18:09:20 +0000 (18:09 +0000)]
Merge "Atom: WifiMulticastLockStateChanged"
TreeHugger Robot [Tue, 23 Jan 2018 18:08:22 +0000 (18:08 +0000)]
Merge "Shorter separator"
Robert Berry [Tue, 23 Jan 2018 11:59:59 +0000 (11:59 +0000)]
Move APIs to final location in preparation for API review
Leave old APIs in current location for backwards compatibility reasons.
Bug:
72298565
Test: Tried flow with current versions of GMSCore to ensure they work still
Change-Id: Iafc2b8ad8a574460dbb2482a67935debe71f1113
Benedict Wong [Tue, 23 Jan 2018 18:00:06 +0000 (18:00 +0000)]
Merge "Add checks to ensure SPIs are not reused"
Treehugger Robot [Tue, 23 Jan 2018 18:00:00 +0000 (18:00 +0000)]
Merge "Added new slot status related broadcast."
Neil Fuller [Tue, 23 Jan 2018 17:54:29 +0000 (17:54 +0000)]
Merge "Improve dumpsys for installed distros"
Andrew Scull [Tue, 23 Jan 2018 17:43:59 +0000 (17:43 +0000)]
Merge "Make us of the authsecret HAL."
Siyamed Sinir [Tue, 23 Jan 2018 17:35:59 +0000 (17:35 +0000)]
Merge "Expose locales with alternative numbering systems."
Siyamed Sinir [Tue, 23 Jan 2018 17:35:59 +0000 (17:35 +0000)]
Merge "Use numbering system for configuration selection."
TreeHugger Robot [Tue, 23 Jan 2018 17:25:29 +0000 (17:25 +0000)]
Merge "Sync statsd google3 protos to aosp."
TreeHugger Robot [Tue, 23 Jan 2018 17:20:31 +0000 (17:20 +0000)]
Merge "Frameworks: Fix scoping problem in SQLite"
Jorim Jaggi [Tue, 23 Jan 2018 17:14:03 +0000 (17:14 +0000)]
Merge changes I2b6bfca0,I9a854d43
* changes:
Add option to retrieve pending intent result
Fix issue with permission check for shortcuts and pendingIntent
TreeHugger Robot [Tue, 23 Jan 2018 17:07:40 +0000 (17:07 +0000)]
Merge "Add new MediaDrm methods"
TreeHugger Robot [Tue, 23 Jan 2018 16:46:10 +0000 (16:46 +0000)]
Merge "AudioFocusRequest: add ability to force ducking for a11y"
Yangster [Tue, 23 Jan 2018 00:18:34 +0000 (16:18 -0800)]
Sync statsd google3 protos to aosp.
Test: statsd unit tests passed
Change-Id: I66b05478b7c5b0f9fdd6386b2e2ba7c38a3f9b88
TreeHugger Robot [Tue, 23 Jan 2018 16:38:16 +0000 (16:38 +0000)]
Merge "Fix registerSliceCallback to match api guidelines"
Amit Mahajan [Tue, 23 Jan 2018 16:28:16 +0000 (16:28 +0000)]
Merge "Added new slot status related broadcast."
Jorim Jaggi [Thu, 18 Jan 2018 16:05:46 +0000 (17:05 +0100)]
New task switch animation
Test: go/wm-smoke
Test: Open new task, close tas
Bug:
64155106
Change-Id: Ie3943d2b65a43bd6d36fa24cab22613b4db469ba
Jorim Jaggi [Thu, 18 Jan 2018 12:17:52 +0000 (13:17 +0100)]
New activity open/close animation
Test: go/wm-smoke
Test: Open activities in settings
Bug:
64155106
Change-Id: I158f560f0294add42e40ffa2d2c4e3a8cab7ccc8
Adrian Roos [Tue, 23 Jan 2018 15:23:55 +0000 (15:23 +0000)]
Merge "DisplayCutout: Add more display cutout flavors"
Lorenzo Colitti [Tue, 23 Jan 2018 15:22:18 +0000 (15:22 +0000)]
Merge changes from topic "multipath-datausage-backport"
* changes:
Support passing a template to NetworkStatsManager queries.
Add metered, roaming, and defaultNetwork info to NetworkTemplate.
Unbreak frameworks-net tests broken by missing libutilscallstack.
Disable IpConnectivityMetricsTest.
Add the defaultNetwork element to the netstats.proto.
Add getDefaultNetwork to the NetworkStats public API.
Leon Scroggins [Tue, 23 Jan 2018 15:19:43 +0000 (15:19 +0000)]
Merge "Unhide ImageDecoder"
Ricky Wai [Tue, 23 Jan 2018 14:27:29 +0000 (14:27 +0000)]
Merge "Add update network watchlist config ConfigUpdater intent action"
Ricky Wai [Tue, 23 Jan 2018 14:25:39 +0000 (14:25 +0000)]
Merge "Add ConnectivityManager.getNetworkWatchlistConfigHash()"
Jason Monk [Tue, 23 Jan 2018 14:24:35 +0000 (14:24 +0000)]
Merge "Remove slice: from SliceProvider docs"
Julia Reynolds [Mon, 22 Jan 2018 21:40:45 +0000 (16:40 -0500)]
Remove settings intent
There's no dedicated screen for it to go to.
Test: make
Bug:
63927402
Change-Id: I9fc3352b74e526b5bd43ac48626c0d469fae4899
TreeHugger Robot [Tue, 23 Jan 2018 13:57:29 +0000 (13:57 +0000)]
Merge "Make BulletSpan more flexible and update JavaDoc."
TreeHugger Robot [Tue, 23 Jan 2018 13:56:24 +0000 (13:56 +0000)]
Merge "Track the most recent notifying packages"
Jorim Jaggi [Mon, 22 Jan 2018 21:41:22 +0000 (22:41 +0100)]
Add option to retrieve pending intent result
Used by SystemUI to check whether an activity start will
actually lead to something animating.
Also fixes an issue where we return MOVED_TO_FRONT instead of
DELIVERED_TO_TOP.
Test: go/wm-smoke
Test: Use PendingIntent.sendAndReturnResult
Change-Id: I2b6bfca0a53125635bc462f32ab7eaae366c0c8a
Jorim Jaggi [Fri, 19 Jan 2018 14:57:41 +0000 (15:57 +0100)]
Fix issue with permission check for shortcuts and pendingIntent
When launching a PendingIntent, we have two sets of activity
options: One supplied from the caller that obtained the
pending intent, and those supplied from the caller that is
sending it. We need to perform the permission check depending
on which caller the options are coming from.
For that, we introduce SafeActivityOptions that records the
callingPid/callingUid when obtaining it and checks for the
permissions with the correct callingPid/callingUid, and
also supports merging both activity options.
In addition to that, fix shortcuts by not clearing caller
identity in LauncherAppsService.
Test: go/wm-smoke
Test: Install custom launcher APK with animation for shortcuts
enabled, make sure launch works properly.
Bug:
64674361
Change-Id: I9a854d43c65c8fa69bf16ccfbed86e8e681a095b
Florina Muntenescu [Fri, 19 Jan 2018 17:14:39 +0000 (17:14 +0000)]
Make BulletSpan more flexible and update JavaDoc.
Test: BulletSpanTest
Bug:
72217003
Change-Id: I0ba4d93bd5a7bac02410e0edbd4b20f254959d4e
Adam Lesinski [Tue, 23 Jan 2018 11:41:15 +0000 (11:41 +0000)]
Merge changes Ib67ad0da,Ie532f29a,Ieabc1777,Ied210b3e
* changes:
Revert "Replace AssetManager with AssetManager2 implementation"
Revert "Make idiomatic use of ApkAssets and AssetManager"
Revert "libandroidfw: Add ApplyStyle and SetConfiguration benchmark"
Revert "libandroidfw: Improve performance of AssetManager2"
Adam Lesinski [Tue, 23 Jan 2018 11:17:26 +0000 (03:17 -0800)]
Revert "Replace AssetManager with AssetManager2 implementation"
This reverts commit
b20a0ce59f59cb5ec857748e056cc341dbd13b92.
Adam Lesinski [Tue, 23 Jan 2018 11:17:01 +0000 (03:17 -0800)]
Revert "Make idiomatic use of ApkAssets and AssetManager"
This reverts commit
c857766ca5aa37df0833c816922e6b3b85a742f9.
Adam Lesinski [Tue, 23 Jan 2018 11:16:33 +0000 (03:16 -0800)]
Revert "libandroidfw: Add ApplyStyle and SetConfiguration benchmark"
This reverts commit
62f17129a0c519fe3e591be102b1863024cea3a4.
Adam Lesinski [Tue, 23 Jan 2018 11:16:16 +0000 (03:16 -0800)]
Revert "libandroidfw: Improve performance of AssetManager2"
This reverts commit
392132748416719e3df427e6ac8dc11af194342c.
TreeHugger Robot [Tue, 23 Jan 2018 09:59:27 +0000 (09:59 +0000)]
Merge "Fail KeySyncTask if the PlatformKey can't be used to decrypt"
Jaewan Kim [Tue, 23 Jan 2018 09:52:03 +0000 (09:52 +0000)]
Merge "MediaSession2: Introduce MediaSession2.Command / CommandGroup"
Jaewan Kim [Tue, 23 Jan 2018 09:46:10 +0000 (09:46 +0000)]
Merge "MediaSession2: Move MediaSession2/MediaController2 from experimental"
Insun Kang [Tue, 23 Jan 2018 09:40:24 +0000 (09:40 +0000)]
Merge "Release MediaSession when VideoView2 is detached from window."
Lorenzo Colitti [Mon, 22 Jan 2018 02:54:46 +0000 (11:54 +0900)]
Add metered, roaming, and defaultNetwork info to NetworkTemplate.
This will allow data usage clients to query for and receive
callbacks on data usage matching these conditions.
Bug:
35142602
Test: atest FrameworksNetTests
Change-Id: I4d985a2734eeab7ee454c09cc2098b6b3c671c23
Merged-In: I4d985a2734eeab7ee454c09cc2098b6b3c671c23
Lorenzo Colitti [Mon, 22 Jan 2018 03:53:18 +0000 (12:53 +0900)]
Unbreak frameworks-net tests broken by missing libutilscallstack.
Test: atest FrameworksNetTest shows fewer failures
Change-Id: Ic6f2bc18e80d91226d8d49e047e3997ffc45e45a
Merged-In: Ic6f2bc18e80d91226d8d49e047e3997ffc45e45a
Lorenzo Colitti [Mon, 22 Jan 2018 03:50:58 +0000 (12:50 +0900)]
Disable IpConnectivityMetricsTest.
This test has been failing for a while, and we are do not have
bandwidth to fix it during the next week.
Test: make -j64 FrameworksNetTests RUN_ERROR_PRONE=true
Test: atest FrameworksNetTests:IpConnectivityMetricsTest
Test: runtest -x frameworks/base/tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java
Change-Id: I59d73c1773e160a726996f3ab4ad20312decc127
Merged-In: I59d73c1773e160a726996f3ab4ad20312decc127
Lorenzo Colitti [Fri, 19 Jan 2018 17:02:56 +0000 (02:02 +0900)]
Add the defaultNetwork element to the netstats.proto.
This is in its own commit because AOSP has diverged from internal
master.
Bug:
35142602
Test: builds, boots
Change-Id: I75fc85b961bc919e3d6c2adce6d6861c6f2c8379
Merged-In: I75fc85b961bc919e3d6c2adce6d6861c6f2c8379
Lorenzo Colitti [Mon, 22 Jan 2018 12:00:49 +0000 (21:00 +0900)]
Support passing a template to NetworkStatsManager queries.
Currently, NetworkStatsManager queries and callbacks only allow
selecting network traffic based on network identifiers:
networkType, subscriptionId and networkId. The code ends up
converting these into a template under the hood.
Now that templates can express more fine-grained queries (e.g.,
select only roaming traffic, or select only traffic that's not
on the default network) add a hidden method to pass in a
template. This should have no security implications, as all the
access controls are performed in NetworkStatsService.
Bug:
35142602
Test: android.app.usage.cts.NetworkUsageStatsTest passes
Change-Id: Iab4afa26b34544299d2a9c501c1b0feb470e90a9
Merged-In: Iab4afa26b34544299d2a9c501c1b0feb470e90a9
Lorenzo Colitti [Thu, 18 Jan 2018 16:12:58 +0000 (01:12 +0900)]
Add getDefaultNetwork to the NetworkStats public API.
This allows an app using the public API to know whether the
traffic in a particular bucket was on the default network
(i.e., the network was selected by the system), or not (i.e.,
the network was selected by the app).
Bug:
35142602
Test: builds, boots
Test: added coverage to NetworkUsageStatsTest CTS test, still passes
Change-Id: I9f6669908fa119743b9c0aa0c31a03e5ebafa7db
Merged-In: I9f6669908fa119743b9c0aa0c31a03e5ebafa7db
Tej Singh [Thu, 4 Jan 2018 22:35:01 +0000 (14:35 -0800)]
Atom: WifiMulticastLockStateChanged
Add WifiMulticastLockStateChanged to atoms.proto
Add log lines
Test: CTS test in accompanying CL
Change-Id: I9b4b861a2de5254c9b7f41c15ab0fbb76af4ff6e
Insun Kang [Mon, 22 Jan 2018 09:04:07 +0000 (18:04 +0900)]
Add API docs for VideoView2
Test: ran 'make doc-comment-check-docs' after removing @hide tag.
Change-Id: I1c3492e8c302b9a6222b5400e71ccbabaaa372a3