Commit Graph

59821 Commits

Author SHA1 Message Date
Todd Kennedy
0b4f8443ab Merge "Restrict updates of system packages" into nyc-dev am: 4e4fca43b0 am: 728b0978e5
am: c5f564a0d6

* commit 'c5f564a0d6179189721ceb1cc05cdaefa35a225c':
  Restrict updates of system packages

Change-Id: I06d7729ddc9ee2fb485ab3a9af88e3a7d26b5718
2016-05-02 15:00:35 +00:00
Todd Kennedy
728b0978e5 Merge "Restrict updates of system packages" into nyc-dev
am: 4e4fca43b0

* commit '4e4fca43b0fb1320ce0265640d33b700cd886da8':
  Restrict updates of system packages

Change-Id: Ifbfdbcc9056fddbd41ea6d690441cb3805f7c3ff
2016-05-02 14:51:59 +00:00
Todd Kennedy
4e4fca43b0 Merge "Restrict updates of system packages" into nyc-dev 2016-05-02 14:44:20 +00:00
Nadia Benbernou
4ee52f8b93 Merge "Add api to WearableExtender for setting and getting the dismissal id. Bug:27696581" into nyc-dev am: f4810f5506 am: 18210edc88
am: c09542b84e

* commit 'c09542b84ed974b5f74bdc67937cefe3cf527e19':
  Add api to WearableExtender for setting and getting the dismissal id. Bug:27696581

Change-Id: Id1d0131b1e2ef55863d917d7b647694e57a17419
2016-05-02 14:35:35 +00:00
Nadia Benbernou
18210edc88 Merge "Add api to WearableExtender for setting and getting the dismissal id. Bug:27696581" into nyc-dev
am: f4810f5506

* commit 'f4810f5506203ac03439d1ed6e33e021540568f8':
  Add api to WearableExtender for setting and getting the dismissal id. Bug:27696581

Change-Id: I3a16e15adaf26be3528224c265be9a0e82957a38
2016-05-02 14:26:46 +00:00
Nadia Benbernou
f4810f5506 Merge "Add api to WearableExtender for setting and getting the dismissal id. Bug:27696581" into nyc-dev 2016-05-02 14:15:46 +00:00
Pierre Imai
58b12ce344 Merge changes I86257bc8,I5c2221c5 into nyc-dev am: 4a992cbde8 am: 617c9a3625
am: c8a0ebcb18

* commit 'c8a0ebcb18c12ba3d7cfede25ce51cae47489f93':
  Use Netd's binder interface to set resolver configuration.
  Add Gservices settings for resolver configuration.

Change-Id: I83cb2668c50e910a7ce3a4dede7414b4c2bfa8d9
2016-05-02 13:08:34 +00:00
Pierre Imai
617c9a3625 Merge changes I86257bc8,I5c2221c5 into nyc-dev
am: 4a992cbde8

* commit '4a992cbde834fdf3770e34b21361b47f4786f65f':
  Use Netd's binder interface to set resolver configuration.
  Add Gservices settings for resolver configuration.

Change-Id: I80fdc381bd3ff33a8efa6624d7115c346789ca17
2016-05-02 13:00:13 +00:00
Lorenzo Colitti
4a992cbde8 Merge changes I86257bc8,I5c2221c5 into nyc-dev
* changes:
  Use Netd's binder interface to set resolver configuration.
  Add Gservices settings for resolver configuration.
2016-05-02 12:49:19 +00:00
Pierre Imai
8e48e67827 Add Gservices settings for resolver configuration.
BUG: 25731675

Change-Id: I5c2221c5a2478fe2fa0fdf9ceeb13a932d758d33
2016-05-02 08:26:09 +00:00
Wale Ogunwale
e777ee2249 Merge "Set ActivityInfo.resizeMode to RESIZE_MODE_RESIZEABLE by default" into nyc-dev am: e7fefcb565 am: 1a9d6ff291
am: 027612d71f

* commit '027612d71f9e50b900cba8b53320a8fe87e6f7f1':
  Set ActivityInfo.resizeMode to RESIZE_MODE_RESIZEABLE by default

Change-Id: I7039b26a64e8a63515de5b42907135e53b2ea97b
2016-04-30 03:39:30 +00:00
Wale Ogunwale
1a9d6ff291 Merge "Set ActivityInfo.resizeMode to RESIZE_MODE_RESIZEABLE by default" into nyc-dev
am: e7fefcb565

* commit 'e7fefcb5650afddff544c008bc06ce748f635727':
  Set ActivityInfo.resizeMode to RESIZE_MODE_RESIZEABLE by default

