Commit Graph

13619 Commits

Author SHA1 Message Date
Bo Liu
b1229186d1 Merge "Revert "Expose setDrawGLFunctionDetachedCallback to webview"" into nyc-dev am: 08ca2e3 am: 55f3776
am: 7d3c51c

* commit '7d3c51cfdd6e54b157ad62a3dd85856dad758513':
  Revert "Expose setDrawGLFunctionDetachedCallback to webview"

Change-Id: I258f3ad08c23dac94f3679813188ec715b9635ac
2016-04-27 18:19:44 +00:00
Bo Liu
7d3c51cfdd Merge "Revert "Expose setDrawGLFunctionDetachedCallback to webview"" into nyc-dev am: 08ca2e3
am: 55f3776

* commit '55f3776d82c2ebc9831868bcc068d53ceb38565f':
  Revert "Expose setDrawGLFunctionDetachedCallback to webview"

Change-Id: I6aa64553e7dfec0757bcd5b6d3299289185c5c6c
2016-04-27 18:11:30 +00:00
Bo Liu
08ca2e3a75 Merge "Revert "Expose setDrawGLFunctionDetachedCallback to webview"" into nyc-dev 2016-04-27 17:58:34 +00:00
The Android Automerger
8bdf39e19c Manually merge branch 'nyc-mr1-dev-plus-aosp' to fix automerger blockage b/28407115 2016-04-27 17:58:24 +00:00
Hangyu Kuang
61734544d1 Merge changes from topic \'atv-hdr\' into nyc-dev
am: 39bb2c2

* commit '39bb2c29b427b0cf2396a8691176584094ae805c':
  Unhide getHdrCapabilities and HdrCapabilities.
  Plumb HDR capabilities to Display
  Revert "Revert "Hook up HDR capabilities from native SurfaceControl""

Change-Id: I53f0414c0a408edeae8ffe7161a035e45b8670b7
2016-04-27 16:46:30 +00:00
Hangyu Kuang
39bb2c29b4 Merge changes from topic 'atv-hdr' into nyc-dev
* changes:
  Unhide getHdrCapabilities and HdrCapabilities.
  Plumb HDR capabilities to Display
  Revert "Revert "Hook up HDR capabilities from native SurfaceControl""
2016-04-27 16:38:21 +00:00
Clara Bayarri
ad63540b01 Merge "Cleanup LocaleList docs given API review" into nyc-dev
am: 4dc63f7

* commit '4dc63f78a910e421d106cffc105b085f1ab1e2ae':
  Cleanup LocaleList docs given API review

Change-Id: Ic48021bdd5d021abd7eb8a10fa8540defdeb51bf
2016-04-27 15:42:57 +00:00
Clara Bayarri
4dc63f78a9 Merge "Cleanup LocaleList docs given API review" into nyc-dev 2016-04-27 15:32:58 +00:00
John Reck
f97dca612e Merge "API tweaks to PixelCopy and make it public" into nyc-dev
am: 7f209d3

* commit '7f209d37f17d4df09475137c38b84a3338c84023':
  API tweaks to PixelCopy and make it public

Change-Id: I1aac8afacfd054fe10fc26a73552608c51dfa9f5
2016-04-27 14:44:38 +00:00
John Reck
7f209d37f1 Merge "API tweaks to PixelCopy and make it public" into nyc-dev 2016-04-27 14:36:53 +00:00
Clara Bayarri
66f6bd32d8 Cleanup LocaleList docs given API review
-- Remove default constructor from public API since getEmptyLocaleList exists
-- Merge the Locale and Locale[] constructors by providing a single Locale… varargs constructor
-- forLanguageTags, get, toLanguageTags, size, need docs
-- get(int location) should be get(int index)

Plus general docs improvements

