Commit Graph

58678 Commits

Author SHA1 Message Date
Adrian Roos
bca6ffddd8 Merge "Make sure all Notification actions are shown" into nyc-dev am: 9cb7652fb1
am: 798a860efb

* commit '798a860efb0c599448483d5a8e6a9429777c5bc5':
  Make sure all Notification actions are shown

Change-Id: I094ba82280047da811da0e65e1a2e6d38f88497f
2016-05-02 21:21:47 +00:00
Adrian Roos
9cb7652fb1 Merge "Make sure all Notification actions are shown" into nyc-dev 2016-05-02 21:04:33 +00:00
Wale Ogunwale
9e29cbdb0b Merge "Dont relaunch activity in fullscreen stack when entering split screen mode" into nyc-dev am: 53482cb6c0
am: 975c75bc92

* commit '975c75bc92ba89d4f9e3444b91d35b100ee8e2da':
  Don’t relaunch activity in fullscreen stack when entering split screen mode

Change-Id: I5fba7ff2ad40e373abd7f036801741a67a111e3e
2016-05-02 19:24:26 +00:00
TreeHugger Robot
53482cb6c0 Merge "Don’t relaunch activity in fullscreen stack when entering split screen mode" into nyc-dev 2016-05-02 19:13:45 +00:00
Tianjie Xu
87a51a7a7f Merge "Set security update label in framework" into nyc-dev
am: 8ebedfd0d9

* commit '8ebedfd0d9b22893d2e87e246347d67881f0f848':
  Set security update label in framework

Change-Id: Ieba07ba0ca7712af49f81ff534fb21bd77b77a69
2016-05-02 17:48:14 +00:00
Tianjie Xu
8ebedfd0d9 Merge "Set security update label in framework" into nyc-dev 2016-05-02 17:38:52 +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
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
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
a4d92a0152 Don’t relaunch activity in fullscreen stack when entering split screen mode
When entering split-screen mode by long pressing the recents button, the
top task in the fullscreen stack is moved to the docked stack and the new
top task is the fullscreen stack is considered visible for a short amount
of time until sys-ui launches the recents activity. This causes the new
top activity in the fullscreen stack to be relaunched due to configuration
change.
To fix this sys-ui now sends an hint to activity manager to move the home
stack forward so that it can be on-top of the fullscreen stack and makes
it invisible before recent is launched and animated in.

Bug: 28470261
Change-Id: Icfd85e932fe913dfb498752b5878cc7c690fd559
2016-05-01 16:02:16 -07: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
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
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
Tianjie Xu
ac75f1effa Set security update label in framework
GmsCore will use different filenames to distinguish a security update
from a normal update. (update.zip for normal update and update_s.zip for
security update.) So, if framework observes the filename as
"update_s.zip", write command "--security" to BCB. This cmd ask the
recovery image to choose the right background string for update.

Bug: 27837319
Change-Id: I2ef12267a6be57d8a81f7f9f34c09aea54530c1f
2016-04-29 16:19:30 -07: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
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
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
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
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
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
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
Andreas Gampe
289da55c68 Merge "Frameworks/base: Use holder in FileUtils" into nyc-dev
am: ecd73f48fe

* commit 'ecd73f48fe219cf238c4c2ec692c42855787bde0':
  Frameworks/base: Use holder in FileUtils

Change-Id: I5c46dc39de8c1a9fd3ddec59e1440b3a6e65d9e7
2016-04-29 07:15:58 +00:00
Andreas Gampe
0693fd85f6 Frameworks/base: Use holder in FileUtils
Use a holder for an uncommon Pattern instance in FileUtils.

Allows to compile-time initialize:
* android.os.FileUtils

Bug: 28174137
Change-Id: I4a7a388795a96678b4b26e4f2c02b1117d6a67f6
2016-04-28 19:33:05 -07:00
destradaa
6469c233fb Fixes on handling messages from apps to host.
- Ensure that app to host events are not filtered out
- Populates the app handle appropriately for clients to reference the
  nano app sending the event

Bug: 28273520
Bug: 28272149

Change-Id: I7373fc84abcadc2ab17109484f2d04b02a474593
2016-04-28 19:12:56 -07:00
Nadia Benbernou
948627eeaa Add api to WearableExtender for setting and getting the dismissal id.
Bug:27696581

Change-Id: Idf37234a9fd1d54e2fab0a4d5bfab70bbb1a3ba5
2016-04-28 17:57:25 -04:00
Jorim Jaggi
1ef9359662 Merge "Remove optimization to report config change" into nyc-dev
am: df551dda12

* commit 'df551dda1289598c209d75f6b99322e82866e2c0':
  Remove optimization to report config change

Change-Id: Ida68bae850d55f3feb59c596bdef3e5d48e67b77
2016-04-28 20:32:52 +00:00
Jorim Jaggi
df551dda12 Merge "Remove optimization to report config change" into nyc-dev 2016-04-28 20:28:38 +00:00
Adrian Roos
61254356d6 Make sure all Notification actions are shown
Ensures each action gets at least its minimum width to prevent
an overly long action from squeezing out the others.

Change-Id: Ifb6253051b556bbab4738abef12dad0bb6f3c3d6
Fixes: 27996783
2016-04-28 19:59:46 +00:00
Jeff Sharkey
065be97490 Merge "Introduce "unlocking" vs "unlocked" nuance." into nyc-dev
am: 8c2fb9edae

* commit '8c2fb9edae4413074186e3d84ccff0eba41b2cae':
  Introduce "unlocking" vs "unlocked" nuance.

Change-Id: Ibc26a4ee84531976e72cc30f2c2862be9a30d28b
2016-04-28 19:24:58 +00:00
TreeHugger Robot
8c2fb9edae Merge "Introduce "unlocking" vs "unlocked" nuance." into nyc-dev 2016-04-28 19:06:28 +00:00