Change-Id: I7187746826a5ae3f82f95ac203d6ae063b56275e
2016-04-30 03:34:59 +00:00
TreeHugger Robot
e7fefcb565 Merge "Set ActivityInfo.resizeMode to RESIZE_MODE_RESIZEABLE by default" into nyc-dev 2016-04-30 03:29:27 +00:00
Adam Lesinski
28468efe50 Merge "BatteryStats: Keep track of coulomb counter" into nyc-dev am: 3cb7f6bdcd am: 132d565eac
am: 3bd94c3e8a

* commit '3bd94c3e8a34ad328125783973e5d523eb36f000':
  BatteryStats: Keep track of coulomb counter

Change-Id: I3c0bc2e5ddd001a57978fe58f7d4bd511e8a8499
2016-04-30 02:31:26 +00:00
Adam Lesinski
3bd94c3e8a Merge "BatteryStats: Keep track of coulomb counter" into nyc-dev am: 3cb7f6bdcd
am: 132d565eac

* commit '132d565eacfbf287e4803051b28a0156b996f83f':
  BatteryStats: Keep track of coulomb counter

Change-Id: I0b2e127b0b551080ce33794fab09ba4b8a94688e
2016-04-30 02:29:20 +00:00
Adam Lesinski
8fec99caae Merge "BatteryStats: Keep track of coulomb counter" into nyc-dev
am: 3cb7f6bdcd

* commit '3cb7f6bdcda2697eff10853360396d8635d66120':
  BatteryStats: Keep track of coulomb counter

Change-Id: Ica6666696324ab731324692538b1bb3dfc300d92
2016-04-30 02:27:08 +00:00
TreeHugger Robot
3cb7f6bdcd Merge "BatteryStats: Keep track of coulomb counter" into nyc-dev 2016-04-30 02:21:38 +00:00
Adam Lesinski
926969b411 BatteryStats: Keep track of coulomb counter
Bug:27174034
Change-Id: Ica66817faa20b9788536f28f0e593483f033904b
2016-04-29 17:40:11 -07:00
Romain Guy
dbaa8a97a4 Merge "Evaluate ARGB values in linear space instead of sRGB" 2016-04-29 23:47:18 +00:00
Wale Ogunwale
8f6c925ae7 Set ActivityInfo.resizeMode to RESIZE_MODE_RESIZEABLE by default
Previous assumption was ActivityInfo was completely initialized in
PackageParser, but that isn't the case with the ResolverActivity
whose ActivityInfo in populated in PackageManagerService.
This was causing the device to exist multi-window mode since
the default ActivityInfo.resizeMode was 0 (RESIZE_MODE_UNRESIZEABLE).

Bug: 28378995
Change-Id: I46e58d434f2a0274c461a8ff00b59ed3d2a1dd52
2016-04-29 16:46:47 -07:00
Jeff Sharkey
64e0c99814 Merge "Flag to mark foreground jobs, fix data saver." into nyc-dev am: 9a977b7d45 am: 478806946f
am: 98d57313f2

* commit '98d57313f247a80928b6358dda05a16c3b4000dc':
  Flag to mark foreground jobs, fix data saver.

Change-Id: Id863d0ff4f8e7f13049231298feaab9839b4667c
2016-04-29 23:04:05 +00:00
Jeff Sharkey
478806946f Merge "Flag to mark foreground jobs, fix data saver." into nyc-dev
am: 9a977b7d45

* commit '9a977b7d45df0d3d59c5eec7f9534c3bd5fcd91d':
  Flag to mark foreground jobs, fix data saver.

Change-Id: I908d725a84e9590d0da38a586b066a63473d4f28
2016-04-29 22:59:31 +00:00
Jeff Sharkey
9a977b7d45 Merge "Flag to mark foreground jobs, fix data saver." into nyc-dev 2016-04-29 22:53:22 +00:00
Romain Guy
ed45ab9004 Evaluate ARGB values in linear space instead of sRGB
A comparison between the old behavior and the behavior proposed in
this change can be found in the following document:

https://docs.google.com/a/google.com/document/d/1x8g5VcEZbuZd-RhSITc1VPpZ_dc0FlF1WbDscBYPQzM

Change-Id: I29d3fdfdd45cb64f32ad6a6f3f25fa3dafe1a6d0
2016-04-29 15:52:57 -07:00
Todd Kennedy
fdd241a1e0 Restrict updates of system packages
By declaring a <restrict-update> tag in its manifest, a system package
can restrict its update to be the singular package that has the same
given hash. An update's hash is the SHA-512 across all its APKs [i.e.
for splits, the SHA-512 is calculated over the concatenation of the
base plus all splits].

The restriction only applies to system packages.

Bug: 28398205
Change-Id: Iec493fc8ef27edee53f1d437cb0caaa78782f329
2016-04-29 14:23:43 -07:00
Robert Carr
9b564dbd42 Merge "Merge "Fix ViewRoot inset adjustment after initial setup." into nyc-dev am: 3446a6ef71 am: f022f71888" into nyc-mr1-dev-plus-aosp
am: 1107b1d737

