Commit Graph

8210 Commits

Author SHA1 Message Date
Tony Mak
59afde8c57 Show work challenge in if user in docked stack is locked am: 853304c am: 4dc4d3e
am: 771f2f4

* commit '771f2f457eb10b0bf0641bf3c12d6d5e6d38eb55':
  Show work challenge in if user in docked stack is locked

Change-Id: Ic8992dacbc4c550250abe7ace79854d900d25def
2016-04-18 15:50:54 +00:00
Tony Mak
4dc4d3ed0f Show work challenge in if user in docked stack is locked
am: 853304c

* commit '853304c0b11921db142a3945ab66fae5f0cc7d8a':
  Show work challenge in if user in docked stack is locked

Change-Id: I1a5ff10237639fa2f0c20c756594d1d04c16d07d
2016-04-18 15:40:43 +00:00
Tony Mak
853304c0b1 Show work challenge in if user in docked stack is locked
Register docked stack listener in ActivityManagerService.
If the docked stack is leaving minimized state, check whether the user
of the docked stack is locked. If yes, show credential confirmation.
Also, we now show work challenge in home task.

And we now scan the entire top task to handle the case the work app is
somewhere in the middle of the task. (eg: open personal camera in work app)

Bug: 27565539
Bug: 28094505

Change-Id: Iaf0738f43ae916a535b17949ec0f322bbfb194dc
2016-04-18 15:35:36 +00:00
Calin Juravle
d44baa11a0 Merge "Register the UI Thread as a sensitive thread to the runtime" into nyc-dev am: 6aff67b am: f139143c
am: b8d5524

* commit 'b8d5524d8d7211b266e5405da7864c7f9eefae20':
  Register the UI Thread as a sensitive thread to the runtime

Change-Id: I22fca39e19f94f1fdc560e19ad27f78e5abdeca9
2016-04-18 11:00:55 +00:00
Calin Juravle
f139143ccc Merge "Register the UI Thread as a sensitive thread to the runtime" into nyc-dev
am: 6aff67b

* commit '6aff67bfcb9dcca6e3f26ff04dbe8f9806e5e8a5':
  Register the UI Thread as a sensitive thread to the runtime

Change-Id: Ib3e5d6ac34f14c6d6f0809d2f969422b49efea8f
2016-04-18 10:51:07 +00:00
Calin Juravle
6aff67bfcb Merge "Register the UI Thread as a sensitive thread to the runtime" into nyc-dev 2016-04-18 10:40:31 +00:00
Wale Ogunwale
3cce9525aa Merge "Don\'t allow pinned activities to request visible behind" into nyc-dev am: 02ebaa0 am: 188b013
am: bba910f

* commit 'bba910f8a245614949f43565a6ba2ee01dabe752':
  Don't allow pinned activities to request visible behind

Change-Id: Ie3389a2354325045cc465513d7466d359e93d464
2016-04-18 04:38:46 +00:00
Wale Ogunwale
188b0139aa Merge "Don\'t allow pinned activities to request visible behind" into nyc-dev
am: 02ebaa0

* commit '02ebaa02c41050b7223b9ec772da669810bff43b':
  Don't allow pinned activities to request visible behind

Change-Id: I78704c8b677f91b268d83da971b3f50bd479b6ba
2016-04-18 04:29:22 +00:00
TreeHugger Robot
02ebaa02c4 Merge "Don't allow pinned activities to request visible behind" into nyc-dev 2016-04-18 04:19:36 +00:00
Wale Ogunwale
43896cffe6 Don't allow pinned activities to request visible behind
Also, release visible behind when pinning a visible behind activity.

Bug: 28042883
Change-Id: I1162d7639626f669f648ff82f5c367cb7b3fe6e6
2016-04-16 10:54:30 -07:00
Adam Powell
f4cfbeda87 Merge "Retain loaders through stopped config changes" into nyc-dev am: e33901c
am: c108628

* commit 'c108628d33610975dd13564bf7750dff5eebaeaf':
  Retain loaders through stopped config changes

Change-Id: Ib63609d91efae1549c61b4f5fb8f2a1b24fe7ece
2016-04-15 21:52:14 +00:00
Adam Powell
c108628d33 Merge "Retain loaders through stopped config changes" into nyc-dev
am: e33901c

* commit 'e33901c2328d4583d5e6913f83e939960dda4263':
  Retain loaders through stopped config changes

Change-Id: Iefbafb4774933dde3acaee36f50f364fe0b3af76
2016-04-15 21:49:01 +00:00
Adam Powell
e33901c232 Merge "Retain loaders through stopped config changes" into nyc-dev 2016-04-15 21:40:53 +00:00
Adam Powell
cbade7f4d3 Retain loaders through stopped config changes
Framework edition

