Commit Graph

8488 Commits

Author SHA1 Message Date
Wale Ogunwale
d622b932fa Merge "Merge "Merge "Make sure to pause activity before stopping" into nyc-dev am: 5f81a3f84c" into nyc-mr1-dev am: 75179ada54" into nyc-mr1-dev-plus-aosp
am: c2bef7c6e2

* commit 'c2bef7c6e2eade011a73db1abd4acf2ab8b3aca7':
  Make sure to pause activity before stopping

Change-Id: I4ae725d3d331cf834da1456d6aebcc702e4ad8d6
2016-05-04 22:09:41 +00:00
Robin Lee
4632c0c9a8 Merge "Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev am: 7ec93a1ee2 am: 78d0888e8c" into nyc-mr1-dev-plus-aosp
am: 062a28b6a4

* commit '062a28b6a403a48d6f5f88e109a899c9c60581c1':
  Add lockdownEnabled parameter to always-on VPN API

Change-Id: I9ebd6221451ee10649a1f340031d62c6483832f1
2016-05-04 22:04:40 +00:00
Wale Ogunwale
8fa700675d Merge "Merge "Make sure to pause activity before stopping" into nyc-dev am: 5f81a3f84c" into nyc-mr1-dev
am: 75179ada54

* commit '75179ada546393cb8929ca9703d39e1151d95ed9':
  Make sure to pause activity before stopping

Change-Id: I5020b92b2edbe0ff749d019fbeb81abf2ae49fe9
2016-05-04 21:42:18 +00:00
Robin Lee
d319d26279 Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev am: 7ec93a1ee2
am: 78d0888e8c

* commit '78d0888e8c9358681a6f564b30b2cc35bbe72a45':
  Add lockdownEnabled parameter to always-on VPN API

Change-Id: I7ec39775980ec839aa814cf284ea352789aa788f
2016-05-04 21:41:23 +00:00
TreeHugger Robot
5f81a3f84c Merge "Make sure to pause activity before stopping" into nyc-dev 2016-05-04 20:28:51 +00:00
Wale Ogunwale
5dc6d6551e Make sure to pause activity before stopping
In some cases it is possible for activity manager to request
a resumed activity to stop when it's visibility changes. This
is a valid transition, however we need to make sure to pause
the activity on the client side before stopping it so lifecycle
transition works as expected.

Bug: 28574036
Change-Id: I759b38bbd1c9c3bb0475759bcb638d8223fa504d
2016-05-04 11:46:29 -07:00
Robin Lee
7ec93a1ee2 Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev 2016-05-04 18:38:30 +00:00
Amith Yamasani
f5b388c1ae Merge "Clear active requests on switching voice interactor" into nyc-dev am: ec07352007 am: ae4ecce1ef
am: 5e603c6fa0

* commit '5e603c6fa0b250f5eb0212fc78840eaa1d80007d':
  Clear active requests on switching voice interactor

Change-Id: Ied72a73f7c8a54ed20af91fa7e36da7ffe7c2ba2
2016-05-04 00:44:14 +00:00
Amith Yamasani
ae4ecce1ef Merge "Clear active requests on switching voice interactor" into nyc-dev
am: ec07352007

* commit 'ec07352007812eeb70c5f47bbac54e9816a30b55':
  Clear active requests on switching voice interactor

Change-Id: Ib9f32bf86c8a3b8da8e796d722ce1843ad775dc4
2016-05-04 00:30:06 +00:00
TreeHugger Robot
ec07352007 Merge "Clear active requests on switching voice interactor" into nyc-dev 2016-05-04 00:13:30 +00:00
Amith Yamasani
eeed06c108 Clear active requests on switching voice interactor
When voice interactor goes null or changes, cancel all existing
active requests and clear them so that they can be re-submitted.