* commit '1107b1d737802be229a31b0e63a51bc8b9651372':
  Fix ViewRoot inset adjustment after initial setup.

Change-Id: I1bec398f2b7fafb45fd23297b21c0c3da1de88a6
2016-04-29 20:44:33 +00:00
Robert Carr
1d488eb651 Merge "Fix ViewRoot inset adjustment after initial setup." into nyc-dev am: 3446a6ef71
am: f022f71888

* commit 'f022f718882c3f8ccd8ab02b240ba9b9f7ffadb0':
  Fix ViewRoot inset adjustment after initial setup.

Change-Id: I6d9968c38758112e5ad0679ffde178081c456500
2016-04-29 20:41:44 +00:00
Robert Carr
8175a59c2b Merge "Fix ViewRoot inset adjustment after initial setup." into nyc-dev
am: 3446a6ef71

* commit '3446a6ef71872f07de1ea59ff4aa060dad92eb22':
  Fix ViewRoot inset adjustment after initial setup.

Change-Id: Ia3a33d0d2031f4929cfb898ad0847cd620792bba
2016-04-29 20:39:56 +00:00
TreeHugger Robot
3446a6ef71 Merge "Fix ViewRoot inset adjustment after initial setup." into nyc-dev 2016-04-29 20:37:33 +00:00
Jeff Sharkey
1b6519bd87 Flag to mark foreground jobs, fix data saver.
When a job will eventually run in the foreground, the internal
scheduling needs to ignore any background network restrictions when
satisfying constraints.  This also means the job should ignore the
current device doze state, since the requesting app could get the
same behavior by starting their own foreground service.

Always dispatch network policy changes to ConnectivityService first
to ensure that it has up-to-date information.  Fix bugs around data
saver that were causing networks to not be marked as BLOCKED for
background apps; before this fix apps would have been spinning in
internal connectivity loops, thinking that the network was actually
connected when the kernel was actually blocking their traffic.

Offer new ConnectivityService method overloads to ignore the blocked
state for a specific UID.

Print unsatisfied job constraints to aid debugging.

Bug: 26571724
Change-Id: Iaaa17933e6dc1bf6d3dff26d0bfc12222e51e241
2016-04-29 13:44:07 -06:00
destradaa
81782d4d59 Merge "Fixes on handling messages from apps to host." into nyc-dev am: 60f2c17e27 am: 10a05037d3
am: c5e5cd5be7

* commit 'c5e5cd5be7f90474f753f8ea5069a72ba684eb8b':
  Fixes on handling messages from apps to host.

Change-Id: I56964bc90ddd047d46e4cb277ede780410eff984
2016-04-29 19:32:41 +00:00
destradaa
10a05037d3 Merge "Fixes on handling messages from apps to host." into nyc-dev
am: 60f2c17e27

* commit '60f2c17e273ea919dc663f387ef246b3d359c412':
  Fixes on handling messages from apps to host.

Change-Id: I17e7c9e550ee7d378b87fca96ad112443b0f95fc
2016-04-29 19:28:15 +00:00
Daniel Estrada Alva
60f2c17e27 Merge "Fixes on handling messages from apps to host." into nyc-dev 2016-04-29 19:24:18 +00:00
Chris Wren
18b4427c9b Merge "close a potential race condition in registerAsSystemService" into nyc-dev am: 3b016f5445 am: ca925148e2
am: 7f25112629

* commit '7f25112629abe549d1e9d6bda9ef98e6ee4ff1b9':
  close a potential race condition in registerAsSystemService

Change-Id: Ic9d102dcf92377e332430418bf68cbfd08d0d124
2016-04-29 18:34:37 +00:00
Chris Wren
ca925148e2 Merge "close a potential race condition in registerAsSystemService" into nyc-dev
am: 3b016f5445

* commit '3b016f544502dca8c162554c6ea42bd6727f4cde':
  close a potential race condition in registerAsSystemService

Change-Id: I925edd07ead39be9ec34c013ad00d34f0d600c06
2016-04-29 18:29:50 +00:00
TreeHugger Robot
3b016f5445 Merge "close a potential race condition in registerAsSystemService" into nyc-dev 2016-04-29 18:25:06 +00:00
Robert Carr
1bccabf3c4 Fix ViewRoot inset adjustment after initial setup.
If the insets change, "mWidth/mHeight" won't change
as it's based on the window frame (not the surface size),
we need to track when the insets change and call
HardwareRenderer.setup with the new values.