Previously we would throw away any stopped LoaderManagers when we went
to retain instances to pass along as nonConfigurationInstances during
config changes or similar activity restarts. This causes loaders to do
more work than they need to when a calling activity starts a new
activity on top, a config change happens (e.g. screen rotation) and
then the top activity is finished, restarting the caller in a new
configuration. The loaders would go through onReset unnecessarily,
potentially throwing away data to be reloaded again after the config
change completes.

Instead of throwing away stopped LoaderManagers in this case, restart
them and retain them across the config change so they can resume where
they left off.

Bug 27176186

Change-Id: Ia52c6448d2ad41dcb25d493770d9ffae20a19d2a
2016-04-15 11:14:37 -07:00
Calin Juravle
8f5770dcdb Register the UI Thread as a sensitive thread to the runtime
Bug: 27865109
Bug: 28065407
Change-Id: I46194d444530770f505ac5e653536be2da7dd08b
2016-04-15 18:38:21 +01:00
Benjamin Franz
44c60415c2 Merge "Revert "Revert "Throw security exception for non-parent aware APIs""" into nyc-dev am: a900359
am: 2f6a945

* commit '2f6a94511bc009b06c5de0ee5d6bfccffcc1a031':
  Revert "Revert "Throw security exception for non-parent aware APIs""

Change-Id: Ie5900faa37cff7c9d3db03f84ccbc5a81fe83d54
2016-04-15 15:45:33 +00:00
Benjamin Franz
2f6a94511b Merge "Revert "Revert "Throw security exception for non-parent aware APIs""" into nyc-dev
am: a900359

* commit 'a90035950019434012f32b8dbc5d278894484df3':
  Revert "Revert "Throw security exception for non-parent aware APIs""

Change-Id: I52db7e2e2fdb923c9fcd231a32bec0b2f11689c9
2016-04-15 15:41:57 +00:00
Benjamin Franz
bc33c8290f Revert "Revert "Throw security exception for non-parent aware APIs""
This reverts commit a26c626564.

Bug: 27532279
Change-Id: I0c0394a8abf12e7382e7083a0b9d7f8385c3a63d
2016-04-15 16:08:35 +01:00
Andrii Kulian
36c8a58cf0 Merge "Remember task which is being locked" into nyc-dev am: 5981b8c
am: 021af18

* commit '021af1800c352933d25f927dc357534c62a9e39c':
  Remember task which is being locked

Change-Id: I06c64b220fe20775510b938c5235acf026c83c7d
2016-04-15 04:40:24 +00:00
Andrii Kulian
021af1800c Merge "Remember task which is being locked" into nyc-dev
am: 5981b8c

* commit '5981b8c2e8f6363d1f3bf09e7f1b3b5fb9a3846a':
  Remember task which is being locked

Change-Id: Id672304edaa6a02777e79fe6b4fcdd64e3c5f7e8
2016-04-15 04:37:48 +00:00
Andrii Kulian
5981b8c2e8 Merge "Remember task which is being locked" into nyc-dev 2016-04-15 04:32:57 +00:00
Andrii Kulian
0f051f5abd Remember task which is being locked
We need to remember task which requested to be locked
because we can accidentally lock another task after
user interacts with pinning request dialog.

Bug: 27876860
Change-Id: Ie8e607df4380dd33ea9b3474afc247b02e31de07
2016-04-14 19:26:18 -07:00
Tim Murray
a93e7e6dc4 Merge "Revert "Optimize ResTable::getLocales() to improve bindApplication performance"" into nyc-dev am: 117cff7
am: 62047f9

* commit '62047f93d4948b5b5be1939c0700d12b960379a3':
  Revert "Optimize ResTable::getLocales() to improve bindApplication performance"

Change-Id: I01e6021b1f756351358f83ee94ef70527adcaf5f
2016-04-15 00:01:56 +00:00
Tim Murray
62047f93d4 Merge "Revert "Optimize ResTable::getLocales() to improve bindApplication performance"" into nyc-dev
am: 117cff7

* commit '117cff790e34948e847d724be624ed2dd00bc82c':
  Revert "Optimize ResTable::getLocales() to improve bindApplication performance"

Change-Id: I86b5cc6eddf38cdd015fe80f1180ca246a97352a
2016-04-14 23:58:22 +00:00
Tim Murray
117cff790e Merge "Revert "Optimize ResTable::getLocales() to improve bindApplication performance"" into nyc-dev 2016-04-14 23:48:17 +00:00
Tim Murray
98e80076c6 Revert "Optimize ResTable::getLocales() to improve bindApplication performance"
This reverts commit 5520581b5f.