Bug: 28487567
Change-Id: Ibcf024efcc81ff18ef3babfa9a169292207bc816
2016-05-03 15:07:03 -07:00
Dimitry Ivanov
d9fd045ed1 Merge "Allow apps to load libraries from under /data" into nyc-dev am: a31657911c am: fde7511918
am: d66b0b16fa

* commit 'd66b0b16fa89da38a697953308517cf0560ba04b':
  Allow apps to load libraries from under /data

Change-Id: I577ab4f344c5f20e427eb644bfe0c7de224c54e3
2016-05-03 20:10:11 +00:00
Dimitry Ivanov
fde7511918 Merge "Allow apps to load libraries from under /data" into nyc-dev
am: a31657911c

* commit 'a31657911c96fb735bf4a34610638c9f95e5c99d':
  Allow apps to load libraries from under /data

Change-Id: I2bfbd50d911857825f9b8060a3ebdb335ff7cfad
2016-05-03 20:05:27 +00:00
Dimitry Ivanov
a31657911c Merge "Allow apps to load libraries from under /data" into nyc-dev 2016-05-03 20:00:39 +00:00
Dimitry Ivanov
bf3b5f7a18 Allow apps to load libraries from under /data
Allow all application classloaders to load native
libraries from anywhere under /data

Bug: http://b/26954419
Change-Id: I8a808bcdf4a00f7d40b513d4e2ca3d1e76c0909f
2016-05-03 11:34:58 -07:00
Robin Lee
dc67971a99 Add lockdownEnabled parameter to always-on VPN API
Allows callers to opt-out of blockading network traffic during boot and
on VPN app failure.

Bug: 26694104
Change-Id: Ibfbd43ad09a25f2e38053fcd6306df3711f8bde2
2016-05-03 13:24:42 +01:00
Ben Lin
bc27b3f88b Merge "Add ability to rename a downloaded file." into nyc-dev am: d88030fe9e am: acb3f6022c
am: 98f20f10d1

* commit '98f20f10d1577be7b7f9c94666728c453154b4ea':
  Add ability to rename a downloaded file.

Change-Id: I2a5497349b18178517855b28cfd6b909c2bad7f6
2016-05-02 23:15:44 +00:00
Ben Lin
98f20f10d1 Merge "Add ability to rename a downloaded file." into nyc-dev am: d88030fe9e
am: acb3f6022c

* commit 'acb3f6022c2b0d356a740cc27c855557d6409bc7':
  Add ability to rename a downloaded file.

Change-Id: I0310df2fb65d7b824ef89546c6071773da57e884
2016-05-02 23:09:32 +00:00
Ben Lin
e2b9d90405 Merge "Add ability to rename a downloaded file." into nyc-dev
am: d88030fe9e

* commit 'd88030fe9e070a433120ba2bcf442e271c3ce2df':
  Add ability to rename a downloaded file.

Change-Id: Id74561ab7dd8efd4dac3a65513dca2fac2e04112
2016-05-02 23:00:43 +00:00
Ben Lin
d88030fe9e Merge "Add ability to rename a downloaded file." into nyc-dev 2016-05-02 22:54:23 +00:00
Jaewan Kim
45768d4c3f Merge "Fix crash when device doesn\'t support picture-in-picture" into nyc-dev am: bfa0f48407 am: 550533dc29
am: ce85489d4c

* commit 'ce85489d4cf8d879cd91b539bc00806f3de6bbfb':
  Fix crash when device doesn't support picture-in-picture

Change-Id: I3ea6bd8c649db86f535026888efdf61a91b012d5
2016-05-02 22:51:27 +00:00
Jaewan Kim
ce85489d4c Merge "Fix crash when device doesn\'t support picture-in-picture" into nyc-dev am: bfa0f48407
am: 550533dc29

* commit '550533dc298afbcfbb5f7ba5b3421145ab34522b':
  Fix crash when device doesn't support picture-in-picture