Bug: 28257246
Bug: 28368990
Change-Id: Ida304b57c4671d010d1cf7b370674c9453841c97
2016-04-29 11:13:57 -07:00
Alan Viverette
9ad9ff2d4c Merge "Maintain internal consistency for TimePickerClockDelegate hour" into nyc-dev am: 7544ac22e4 am: acddbbcb21
am: 65f6b02623

* commit '65f6b026239eff382a5a2385f1b9fa9251269bf3':
  Maintain internal consistency for TimePickerClockDelegate hour

Change-Id: I10366582f980d2892ea5ffcfd23331653be8e023
2016-04-29 15:29:42 +00:00
Lorenzo Colitti
2ac6a535dc Merge "The legacy DHCP client is gone. Delete the settings." into nyc-dev am: a4daf16b57 am: 52e5f2e5ec
am: 5e64fb4e74

* commit '5e64fb4e7435edee75f8ae4f4021b2aa7941336b':
  The legacy DHCP client is gone. Delete the settings.

Change-Id: I479f1c696fc1d7a325090e3bde265e85bc63eabd
2016-04-29 15:29:38 +00:00
Alan Viverette
acddbbcb21 Merge "Maintain internal consistency for TimePickerClockDelegate hour" into nyc-dev
am: 7544ac22e4

* commit '7544ac22e474547a3cbeaff0dcaf163bbbd4fca7':
  Maintain internal consistency for TimePickerClockDelegate hour

Change-Id: I1b46f64e197303507c5b3cb3c402438e51e993c3
2016-04-29 15:24:45 +00:00
Lorenzo Colitti
52e5f2e5ec Merge "The legacy DHCP client is gone. Delete the settings." into nyc-dev
am: a4daf16b57

* commit 'a4daf16b578c456104f59f05ac374101426d1376':
  The legacy DHCP client is gone. Delete the settings.

Change-Id: Ib9f1352386ebe667ec5d3d110f64e080c04c103d
2016-04-29 15:24:42 +00:00
Alan Viverette
7544ac22e4 Merge "Maintain internal consistency for TimePickerClockDelegate hour" into nyc-dev 2016-04-29 15:22:07 +00:00
TreeHugger Robot
a4daf16b57 Merge "The legacy DHCP client is gone. Delete the settings." into nyc-dev 2016-04-29 15:17:41 +00:00
Tim Volodine
34c85b1f66 Merge "[WebView] Add documentation regarding geolocation api on secure origins." into nyc-dev am: c750474fd1 am: 7e2e50cef4
am: 7b569ebb38

* commit '7b569ebb38a7b42cb3b75298b2a0707bc8341d14':
  [WebView] Add documentation regarding geolocation api on secure origins.

Change-Id: Iaaae04397aa37f315ae9847745a5d417be984fc7
2016-04-29 14:45:10 +00:00
Tim Volodine
7b569ebb38 Merge "[WebView] Add documentation regarding geolocation api on secure origins." into nyc-dev am: c750474fd1
am: 7e2e50cef4

* commit '7e2e50cef41797752c3a4df4115e9c4cb55ded1c':
  [WebView] Add documentation regarding geolocation api on secure origins.

Change-Id: Iee4e1c660a32cccbc7df55986e952ae7d28cfd3e
2016-04-29 14:42:43 +00:00
Tim Volodine
01a3ddd116 Merge "[WebView] Add documentation regarding geolocation api on secure origins." into nyc-dev
am: c750474fd1

* commit 'c750474fd17e4cc9ccb536d76d83c16d5a521a3c':
  [WebView] Add documentation regarding geolocation api on secure origins.

Change-Id: I941ff4185ff90dc640f47c2ba9e32ce8a41dbb28
2016-04-29 14:40:16 +00:00
TreeHugger Robot
c750474fd1 Merge "[WebView] Add documentation regarding geolocation api on secure origins." into nyc-dev 2016-04-29 14:34:20 +00:00
Chris Wren
b66a16d975 close a potential race condition in registerAsSystemService
Bug: 27555424
Change-Id: I1537fd1aae3dba83de22d1b245bddd0a3922d289
2016-04-29 10:07:48 -04:00
Lorenzo Colitti
fb628c078c The legacy DHCP client is gone. Delete the settings.
Bug: 27192644
Change-Id: I5bc23f3e269e17d50fa2531a57fb0e2049ae18bf
2016-04-29 22:19:23 +09:00
Tim Volodine
b0e9798e52 [WebView] Add documentation regarding geolocation api on secure origins.
Update to javadoc comments saying that for apps targeting N and up
the geolocation api is only supported on secure origins.
On non-secure origins requests to geolocation api are automatically
denied without calling the corresponding
WebChromeClient#onGeolocationPermissionsShowPrompt method.

BUG: 28080869
Change-Id: I57726f7f3b3d38db0535f742b1f74c40c1f1ce8b
2016-04-29 12:59:27 +00:00