Bug: 28296200
Change-Id: I8b4e67184f8c723daebcd251f04947d48bbb5478
2016-04-27 14:55:45 +01:00
Shubham Ajmera
3277f3c916 Merge "Track libcore change 13331bc0dd87b029b194e5aca4487e38d18da188" into nyc-dev-plus-aosp 2016-04-27 09:44:57 +00:00
Hugo Benichi
9b7a3b5d53 Merge changes I8de95add,Ia6f4ccfd into nyc-dev am: 24b6e2b am: 74db646
am: 37aa948

* commit '37aa94838105990ad54ef197bd4bfde21b4a5dc9':
  Remove unused event tags of IpConnectivityEvent
  Better ConnectivityMetricsEvent printing

Change-Id: I8625da2af299337f385596f8015a8f7255aa2c37
2016-04-27 02:51:44 +00:00
TreeHugger Robot
24b6e2bcc8 Merge changes I8de95add,Ia6f4ccfd into nyc-dev
* changes:
  Remove unused event tags of IpConnectivityEvent
  Better ConnectivityMetricsEvent printing
2016-04-27 01:49:53 +00:00
Ruben Brunk
dd1a9e05ef Merge "Add manifest attribute for VR activities." into nyc-dev am: f84b3e0 am: 45d6192
am: 842d0d4

* commit '842d0d44883591ba7221ff62c55a1efd70876ca0':
  Add manifest attribute for VR activities.

Change-Id: Ie2f10baef334561e66e08eceb8a73e860e308514
2016-04-27 01:21:14 +00:00
Hugo Benichi
61cbccc2bf Remove unused event tags of IpConnectivityEvent
Bug: 28204408
Change-Id: I8de95add30cdf5c35c8129ee1b95d2d648b3316d
2016-04-27 09:12:40 +09:00
Hugo Benichi
5df9d729f6 Better ConnectivityMetricsEvent printing
This patch adds more information printing for IpConnectivity event
classes in android.net.metrics.

example:

ConnectivityMetricsEvent(14:36:35.799, 0, 1026): DhcpClientEvent(wlan0, DhcpRequestingState)
ConnectivityMetricsEvent(14:36:35.805, 0, 1026): DhcpClientEvent(wlan0, DhcpHaveAddressState)
ConnectivityMetricsEvent(14:36:35.809, 0, 4096): IpManagerEvent(wlan0, PROVISIONING_OK, 155ms)
ConnectivityMetricsEvent(14:36:35.810, 0, 1026): DhcpClientEvent(wlan0, DhcpBoundState)
ConnectivityMetricsEvent(14:36:35.871, 0, 2048): NetworkEvent(101, NETWORK_CONNECTED, 0ms)
ConnectivityMetricsEvent(14:36:35.874, 0, 2051): ValidationProbeEvent(101, PROBE_HTTP:599, 3ms)
ConnectivityMetricsEvent(14:36:35.874, 0, 2048): NetworkEvent(101, NETWORK_VALIDATION_FAILED, 0ms)
ConnectivityMetricsEvent(14:36:35.928, 0, 3072): DefaultNetworkEvent(0 -> 101, [WIFI], IPv4: false, IPv6: false)
ConnectivityMetricsEvent(14:36:37.008, 0, 2051): ValidationProbeEvent(101, PROBE_HTTP:204, 134ms)
ConnectivityMetricsEvent(14:36:37.008, 0, 2050): NetworkEvent(101, NETWORK_VALIDATED, 1137ms)

Also fixes a couple of event logging issues:
  - do no record spurious receive DhcpErrorEvent when a network goes down.
  - add an eventType field to IpManagerEvent instead of using the
    loggger component tag.

Bug: 28204408
Change-Id: Ia6f4ccfd7a0c63a5ccec18825f226c0b5781217b
2016-04-27 09:11:29 +09:00
Hangyu Kuang
da802f5100 Unhide getHdrCapabilities and HdrCapabilities.
Bug:25684127
Change-Id: Ibeefc566213da5b76deba13eb2224916a4fefd13
2016-04-26 23:04:56 +00:00
John Reck
e94cbc76d5 API tweaks to PixelCopy and make it public
Bug: 27708453
Change-Id: I81667ce42f9ca1c1a13e1e61299927900845fc84
2016-04-26 15:41:43 -07:00
Ruben Brunk
f84b3e0e2f Merge "Add manifest attribute for VR activities." into nyc-dev 2016-04-26 22:05:30 +00:00
Svet Ganov
db2174dcb8 Merge "Ensure local settings caches are not stale" into nyc-dev am: f71d7fe am: d4bc15b
am: 0010741