Change-Id: I8f16400db11282e28e4e8935896a90eeed49e2f2
2016-05-02 22:41:18 +00:00
Jaewan Kim
1e28182362 Merge "Fix crash when device doesn\'t support picture-in-picture" into nyc-dev
am: bfa0f48407

* commit 'bfa0f48407e70099c2558983b19163c1d92d063b':
  Fix crash when device doesn't support picture-in-picture

Change-Id: Icbbe69970e5f43387323b5ed810ebc11b1cf77b1
2016-05-02 22:36:31 +00:00
Jaewan Kim
bfa0f48407 Merge "Fix crash when device doesn't support picture-in-picture" into nyc-dev 2016-05-02 22:27:54 +00:00
Jaewan Kim
d98dcab679 Fix crash when device doesn't support picture-in-picture
Bug: 28512987
Change-Id: Ic8287d70fed491d7493d443ba7d9633b7d9aaea9
2016-05-03 07:13:28 +09:00
Adrian Roos
883416e54f Merge "Make sure all Notification actions are shown" into nyc-dev am: 9cb7652fb1 am: 798a860efb
am: bca6ffddd8

* commit 'bca6ffddd8e9db7f89565a13cc3322e8dbbfdc2a':
  Make sure all Notification actions are shown

Change-Id: I221b6755607d55b8e8f2d14ae75017adc08c97cc
2016-05-02 21:32:27 +00:00
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
d12ceb4d1c Merge "Make sure all Notification actions are shown" into nyc-dev
am: 9cb7652fb1

* commit '9cb7652fb19256fe61d81c7770fe729fc6b67481':
  Make sure all Notification actions are shown

Change-Id: I2fd99fc5be798e97b6e8ebc20fe1d2097d2d7c8c
2016-05-02 21:16:07 +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
8a734880d8 Merge "Dont relaunch activity in fullscreen stack when entering split screen mode" into nyc-dev am: 53482cb6c0 am: 975c75bc92
am: 9e29cbdb0b

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

Change-Id: Iaf24c64e9e5cec9f02dd10f803c1b6c9c556b4a0
2016-05-02 19:30:32 +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
Wale Ogunwale
8f1aa6c892 Merge "Dont relaunch activity in fullscreen stack when entering split screen mode" into nyc-dev
am: 53482cb6c0

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

Change-Id: I139c1bab1f1719ca98c8272147d84fb0ed71808e
2016-05-02 19:19:55 +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
Ben Lin
726bf6a3ce Add ability to rename a downloaded file.
Bug: 28359663
Change-Id: I2674720777c7aafd81e8395e873967fd5d7a2f26
2016-05-02 10:10:47 -07: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
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
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
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
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
3c45bc6fde Merge "Remove optimization to report config change" into nyc-dev am: df551dda12 am: 1ef9359662
am: 54423e2947

* commit '54423e2947a8e0219aeb7cabb4c03111b56745b5':
  Remove optimization to report config change

Change-Id: I51cc7d3ce50bac4c46d12eefc74cfba798a14acc
2016-04-28 20:38:32 +00: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
23d8cb4a25 Merge "Introduce "unlocking" vs "unlocked" nuance." into nyc-dev am: 8c2fb9edae am: 35c6f6c70a
am: c68126587a

* commit 'c68126587aab22d27cf6ad19a05cb58b5d1bad50':
  Introduce "unlocking" vs "unlocked" nuance.

Change-Id: I9a24147c091c7f370923e43148b78a855fcb43be
2016-04-28 19:33:53 +00:00
Jeff Sharkey
c68126587a Merge "Introduce "unlocking" vs "unlocked" nuance." into nyc-dev am: 8c2fb9edae
am: 35c6f6c70a

* commit '35c6f6c70a22987d0166500909f21d4d339dd1ae':
  Introduce "unlocking" vs "unlocked" nuance.

Change-Id: Ic288860b8edc814830fce958bbe2b0e93acecd78
2016-04-28 19:25:31 +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