bug 28189634

Change-Id: I2d2b859f6d9bd44434fa901cce990583f514980c
2016-04-14 16:06:29 -07:00
Amith Yamasani
757d9846b5 Merge "Multi-window assist callback" into nyc-dev am: 0d723a2
am: bb541ff

* commit 'bb541ffe5e9eda03d51cdb720259e0aeced11e37':
  Multi-window assist callback

Change-Id: I63f2c5294664ee9de34b73f2815c9214d9d3f270
2016-04-14 20:12:06 +00:00
TreeHugger Robot
cec5ba16e6 Merge "API Review: Improve javadoc of EXTRA_REMOTE_INPUT" into nyc-dev am: 82676d9
am: 554ffad

* commit '554ffadfb9bc01673928e86f336ec504836ba263':
  API Review: Improve javadoc of EXTRA_REMOTE_INPUT

Change-Id: Ic71944496906b6c9739297459a1ec127f9b47101
2016-04-14 19:31:22 +00:00
Daniel Sandler
aefdfa5721 Merge "Allow system apps to substitute a different app name in notifications." into nyc-dev am: 3af45bd
am: 73a694b

* commit '73a694b486b8b37d7e61e5ad53b3c9b139b783e9':
  Allow system apps to substitute a different app name in notifications.

Change-Id: Id47615712e65e8a11edd68dcd729824c9c37c85a
2016-04-14 19:29:49 +00:00
Clara Bayarri
7b02468b34 Merge "Provide startIntentSenderForResult for fragments" into nyc-dev am: 6e58549
am: bdcd8dc

* commit 'bdcd8dce23ad83a696fc350374abde50ee91c6d0':
  Provide startIntentSenderForResult for fragments

Change-Id: I5746132388eabcf5e29a948cb36d30745ae73887
2016-04-14 19:26:09 +00:00
Amith Yamasani
bb541ffe5e Merge "Multi-window assist callback" into nyc-dev
am: 0d723a2

* commit '0d723a2a4d83db5f01aa5a21f3cbd9d2b608bced':
  Multi-window assist callback

Change-Id: I4a0564800bb4c7a19a415ff109836827c4feb0e7
2016-04-14 19:12:57 +00:00
Amith Yamasani
0d723a2a4d Merge "Multi-window assist callback" into nyc-dev 2016-04-14 19:06:40 +00:00
Joe Onorato
075bb7e3f4 Merge commit '034b58c2f53a9101395b2cd8cd4e01be9f93c2b2' into manual_merge_034b58c
More work on issue #26390151: Add new JobScheduler API...

...for monitoring content providers

We now have some delays before reporting URI changes, to allow
them to batch together.

Also clean up debug output, and fix some issues with how we
were managing the content observer state.

And while I am here, fix the device idle and app idle controllers
to no longer maintain their own list of jobs, but just directly
iterate over the JobStore.

Change-Id: I709bd7c77e1b5ffb012e36149a739ecb245dd5cd
2016-04-14 10:27:31 -07:00
Adrian Roos
554ffadfb9 Merge "API Review: Improve javadoc of EXTRA_REMOTE_INPUT" into nyc-dev
am: 82676d9

* commit '82676d9f8810f4ab3e943e89df135cc87857f537':
  API Review: Improve javadoc of EXTRA_REMOTE_INPUT

Change-Id: Ic9c091ae358bd55b2d8d4f7ffbb688028cb2cc30
2016-04-14 14:49:45 +00:00
TreeHugger Robot
82676d9f88 Merge "API Review: Improve javadoc of EXTRA_REMOTE_INPUT" into nyc-dev 2016-04-14 14:45:00 +00:00
Dan Sandler
73a694b486 Merge "Allow system apps to substitute a different app name in notifications." into nyc-dev
am: 3af45bd

* commit '3af45bd2d06303bfaf8ba28324ca976e6f96ece3':
  Allow system apps to substitute a different app name in notifications.

Change-Id: I5fc24757a4db46a499f5638c04922e131c79d1f9
2016-04-14 13:59:20 +00:00
Dan Sandler
732bd6cb27 Allow system apps to substitute a different app name in notifications.
This is a privileged permission and is only to be used by
the core OS and related packages whose names are confusing
or misleading when shown in notifications.

The user will always be able to see the true package name by
accessing the notification inspector (longpress or swipe
gesture on the notification row in SystemUI).

