Commit Graph

86499 Commits

Author SHA1 Message Date
TreeHugger Robot
ba685389af Merge "Keystore APIs for Import Wrapped Key, Strongbox, 3DES" 2018-01-23 22:28:30 +00:00
Julia Reynolds
0d1e3990c6 Merge "Remove settings intent" 2018-01-23 22:08:32 +00:00
Robert Sesek
fb9663a170 Merge "Use the correct value for Process.WEBVIEW_ZYGOTE_UID." am: 572f65fb58 am: cb7119385e
am: 000552a64d

Change-Id: If279fa06502f3bd39542504352c07a4e15b078dd
2018-01-23 22:00:08 +00:00
Robert Sesek
000552a64d Merge "Use the correct value for Process.WEBVIEW_ZYGOTE_UID." am: 572f65fb58
am: cb7119385e

Change-Id: Iaf7a31629d06d87400796899f659926e5186ac41
2018-01-23 21:52:04 +00:00
Felipe Leme
e14921216a Merge "DO NOT MERGE - fix AFM.getComponentNameFromContext()" into oc-mr1-dev
am: 2eeab61b4c

Change-Id: Idda0d7fbc0f63bcbad44da6a46cef786770a2851
2018-01-23 21:46:43 +00:00
Jorim Jaggi
169bc15b25 Merge changes Ie3943d2b,I158f560f
* changes:
  New task switch animation
  New activity open/close animation
2018-01-23 21:44:24 +00:00
Robert Sesek
cb7119385e Merge "Use the correct value for Process.WEBVIEW_ZYGOTE_UID."
am: 572f65fb58

Change-Id: I822fdad1c22de97884e389f651230ef31cd65deb
2018-01-23 21:42:19 +00:00
TreeHugger Robot
2eeab61b4c Merge "DO NOT MERGE - fix AFM.getComponentNameFromContext()" into oc-mr1-dev 2018-01-23 21:39:09 +00:00
Dmitry Dementyev
d51fdf0105 Merge "Move APIs to final location in preparation for API review" 2018-01-23 20:57:14 +00:00
Amit Mahajan
b641b585bb Merge "Added new slot status related broadcast." am: cdc0a084d1
am: 40effae0f3

Change-Id: I3a4174eff2dc8ce017aae4c2d31f2facde02dbe5
2018-01-23 19:50:57 +00:00
Lorenzo Colitti
ce9b009827 Merge changes from topic "multipath-datausage-backport" am: df984fae26
am: c46c21c702

Change-Id: I45f0c69e3440e9ec69c82e81c41bea682a359389
2018-01-23 19:43:13 +00:00
Lorenzo Colitti
f5c668bf38 Add metered, roaming, and defaultNetwork info to NetworkTemplate. am: 0f9bce6883
am: e383807d7f

Change-Id: I1faf95edec0e836c69016c84ad2a2c8518f8eb53
2018-01-23 19:39:18 +00:00
Lorenzo Colitti
5d50149710 Add the defaultNetwork element to the netstats.proto. am: 9781f785bc
am: adcb94472a

Change-Id: I292e903617d3af1867529e68eb20538afb66f665
2018-01-23 19:30:57 +00:00
Lorenzo Colitti
424fbdbd1e Add getDefaultNetwork to the NetworkStats public API. am: d5876bc438
am: 66eab17abc

Change-Id: If0aa0a4522df0061645d34cb3af8a33f288ed46d
2018-01-23 19:28:14 +00:00
Amit Mahajan
40effae0f3 Merge "Added new slot status related broadcast."
am: cdc0a084d1

Change-Id: Ia81c5648a943bf1c13b1434b40dd09c6789a6576
2018-01-23 19:24:04 +00:00
Lorenzo Colitti
c46c21c702 Merge changes from topic "multipath-datausage-backport"
am: df984fae26

Change-Id: Ic29d71ade161434b6dea796a887f60b5587ca1d5
2018-01-23 19:17:54 +00:00
Lorenzo Colitti
e383807d7f Add metered, roaming, and defaultNetwork info to NetworkTemplate.
am: 0f9bce6883

Change-Id: I28e7f539fc5e0698cb8ef663aafae7a2cd579d68
2018-01-23 19:13:30 +00:00
Lorenzo Colitti
adcb94472a Add the defaultNetwork element to the netstats.proto.
am: 9781f785bc

Change-Id: I725132a756baacbc42c573274f5687cf58225498
2018-01-23 18:57:44 +00:00
Lorenzo Colitti
66eab17abc Add getDefaultNetwork to the NetworkStats public API.
am: d5876bc438

