Commit Graph

58461 Commits

Author SHA1 Message Date
Hugo Benichi
74db646778 Merge changes I8de95add,Ia6f4ccfd into nyc-dev
am: 24b6e2b

* commit '24b6e2bcc88ed6e142eae8ebd11cb90a70da588f':
  Remove unused event tags of IpConnectivityEvent
  Better ConnectivityMetricsEvent printing

Change-Id: I57ce8977a481d3c9a441ea4dab407ec367e3adca
2016-04-27 01:57:13 +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
Todd Kennedy
9a50b6abf1 Merge "Don\'t override pre-release target sdk" into nyc-dev
am: 97ef0e7

* commit '97ef0e77afa3be6255b70c8567843ac298386251':
  Don't override pre-release target sdk

Change-Id: Ib70b0e908dc148799875afcedeeb1d59f2d90367
2016-04-27 00:58:47 +00:00
Robert Carr
3c0de7768f Merge "Fix bugs with takeSurface and preserveWindows." into nyc-dev
am: 69a6fe3

* commit '69a6fe321c7b3934ee8849d2038a85443011050c':
  Fix bugs with takeSurface and preserveWindows.

Change-Id: I6f7b52b3d880eede508c12f8d2ffa1c29f17bbd5
2016-04-27 00:54:54 +00:00
TreeHugger Robot
97ef0e77af Merge "Don't override pre-release target sdk" into nyc-dev 2016-04-27 00:53:19 +00:00
Rob Carr
69a6fe321c Merge "Fix bugs with takeSurface and preserveWindows." into nyc-dev 2016-04-27 00:47:59 +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
Todd Kennedy
b107271813 Don't override pre-release target sdk
If a package targets a pre-release SDK [eg a letter version] it should not
be allowed to be upgraded by a release SDK [eg a number version]. If one
absolutely must upgrade to a release SDK, use the "--force-sdk" option
during install.

Bug: 28345311
Change-Id: Ic9fb209968e7c5da2c80c5ca4c0f44f5125f610a
2016-04-26 16:25:43 -07:00
Oren Blasberg
27e0f35620 Merge "Accommodate NaN in new context menu methods." into nyc-dev
am: a86d1e0

* commit 'a86d1e0b5938cee1d76aefcc1e8967c353ea922d':
  Accommodate NaN in new context menu methods.

Change-Id: I40a1d6b55b7f9cb422d35c1f0881efccd36cc290
2016-04-26 22:53:40 +00:00
Ruben Brunk
5b89eb592b Merge "Add manifest attribute for VR activities." into nyc-dev
am: f84b3e0

* commit 'f84b3e0e2fe11c8ee1d86ad44236ba4129fc3ae1':
  Add manifest attribute for VR activities.

Change-Id: I10ca4096eed987bdd79f4f2c59ea22fcf61a1ef5
2016-04-26 22:53:26 +00:00
Oren Blasberg
a86d1e0b59 Merge "Accommodate NaN in new context menu methods." into nyc-dev 2016-04-26 22:41:01 +00:00
Ruben Brunk
f84b3e0e2f Merge "Add manifest attribute for VR activities." into nyc-dev 2016-04-26 22:05:30 +00:00
sergeyv
47591b04dc Merge "DisplayListCanvas: throw exception at attempt to draw bitmap with size > 100MB" into nyc-dev
am: c015719

* commit 'c015719954d9a1c0a53f277f68405401207a0c65':
  DisplayListCanvas: throw exception at attempt to draw bitmap with size > 100MB

Change-Id: I3f5e7bd67b57d074939e1db6ef0651ade46d31bf
2016-04-26 21:44:54 +00:00
Sergei Vasilinetc
c015719954 Merge "DisplayListCanvas: throw exception at attempt to draw bitmap with size > 100MB" into nyc-dev 2016-04-26 21:39:43 +00:00
Robert Carr
b259485087 Fix bugs with takeSurface and preserveWindows.
When reusing a ViewRoot and DecorView as we do with preserveWindows
there are two issues with SurfaceHolders.  First, we update the
SurfaceHolder callbacks when we call ViewRootImpl.setView. In the
case of preserved window relaunch, the DecorView is reused and there is
no call to setView. We need the ActivityThread to notify the ViewRoot
that something has changed. Secondly, we were assuming the only time
a new surface would be created for the purposes of SurfaceHolder
notification was when we previously did not have a valid surface.
Instead we need to check if the native Surface object has changed each time we
get a result from relayout.