* commit '0010741818127e6c9449fc49490f0bad14a76240':
  Ensure local settings caches are not stale

Change-Id: I26c4f1f72eda3b2ebfb3ca6e086a0381d357471c
2016-04-26 18:54:37 +00:00
Svetoslav Ganov
f71d7feef2 Merge "Ensure local settings caches are not stale" into nyc-dev 2016-04-26 18:36:28 +00:00
Svet Ganov
53a441ca8e Ensure local settings caches are not stale
We used the system proterties as a shared memory mechanism
to propagate information to local settings caches when the
content has changed and the cache should be cleared. The
system properties are unfortunately updated asynchronously
leading to cases where clients may read stale data.

This change adds a simple int array data structure backed
by shared memory which guarantees individual values are
atomically read and updated without memory tear. Multi-
index opearations are not synchronized between each other.

The settings provider is using the new data structure to
propagate the settings generation which drives when caches
are purged.

We have a single memory array keeping the generation for
different settings tables per user. Since memory array is
not a compact data structure and the user space exceeds
the memory array size we use an in-memory map from keys
to indices in the memory array where the generation id of
a key is stored. A key is derived by the setting type in
the 4 most significant bits and the user id in the 28 least
significant bits.

The mapping from a key to an index is cleared if the user is
removed and the corresponding index in the memory arry is
reset to make it available for other users. The size of the
memory array is derived from the max user count that can be
created at the same time.

bug:18826179

Change-Id: I64009cc5105309ef9aa83aba90b82afc8ad8c659
2016-04-26 11:31:55 -07:00
Shubham Ajmera
1810bf4595 Track libcore change 13331bc0dd87b029b194e5aca4487e38d18da188
Bug: 27214236
(cherry-picked from commit 002be4e7b0)
Change-Id: I3074436baaa16fe19a158aa3aafdb79b534f792b
2016-04-26 17:09:39 +00:00
Julia Reynolds
d33451c837 Merge changes from topic \'api_review\' into nyc-dev am: a0676c9 am: a6c9a89
am: d9c4c76

* commit 'd9c4c7650f4ee6ea3282cc097d1d0f0756d32c69':
  Api review: Settings.
  Reduce spacing.

Change-Id: I781cda64e8ecfd64ba236f8b8401f2f20a7df5d1
2016-04-26 16:16:09 +00:00
Julia Reynolds
a0676c9207 Merge changes from topic 'api_review' into nyc-dev
* changes:
  Api review: Settings.
  Reduce spacing.
2016-04-26 15:29:11 +00:00
Jeff Sharkey
596e8588b1 resolve merge conflicts of d1153a3 to master
Change-Id: Iec9a4a76d0db0fbebdca8a732b4666cfaad70267
2016-04-25 16:40:38 -06:00
Dan Sandler
0551b0f42a resolve merge conflicts of c635525 to master
Change-Id: I33b31ce36bbf255408ac50b87ed29f3957c9d533
2016-04-25 17:32:50 -04:00
Ruben Brunk
f56c9f432b Add manifest attribute for VR activities.
- Allow jank-free VR->VR activity transitions, even during
  long activity transitions.

Bug: 28115931
Change-Id: I1e3fd1a5245bac3433ea6282cb1c7a71f0e0266f
2016-04-25 13:32:03 -07:00
Jeff Sharkey
c79a568f18 Merge "API changes for DownloadManager and JobScheduler." into nyc-dev 2016-04-25 20:14:59 +00:00
Julia Reynolds
0aa7d615c2 Api review: Settings.
Hide notification policy setting.