Change-Id: Ifbe3d8ede39c87d64eee20adcfbdd92479d09e69
2018-01-23 18:50:20 +00:00
Roberto Perez
c4788e1f04 Merge "Adding a new category to mark car-optimized launcher activity" 2018-01-23 18:21:59 +00:00
Treehugger Robot
572f65fb58 Merge "Use the correct value for Process.WEBVIEW_ZYGOTE_UID." 2018-01-23 18:14:00 +00:00
TreeHugger Robot
7e004f96dd Merge "Atom: WifiMulticastLockStateChanged" 2018-01-23 18:09:20 +00:00
Robert Berry
81ee34bf95 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
2018-01-23 18:05:27 +00:00
Treehugger Robot
cdc0a084d1 Merge "Added new slot status related broadcast." 2018-01-23 18:00:00 +00:00
Neil Fuller
ee33ac4bd2 Merge "Improve dumpsys for installed distros" 2018-01-23 17:54:29 +00:00
Jorim Jaggi
15e76d620a Merge changes I2b6bfca0,I9a854d43
* changes:
  Add option to retrieve pending intent result
  Fix issue with permission check for shortcuts and pendingIntent
2018-01-23 17:14:03 +00:00
TreeHugger Robot
4953824b89 Merge "Fix registerSliceCallback to match api guidelines" 2018-01-23 16:38:16 +00:00
Amit Mahajan
6ba8bc8a47 Merge "Added new slot status related broadcast." 2018-01-23 16:28:16 +00:00
Jorim Jaggi
6bc886e64e New activity open/close animation
Test: go/wm-smoke
Test: Open activities in settings
Bug: 64155106
Change-Id: I158f560f0294add42e40ffa2d2c4e3a8cab7ccc8
2018-01-23 17:23:00 +01:00
Ricky Wai
cee2094d75 Merge "Add update network watchlist config ConfigUpdater intent action" 2018-01-23 14:27:29 +00:00
Ricky Wai
c61216d4a2 Merge "Add ConnectivityManager.getNetworkWatchlistConfigHash()" 2018-01-23 14:25:39 +00:00
Jason Monk
e0bba99c94 Merge "Remove slice: from SliceProvider docs" 2018-01-23 14:24:35 +00:00
Julia Reynolds
c128c86481 Remove settings intent
There's no dedicated screen for it to go to.
Test: make
Bug: 63927402

Change-Id: I9fc3352b74e526b5bd43ac48626c0d469fae4899
2018-01-23 09:04:29 -05:00
TreeHugger Robot
414b665f2d Merge "Make BulletSpan more flexible and update JavaDoc." 2018-01-23 13:57:29 +00:00
TreeHugger Robot
2c78c181e7 Merge "Track the most recent notifying packages" 2018-01-23 13:56:24 +00:00
Jorim Jaggi
e2ad37f9bc 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
2018-01-23 14:40:28 +01:00
Florina Muntenescu
987189b936 Make BulletSpan more flexible and update JavaDoc.
Test: BulletSpanTest
Bug: 72217003
Change-Id: I0ba4d93bd5a7bac02410e0edbd4b20f254959d4e
2018-01-23 12:08:39 +00:00
Adam Lesinski
a8c7794856 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"
2018-01-23 11:41:15 +00:00
Adam Lesinski
7fb3831136 Revert "Replace AssetManager with AssetManager2 implementation"
This reverts commit b20a0ce59f.
2018-01-23 03:17:26 -08:00
Adam Lesinski
68d10d00a5 Revert "Make idiomatic use of ApkAssets and AssetManager"
This reverts commit c857766ca5.
2018-01-23 03:17:01 -08:00
Insun Kang
0945bb7418 Merge "Release MediaSession when VideoView2 is detached from window." 2018-01-23 09:40:24 +00:00
Lorenzo Colitti
0f9bce6883 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
2018-01-23 18:38:48 +09:00
Lorenzo Colitti
9781f785bc 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
2018-01-23 18:38:48 +09:00
Lorenzo Colitti
d15c937f97 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
2018-01-23 18:38:48 +09:00
Lorenzo Colitti
d5876bc438 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
2018-01-23 18:28:07 +09:00
Tej Singh
4503e10b59 Atom: WifiMulticastLockStateChanged
Add WifiMulticastLockStateChanged to atoms.proto
Add log lines

Test: CTS test in accompanying CL
Change-Id: I9b4b861a2de5254c9b7f41c15ab0fbb76af4ff6e
2018-01-23 00:41:49 -08:00
Frank Salim
21d9c1d44a Keystore APIs for Import Wrapped Key, Strongbox, 3DES
Import Wrapped Key:
Applications can import keys in a wrapped, encrypted format. Wrapped keys are
unwrapped inside of a Keymaster device.

Strongbox:
Applications can import and generate keys in secure hardware.

3DES:
Add KeyProperties and KeymasterDefs
Add AndroidKeyStore3DESCipherSpi and provider registrations

Bug: 63931634
Test: Keystore CTS tests in progress

Change-Id: I80b6db865b517fa108f14aced7402336212c441b
2018-01-23 00:29:11 -08:00
Insun Kang
eb78d511cb Add API docs for VideoView2
Test: ran 'make doc-comment-check-docs' after removing @hide tag.
Change-Id: I1c3492e8c302b9a6222b5400e71ccbabaaa372a3
2018-01-23 08:11:47 +00:00
TreeHugger Robot
426deb4da7 Merge "Add flag for a V2 of the About Phone page." 2018-01-23 07:04:29 +00:00
Jong Wook Kim
16c5d2c8d2 Merge "Wifi MAC Randomization: Developer option change global settings" 2018-01-23 06:40:51 +00:00