Bug: 28331264
Change-Id: If1b4aab9b2ba579fa040e2a3ab4471842476d82f
2016-04-26 14:33:21 -07:00
Svet Ganov
d4bc15b66b Merge "Ensure local settings caches are not stale" into nyc-dev
am: f71d7fe

* commit 'f71d7feef22db9e0cab2f32edc7440aedb86fdfe':
  Ensure local settings caches are not stale

Change-Id: I356b9ad0b6dc1e91bfad140de1b9fc79ab6efef3
2016-04-26 18:47:52 +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
Alan Viverette
bed34a705d Merge "Apply tint when setting check mark drawable" into nyc-dev
am: fff349d

* commit 'fff349ddbaf6d31f7373f854e85f2171adf2ef97':
  Apply tint when setting check mark drawable

Change-Id: I8b7c195ee10fddfa022f95a021fe0c0f60f1e0ec
2016-04-26 17:23:59 +00:00
TreeHugger Robot
fff349ddba Merge "Apply tint when setting check mark drawable" into nyc-dev 2016-04-26 17:17:05 +00:00
Julia Reynolds
d72d5823b8 Merge changes from topic \'api_review\' into nyc-dev
am: a0676c9

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

Change-Id: I53898c0378b124a6b44872493e481d10dfd6518f
2016-04-26 15:38:00 +00:00
Andreas Gampe
9b923b9f63 Merge "Frameworks/base: Make debug helper lazy in ConnectivityManager" into nyc-dev
am: 396c590

* commit '396c590c423682af398f52a62e3d6f6fb2166d4e':
  Frameworks/base: Make debug helper lazy in ConnectivityManager

Change-Id: I38789a6165023d77c0a730591cd7fa1c45588dc5
2016-04-26 15:31:11 +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
TreeHugger Robot
396c590c42 Merge "Frameworks/base: Make debug helper lazy in ConnectivityManager" into nyc-dev 2016-04-26 15:25:44 +00:00
David Brazdil
9ada71dccf Merge "Change app selection policy for post-OTA verification" into nyc-dev
am: 3eaf72d

* commit '3eaf72dc67ef0911bee0cc0d1db088cb70b044ca':
  Change app selection policy for post-OTA verification

Change-Id: I00ece6027cd8ae3cb513e361853136d7d314adf8
2016-04-26 12:27:30 +00:00
David Brazdil
3eaf72dc67 Merge "Change app selection policy for post-OTA verification" into nyc-dev 2016-04-26 12:22:16 +00:00
Narayan Kamath
3ec2508c99 LoadedApk: Don\'t set up JIT profile support inside the system_server.
am: 2d4a222

* commit '2d4a222de157c693b16ca2b35a264dd92ae6abee':
  LoadedApk: Don't set up JIT profile support inside the system_server.

Change-Id: I52d0cb275f3d01a094aefed65e43a2882d00679c
2016-04-26 12:18:52 +00:00
Narayan Kamath
2d4a222de1 LoadedApk: Don't set up JIT profile support inside the system_server.
We shouldn't profile *any* packages loaded by the system_server, not
just the system_servers own ("android") package.

bug: 28241500
Change-Id: I5f3f477b40c758030a5bdc8e97d17cab6e68e204
2016-04-26 12:08:23 +00:00
David Brazdil
90e269917e Change app selection policy for post-OTA verification
Changes the policy for selecting packages which will be pre-verified
during post-OTA boot animation.

For Nx to Ny, an app is pre-verified if used in the foreground in the
last 7 days, or if its APK was loaded by other apps.

For M to N (or early N builds without detailed stats), an app is
pre-verified if it has any recorded use in the last 7 days.

Bug: 27902702
Bug: 27350503
Change-Id: I2b38daf017ecd0e5aa5ed596ed9351cffa03dbcb
2016-04-26 12:51:53 +01:00
Hui Shu
b5829cdf11 Merge "WebView downgrade prevention logic" into nyc-dev
am: e12d62b

* commit 'e12d62bd79d27f1719ac6db01b1dd53289fe03d4':
  WebView downgrade prevention logic

Change-Id: I9d67d612696078b647eef9ac575da0e47e08eab4
2016-04-26 09:35:36 +00:00
TreeHugger Robot
e12d62bd79 Merge "WebView downgrade prevention logic" into nyc-dev 2016-04-26 09:31:57 +00:00
Jaewan Kim
0f360d80ad Merge "PIP: Send KEYCODE_WINDOW to app first if PIP isn\'t exist" into nyc-dev
am: bdc4700

* commit 'bdc4700155f5ff89e213cb0e9efe49897b888f7d':
  PIP: Send KEYCODE_WINDOW to app first if PIP isn't exist