Bug: 28295513
Change-Id: Ic117285c3eb07cb4bf399e233adad835772b9673
2016-04-25 14:57:33 -04:00
Jeff Sharkey
f07c7b9fd0 API changes for DownloadManager and JobScheduler.
To support moving DownloadManager, add new JobScheduler network type
constraint that matches "any network except roaming."  Also add an
API to get a specific JobInfo by ID.

Since the default network can be different on a per-app basis, and
individual apps may be blocked due to app standby, evaluate job
connectivity constraints on a per-UID basis.  To implement this
cleanly, add NetworkInfo.isMetered() to match the isRoaming() API.

Add new DownloadManager APIs to support charging and device idle
constraints, which are plumbed through to JobScheduler under the
hood when scheduled.

Add filtering to JobScheduler dumpsys to omit noisy details for
packages the caller isn't interested in.

Bug: 28098882, 26571724, 19821935
Change-Id: I09ca7184ef7ce6adba399f579d415a5fb2ea6110
2016-04-24 14:39:34 -06:00
Dan Sandler
80eaa59759 Move EXTRA_SUBSTITUTE_APP_NAME to the published system api.
Bug: 26517701
Change-Id: I27000d777247c598cc509079004b4506ef05b404
2016-04-23 14:44:09 +00:00
Chris Banes
c1ede9aa2e Merge "Make AbsSavedState read using given ClassLoader" into nyc-dev am: b02d51b am: bdc6966
am: 9465c72

* commit '9465c720f53d3ca7d0fa2311c887b727db3fdbaf':
  Make AbsSavedState read using given ClassLoader

Change-Id: Ia1ee1a8609c3cf7815e596cc74658dc4bb04c01e
2016-04-23 07:16:42 +00:00
Chris Banes
b02d51b3d3 Merge "Make AbsSavedState read using given ClassLoader" into nyc-dev 2016-04-23 07:04:21 +00:00
Carlos Valdivia
e1d55b2779 Merge "Rename GET_PASSWORD_PRIVILEGED and make it signature." into nyc-dev am: ffcba67 am: 2ab3256
am: b255a2a

* commit 'b255a2afb4d3aae35c87d9f6f719bd4f188279da':
  Rename GET_PASSWORD_PRIVILEGED and make it signature.

Change-Id: Id9e1329e3356a1360be4a13b7dae9930f52c36f4
2016-04-22 23:50:17 +00:00
Ta-wei Yen
12a0ec3942 Merge "Rename _BOOLEAN visual voicemail config keys to _BOOL" into nyc-dev am: 8431a48 am: e85b334
am: c63cf69

* commit 'c63cf6970729a349f71247f392e469a3d4f0598b':
  Rename _BOOLEAN visual voicemail config keys to _BOOL

Change-Id: I29b512ad4986cb52e00f33b9c418ec05a28dbb80
2016-04-22 23:49:40 +00:00
Carlos Valdivia
ffcba67bf9 Merge "Rename GET_PASSWORD_PRIVILEGED and make it signature." into nyc-dev 2016-04-22 22:51:51 +00:00
Ta-wei Yen
8431a48f77 Merge "Rename _BOOLEAN visual voicemail config keys to _BOOL" into nyc-dev 2016-04-22 22:43:59 +00:00
Svet Ganov
879f5ba3f7 Merge "Cleanup of the PackageInstaller API - Frameworks" into nyc-dev am: c947ebd am: 70d720c
am: 13da561

* commit '13da5613e2fce0ca2d5682fd202234856d2206e9':
  Cleanup of the PackageInstaller API - Frameworks

Change-Id: Ibe4a6258c6437a9e86ed25e242301ca6d6635d26
2016-04-22 22:35:29 +00:00
Carlos Valdivia
714bbd8539 Rename GET_PASSWORD_PRIVILEGED and make it signature.
Now named GET_PASSWORD. Now it is just a signature, not privileged.