Fixes: 26517701
Change-Id: I2b021c9da0757b99df76399666af263668d88070
2016-04-14 13:48:03 +00:00
Clara Bayarri
bdcd8dce23 Merge "Provide startIntentSenderForResult for fragments" into nyc-dev
am: 6e58549

* commit '6e5854974098e4e2f734510e7dd8221a324f34ad':
  Provide startIntentSenderForResult for fragments

Change-Id: I363540141afa80476fe0db79103c0df08794a5ae
2016-04-14 10:11:15 +00:00
Clara Bayarri
6e58549740 Merge "Provide startIntentSenderForResult for fragments" into nyc-dev 2016-04-14 10:05:35 +00:00
Amith Yamasani
e8222e551f Multi-window assist callback
Introducing a new callback in VoiceInteractionSession to
provide assist data for additional activities in the
foreground in a multiwindow setup.

PIP, docked windows and free-form windows (top-most)
will be queried for assist data and passed through the
new API to the Voice Interaction service.

Bug: 27718385

Change-Id: Ib4427c304611b75c2078dcb54f1f7e47ae7d9cfa
2016-04-13 17:12:29 -07:00
Dianne Hackborn
034b58c2f5 Merge "More work on issue #26390151: Add new JobScheduler API..." into nyc-dev
am: 9e31b3f

* commit '9e31b3fd817aed28d9afd712fa49ec9d6fc11329':
  More work on issue #26390151: Add new JobScheduler API...

Change-Id: I7c227898d175c15219192fc42c5e4eb5121e9517
2016-04-13 23:37:31 +00:00
Dianne Hackborn
9e31b3fd81 Merge "More work on issue #26390151: Add new JobScheduler API..." into nyc-dev 2016-04-13 23:30:14 +00:00
Adam Lesinski
f2489ad456 Merge "Optimize ResTable::getLocales() to improve bindApplication performance" into nyc-dev am: b5abb78
am: eaf83ef

* commit 'eaf83ef61b33383ae47d1e2e96e99d7d312d2d3b':
  Optimize ResTable::getLocales() to improve bindApplication performance

Change-Id: If52c56fbc0ffff43e5eb836aacd11f3f8764e4c7
2016-04-13 22:37:08 +00:00
Adam Lesinski
eaf83ef61b Merge "Optimize ResTable::getLocales() to improve bindApplication performance" into nyc-dev
am: b5abb78

* commit 'b5abb78b7c329069d5d5e7fd9c6a6e5e81f79c90':
  Optimize ResTable::getLocales() to improve bindApplication performance

Change-Id: I9b2e5d8488f15a400287f8cfacc3531bdb007068
2016-04-13 22:25:45 +00:00
Adrian Roos
005e774ac8 API Review: Improve javadoc of EXTRA_REMOTE_INPUT
Change-Id: I3b23a44ca54be7724ddb29c432bb6975a784b5b4
Fixes: 27365667
2016-04-13 15:05:30 -07:00
Adam Lesinski
b5abb78b7c Merge "Optimize ResTable::getLocales() to improve bindApplication performance" into nyc-dev 2016-04-13 21:53:47 +00:00
Adam Lesinski
5520581b5f Optimize ResTable::getLocales() to improve bindApplication performance
Change from linear searching for uniqueness to binary search.

Bug:27198799
Change-Id: Ifa4672929df286c4693ab1f77716f08945941b0c
2016-04-13 13:25:09 -07:00
Sudheer Shanka
38e0c19717 Merge "Update {set,get}{Long,Short}SupportMessage APIs to use CharSequence." into nyc-dev am: fd580f7
am: 0306304

* commit '03063041002228b247d68a53198c76824a8d30f3':
  Update {set,get}{Long,Short}SupportMessage APIs to use CharSequence.

Change-Id: I1ea3d55c212811c118c8912fe8a8efa302938e60
2016-04-13 20:24:59 +00:00
Sudheer Shanka
0306304100 Merge "Update {set,get}{Long,Short}SupportMessage APIs to use CharSequence." into nyc-dev
am: fd580f7

* commit 'fd580f7d1a5a19b062bea49602f0f6136bce7e5e':
  Update {set,get}{Long,Short}SupportMessage APIs to use CharSequence.

Change-Id: Ia7286ea72f55ec5e717785ecd30c05f6ae92d673
2016-04-13 20:21:34 +00:00
Sudheer Shanka
fd580f7d1a Merge "Update {set,get}{Long,Short}SupportMessage APIs to use CharSequence." into nyc-dev 2016-04-13 20:12:05 +00:00