Change-Id: Ic77538cac9562acf878c7c56f443a691e9d0b45f
2016-04-26 06:08:59 +00:00
Jaewan Kim
bdc4700155 Merge "PIP: Send KEYCODE_WINDOW to app first if PIP isn't exist" into nyc-dev 2016-04-26 06:03:01 +00:00
Jaewan Kim
f0fd218382 PIP: Send KEYCODE_WINDOW to app first if PIP isn't exist
Bug: 27954955
Change-Id: I517e378d5c1672ac0eb87bdf4375b7d733276e58
2016-04-26 13:06:21 +09:00
Lorenzo Colitti
87115932c5 Merge "When dumping connectivity metrics events, print data as well." into nyc-dev
am: e4860f0

* commit 'e4860f02564e887918192f733a29f04552f83414':
  When dumping connectivity metrics events, print data as well.

Change-Id: I63c0b56f9f54e0df794b3061e310c702f638b857
2016-04-26 03:28:34 +00:00
Lorenzo Colitti
e4860f0256 Merge "When dumping connectivity metrics events, print data as well." into nyc-dev 2016-04-26 03:22:26 +00:00
Jeff Sharkey
3bf4cd1fb5 Merge "Track down Contexts without data directories." into nyc-dev
am: 3a10c1e

* commit '3a10c1e86db9843462660d825a9673a3c72ccdd6':
  Track down Contexts without data directories.

Change-Id: Id6934369489b8a60e8d6ceb3de8f7774c5128ed6
2016-04-25 22:57:37 +00:00
Alex Light
7ad3001399 Merge "Make fake libart for misbehaving apps be loaded." into nyc-dev
am: 57413a7

* commit '57413a74777060d9368f89966e9abcf96e33af8e':
  Make fake libart for misbehaving apps be loaded.

Change-Id: Iba15cda4cda9968dbe303919427ad192bb940f46
2016-04-25 22:04:53 +00:00
Jeff Sharkey
3a10c1e86d Merge "Track down Contexts without data directories." into nyc-dev 2016-04-25 21:59:41 +00:00
Jeff Sharkey
5df7298c59 resolve merge conflicts of c79a568 to nyc-dev-plus-aosp
Change-Id: I3ee02bc596f285fa41ffcafa882ae5997ef67d22
2016-04-25 15:53:50 -06:00
TreeHugger Robot
57413a7477 Merge "Make fake libart for misbehaving apps be loaded." into nyc-dev 2016-04-25 21:53:31 +00: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
Kweku Adams
3cabb2a6b3 Merge "Removing extraneous field from batterystats dumpsys." into nyc-dev 2016-04-25 20:09:41 +00:00
Dan Sandler
5bab149bce Merge changes from topic \'substitute-notification-app-name\' into nyc-dev
am: 955009f

* commit '955009f9d384d1b19ebb441814ca0a3fac0fbc47':
  Move EXTRA_SUBSTITUTE_APP_NAME to the published system api.
  Show "Android System" instead of "System UI" in screenshot notifications.

Change-Id: I709f92bda6edd41abd8b22bbee2d4c887cb8dc1c
2016-04-25 19:34:48 +00:00
Daniel Sandler
955009f9d3 Merge changes from topic 'substitute-notification-app-name' into nyc-dev
* changes:
  Move EXTRA_SUBSTITUTE_APP_NAME to the published system api.
  Show "Android System" instead of "System UI" in screenshot notifications.
2016-04-25 19:22:40 +00:00
Jeff Sharkey
24492ae448 Track down Contexts without data directories.
Data directories for all packages should be created and managed by
installd; if we create a Context and the data directory doesn't exist
yet, we're in trouble, since a later mkdirs() would end up creating
the directory with incorrect permissions, mode, and SELinux labels.

Bug: 28272737
Change-Id: Ie3bb884ab07748719378de5c792046a031a3f945
2016-04-25 13:20:29 -06:00
Julia Reynolds
0aa7d615c2 Api review: Settings.
Hide notification policy setting.

Bug: 28295513
Change-Id: Ic117285c3eb07cb4bf399e233adad835772b9673
2016-04-25 14:57:33 -04:00
Bo Liu
0374048e2d Merge "WebView doc: explain persist js across navigations" into nyc-dev
am: b698fc9

* commit 'b698fc9d84cff493ce34dd9860f14f34ce48e8f0':
  WebView doc: explain persist js across navigations

Change-Id: I87b81e624c7fc44ad316dc287d8a7332312860af
2016-04-25 18:46:51 +00:00