Bug: 28295831
Change-Id: Ice93b527edced9546639b6c7096aad933c517548
2016-04-22 15:04:01 -07:00
Sujith Ramakrishnan
fa5a632067 Merge "Unbundle RemoteService on TV - part 3" into nyc-dev am: 7981e8f am: a2262b3
am: c5826ee

* commit 'c5826eebc50a6ffafe8cd20633b01b6ca27e8490':
  Unbundle RemoteService on TV - part 3

Change-Id: If0dabbb8199132648fa9a791f46ee85e8970eb4b
2016-04-22 21:36:53 +00:00
Alex Hills
fae5c81aa5 Merge "Changes Message from using parcels to bundles" into nyc-dev am: 9ef0ce1 am: 7bdd6a5
am: a384cda

* commit 'a384cdae6494d60149043ca244b76761c9c27dca':
  Changes Message from using parcels to bundles

Change-Id: Icb2bbe938f13036e51a650e85bee45b741c5004c
2016-04-22 21:30:51 +00:00
Svet Ganov
ae0e03a9e0 Cleanup of the PackageInstaller API - Frameworks
The PackageInstaller app manages side-loading apps as well
as permission management. It should be updatable, hence
should rely on system APIs to talk to the platform. This
is the first step of defining an API boundary.

Change-Id: I9814eafd0b22ae03b4b847a7007cdbf14c9e5466
2016-04-22 14:18:32 -07:00
Bo Liu
d443f36957 Revert "Expose setDrawGLFunctionDetachedCallback to webview"
This reverts commit ee34ef1633.

This API is no longer needed by webview since 51.0.2704.22.
So remove this API. Note that this system API has never shipped
so it's ok to simply remove it.

Original description:
> Expose setDrawGLFunctionDetachedCallback to webview
>
> Add WebViewDelegate.setDrawGLFunctionDetachedCallback system API that's
> used for webview to receive the functor detach callback.
>
> BUG: 27709981
> Change-Id: Ie6b5e445c0090a181f94fcd2ec1ea77095c9cb03

BUG: 27709981
Change-Id: I9920dbedc6a280b4a19a8715832c4d2f64a7a7be
2016-04-22 13:32:23 -07:00
Sujith Ramakrishnan
b5b86c1100 Unbundle RemoteService on TV - part 3
- New service TVRemoteService triggered by SystemServer
- Provider service proxy and watcher for maintaining connections to unbundled
  services which have the BIND_TV_REMOTE_SERVICE permission.
- Shared library to facilitate connections between unbundled service and
  TVRemoteService.
- Unbundled service needs TV_VIRTUAL_REMOTE_CONTROLLER
  permission to be fully functional.

b/23792608

Change-Id: Ief5c6995883d1f7268a73bdd0c920c4c3f42cddb
2016-04-22 12:21:34 -07:00
Alex Hills
49fff88f8a Merge "Adds a BigPicAmbient flag to WearableExtender" into nyc-dev am: cb1f9da am: a6bc9fa
am: 1f2c9f2

* commit '1f2c9f2283287f5f877deb262b30569f072d4af9':
  Adds a BigPicAmbient flag to WearableExtender

Change-Id: Ie53c3fd0b7124cc4ddd92571041669f5a82732f1
2016-04-22 18:49:32 +00:00
Alexander Hills
9ef0ce1749 Merge "Changes Message from using parcels to bundles" into nyc-dev 2016-04-22 18:32:49 +00:00
Alexander Hills
cb1f9da55b Merge "Adds a BigPicAmbient flag to WearableExtender" into nyc-dev 2016-04-22 18:11:46 +00:00
Dongwon Kang
fb6c782e27 Merge "TIF: Address API review comments" into nyc-dev am: b0df08598c am: 9c19a27e20
am: f074a363d4

* commit 'f074a363d449a17e6b5fd19ae414722f8b3965fe':
  TIF: Address API review comments

Change-Id: I23be09441ff5f361af8869cbc6a8168871189baf
2016-04-22 18:09:57 +00:00