Commit Graph

8846 Commits

Author SHA1 Message Date
Chong Zhang
25007ec4df Merge \"Merge \\\"Use getActivityToken() instead of mToken in isTopOfTask\\\" into nyc-dev am: 723e5afa9e am: 1895addcef\" into nyc-mr1-dev-plus-aosp
am: c6a520e090

Change-Id: If5550e5db119b201228c391e049d54f3760cca31
2016-06-08 01:31:18 +00:00
Chong Zhang
456fc8cd3c Merge \\"Use getActivityToken() instead of mToken in isTopOfTask\\" into nyc-dev am: 723e5afa9e
am: 1895addcef

Change-Id: Ifb8ca430fbb754a73e6b891c5a97e0cf201cf7f4
2016-06-08 01:27:16 +00:00
Felipe Leme
52c6239369 Merge \\\"Duplicate file descriptor when dumping asynchronously.\\\" into nyc-dev am: c02ba17898 am: 9d178342d8
am: 3b37c224b5

Change-Id: Icea29e406cc99266f6b1c26a6cd850de56c25ae0
2016-06-08 01:26:14 +00:00
Felipe Leme
3b37c224b5 Merge \\"Duplicate file descriptor when dumping asynchronously.\\" into nyc-dev am: c02ba17898
am: 9d178342d8

Change-Id: I9afdc281e2fe68c74ef7a676dd4f437013fe909a
2016-06-08 01:21:57 +00:00
Chong Zhang
1895addcef Merge \"Use getActivityToken() instead of mToken in isTopOfTask\" into nyc-dev
am: 723e5afa9e

Change-Id: I12f294f42e135fc181f585c515cd9ad4589ac1f2
2016-06-08 01:19:03 +00:00
Felipe Leme
9d178342d8 Merge \"Duplicate file descriptor when dumping asynchronously.\" into nyc-dev
am: c02ba17898

Change-Id: I8a483e5295a5dccf4f11f76316bf47d962fb8f12
2016-06-08 01:13:55 +00:00
Chong Zhang
723e5afa9e Merge "Use getActivityToken() instead of mToken in isTopOfTask" into nyc-dev 2016-06-08 01:12:27 +00:00
Felipe Leme
29de4922db Duplicate file descriptor when dumping asynchronously.
dumpDbInfo() uses an async task when dumping from the system thread, but
then the file descriptor is closed by the time the task is executed. As
such, the system databases are not dumped.

BUG: 29123428
Change-Id: Ibb8bbe503aa03c3ca13b2b1789f0ead0b869e9d5
2016-06-07 16:35:50 -07:00
Eino-Ville Talvala
d9a7b1e07b Merge "Revert "Internal API for cross-task Activity used by assistant."" into nyc-mr1-dev am: fe3ecdab1b
am: abb7488998

* commit 'abb74889982603f6070100033c8fa2b1eef3d8de':
  Revert "Internal API for cross-task Activity used by assistant."

Change-Id: Id397afe9221e2562e096befc1b105233618ca7ef
2016-06-06 23:55:58 +00:00
Eino-Ville Talvala
abb7488998 Merge "Revert "Internal API for cross-task Activity used by assistant."" into nyc-mr1-dev
am: fe3ecdab1b

* commit 'fe3ecdab1b461d811825ce363d7041f3c8c120c3':
  Revert "Internal API for cross-task Activity used by assistant."

Change-Id: If16a43f4a17e71cc12ed7c912ed5e6a46c85e56c
2016-06-06 23:50:36 +00:00
TreeHugger Robot
fe3ecdab1b Merge "Revert "Internal API for cross-task Activity used by assistant."" into nyc-mr1-dev 2016-06-06 23:44:34 +00:00
Eino-Ville Talvala
563df3b328 Revert "Internal API for cross-task Activity used by assistant."
This reverts commit 04073dc5be.

Bug: 29128683
Change-Id: I7d9bb7bb388f38e8e5ab159a211ee7f9f4fb7ab9
2016-06-06 22:04:54 +00:00
Jorim Jaggi
f5e5c3a72a Merge "Add new attributes for wallpaper info" into nyc-mr1-dev am: c27660d45a
am: acfed07f72

* commit 'acfed07f725466e866445cfdf4fda94fa0e8f0a0':
  Add new attributes for wallpaper info

Change-Id: Ie439547cb6964c1f90b2ac313408a502027ccd25
2016-06-04 00:41:07 +00:00
Jorim Jaggi
acfed07f72 Merge "Add new attributes for wallpaper info" into nyc-mr1-dev
am: c27660d45a

* commit 'c27660d45a920af49c9e53b1cabaa32fd4b3046c':
  Add new attributes for wallpaper info

Change-Id: I3dc04d70f50809ff20ec0fb23e0c3265450ff621
2016-06-04 00:27:04 +00:00
TreeHugger Robot
c27660d45a Merge "Add new attributes for wallpaper info" into nyc-mr1-dev 2016-06-04 00:22:06 +00:00
George Mount
a9e1ad04fb Merge "Merge "Internal API for cross-task Activity used by assistant." into nyc-mr1-dev am: 3af59ef42c" into nyc-mr1-dev-plus-aosp
am: 74babe679b

* commit '74babe679b0f8e17ed73280b18bc19153764c55e':
  Internal API for cross-task Activity used by assistant.

Change-Id: I985c67a465e88f74e66600709c187c3dfc9734e9
2016-06-04 00:10:35 +00:00
George Mount
579a1e973f Merge "Internal API for cross-task Activity used by assistant." into nyc-mr1-dev
am: 3af59ef42c

* commit '3af59ef42c83fbe4bf9e54f807597bddc6aa7ecd':
  Internal API for cross-task Activity used by assistant.

Change-Id: Idb8c49437ff7d151e186edd2112e4def8d7a7e15
2016-06-03 23:27:31 +00:00
Jorim Jaggi
526505da25 Add new attributes for wallpaper info
Adjust test wallpaper to use these attributes.

Also fix some issues where wallpaper got laid out differently in the preview
mode.

Bug: 28770685
Change-Id: I259f3884f5f2c0b723a6a5ce012d45170f64c4c7
2016-06-03 15:50:31 -07:00
George Mount
3af59ef42c Merge "Internal API for cross-task Activity used by assistant." into nyc-mr1-dev 2016-06-03 22:22:53 +00:00
George Mount
04073dc5be Internal API for cross-task Activity used by assistant.
29091742

A new internal API has been created for use by assistant
to launch an Activity Transition from a non-Activity.

The ActivityOptions are also passed along when using
a spring board Activity so that the shared elements
can be properly synchronized.

This also fixes TransitionManager.endTransition so
that it forces Transitions to end the animations.

Change-Id: Id18d9765bfc0c7b438e17966455aa66d3fa3aeda
2016-06-03 14:08:06 -07:00
Chong Zhang
6f9ae4ffc5 Use getActivityToken() instead of mToken in isTopOfTask
mToken could be local tokan and causes IllegalArgumentException.

bug: 29072444
Change-Id: I0f889a70a848ffea31663ed80337e1605c75223e
2016-06-03 11:50:44 -07:00
Makoto Onuki
cffb6041d2 Merge "ShortcutManager: Implement usage report API" into nyc-mr1-dev am: 37087ad710
am: 51c7ce7531

* commit '51c7ce7531f5c1fc1ae442b1c6f206735599cea2':
  ShortcutManager: Implement usage report API

Change-Id: Ia713dbbb510d2f848b8866a4d0dc692f67803522
2016-06-03 15:44:53 +00:00
Makoto Onuki
51c7ce7531 Merge "ShortcutManager: Implement usage report API" into nyc-mr1-dev
am: 37087ad710

* commit '37087ad710087755786c115508b14e053c47f882':
  ShortcutManager: Implement usage report API

Change-Id: I4ac336f441fa2111d1d645b02a79dc717490c1c0
2016-06-03 15:37:10 +00:00
Makoto Onuki
37087ad710 Merge "ShortcutManager: Implement usage report API" into nyc-mr1-dev 2016-06-03 15:21:45 +00:00
Tony Mak
7cf85ffc58 OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN am: 33d03a9e43 am: fff6650de4
am: aefec202de

* commit 'aefec202de2a94ce2a624d72bd2036f7141b1af7':
  OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN

Change-Id: I88bba620c3a3212ebf74ee0f884febc3ec923c1f
2016-06-03 11:07:38 +00:00
Tony Mak
aefec202de OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN am: 33d03a9e43
am: fff6650de4

* commit 'fff6650de4ac847db61ffdf3fbc82a39e3878313':
  OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN

Change-Id: Id88584fff3f69e554793ea1e99dd491796a470ff
2016-06-03 10:54:46 +00:00
Tony Mak
fff6650de4 OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN
am: 33d03a9e43

* commit '33d03a9e435eb474e3bdd3e958943e0057866477':
  OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN

Change-Id: Ib8e3b7fae441adf95b928d7139455d3ca13c1fb6
2016-06-03 10:43:37 +00:00
Tony Mak
d73c6eb6f3 OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN
am: 33d03a9e43

* commit '33d03a9e435eb474e3bdd3e958943e0057866477':
  OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN

Change-Id: I2de02ec6febdc58ff9a79562059cc11e7d617be5
2016-06-03 10:43:30 +00:00
Tony Mak
33d03a9e43 OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN
They are two different things.
OP_ACTIVATE_VPN means can we allow a vpn app to establish without user
interaction while DISALLOW_CONFIG_VPN means can the user modify vpn
config.

Testing:
1. Turn on DISALLOW_CONFIG_VPN, user cannot modify vpn config through
   setting
2. Turn on DISALLOW_CONFIG_VPN, Dpm.setAlwaysOnVpn works.
3. Reboot after 2, vpn established automatically.

Bug: 29086229
Change-Id: I24899d6c7f0dd62bf441a44c6ee66fee35973a11
2016-06-03 10:06:06 +00:00
Makoto Onuki
ac042501c8 ShortcutManager: Implement usage report API
Bug 28536054

Change-Id: I293e8eaad523e3b0d76d562fc381601633451ed3
2016-06-02 15:57:40 -07:00
Calin Juravle
e73843941d Merge "Merge "Don\'t create or check permissions on profiles during app startup" into nyc-dev am: e67a29a037 am: dd2fc463f1" into nyc-mr1-dev-plus-aosp
am: 1d28af445b

* commit '1d28af445b716520b972827a61ed4ccf19aeb087':
  Don't create or check permissions on profiles during app startup

Change-Id: Icf5cb939565f2aae88f51c9cb55ff13a02351d65
2016-06-02 11:21:02 +00:00
Calin Juravle
afb21eee20 Merge "Don\'t create or check permissions on profiles during app startup" into nyc-dev am: e67a29a037
am: dd2fc463f1

* commit 'dd2fc463f1f0a92f613930f372c58af10e58e64c':
  Don't create or check permissions on profiles during app startup

Change-Id: I00890adeda97295c0d5630efd7e497d7f0ece8b8
2016-06-02 10:36:40 +00:00
Calin Juravle
dd2fc463f1 Merge "Don\'t create or check permissions on profiles during app startup" into nyc-dev
am: e67a29a037

* commit 'e67a29a037d11d242d6afba6aff5a0feb60e289b':
  Don't create or check permissions on profiles during app startup

Change-Id: I1b8f9e4dc894d50041d06e195753116593326af0
2016-06-02 10:18:13 +00:00
Calin Juravle
ae9f5b6559 Merge "Don\'t create or check permissions on profiles during app startup" into nyc-dev
am: e67a29a037

* commit 'e67a29a037d11d242d6afba6aff5a0feb60e289b':
  Don't create or check permissions on profiles during app startup

Change-Id: I43d0c4af8e20fabd3f752ce8ad97f4ad1f28dd1b
2016-06-02 10:18:06 +00:00
Calin Juravle
e67a29a037 Merge "Don't create or check permissions on profiles during app startup" into nyc-dev 2016-06-02 10:10:36 +00:00
Jeff Sharkey
0e1a527c64 Merge "Merge "Release AssetManagers when ejecting storage." into nyc-dev am: 380f3b12a4 am: 20340d0fc8" into nyc-mr1-dev-plus-aosp
am: d73289e7ac

* commit 'd73289e7ac0efe8032dbfc0a83fbb09baede7bbe':
  Release AssetManagers when ejecting storage.

Change-Id: I7e57dd56dba320694109ae66df12c700a450a6b2
2016-06-02 00:30:18 +00:00
Dianne Hackborn
c69822cf0c Merge "Merge "Fix issue #29058724: Improve JobScheduler API demo" into nyc-dev am: 61721ee3d7 am: 56b70d51f4" into nyc-mr1-dev-plus-aosp
am: 1267b551f1

* commit '1267b551f14252beea0fb73d4e12b34277c26110':
  Fix issue #29058724: Improve JobScheduler API demo

Change-Id: I91adebd3656d0c2ad370ea92b947473a54ecced0
2016-06-02 00:20:08 +00:00
Jeff Sharkey
c9c4fe2af9 Merge "Release AssetManagers when ejecting storage." into nyc-dev am: 380f3b12a4
am: 20340d0fc8

* commit '20340d0fc82bccf883898e9523f3c8aca8c9ac04':
  Release AssetManagers when ejecting storage.

Change-Id: I8053660edc7088f26c94fb2a3174a743a8d60636
2016-06-01 23:15:49 +00:00
Dianne Hackborn
727da2b880 Merge "Fix issue #29058724: Improve JobScheduler API demo" into nyc-dev am: 61721ee3d7
am: 56b70d51f4

* commit '56b70d51f45ecf101222d90a993f6f6da044ae65':
  Fix issue #29058724: Improve JobScheduler API demo

Change-Id: Ib1eeb21537446f7c7b7b99f30acf8713f07dd57f
2016-06-01 23:12:13 +00:00
Jeff Sharkey
20340d0fc8 Merge "Release AssetManagers when ejecting storage." into nyc-dev
am: 380f3b12a4

* commit '380f3b12a4725a0534d62ada7c6f3bd67ebd0d01':
  Release AssetManagers when ejecting storage.

Change-Id: I92c0fcbe38dd242cb8a0a3792381de81a7c0384c
2016-06-01 23:04:09 +00:00
Jeff Sharkey
f02954ccd5 Merge "Release AssetManagers when ejecting storage." into nyc-dev
am: 380f3b12a4

* commit '380f3b12a4725a0534d62ada7c6f3bd67ebd0d01':
  Release AssetManagers when ejecting storage.

Change-Id: I54282cfcf53279f87e66cc1263ae9663fe94bc04
2016-06-01 23:03:38 +00:00
Dianne Hackborn
56b70d51f4 Merge "Fix issue #29058724: Improve JobScheduler API demo" into nyc-dev
am: 61721ee3d7

* commit '61721ee3d7b7d55a0535584449b49143b1c2e039':
  Fix issue #29058724: Improve JobScheduler API demo

Change-Id: I3f05621c5e18ca35104ac66f95a96a19c789612d
2016-06-01 22:48:59 +00:00
TreeHugger Robot
380f3b12a4 Merge "Release AssetManagers when ejecting storage." into nyc-dev 2016-06-01 22:14:57 +00:00
Adrian Roos
8bfaf5fbff Merge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev am: ff39d3ec2f am: 72bc1299f2
am: 86a0e3befe

* commit '86a0e3befe175ebfed8a701ab9be192f909345c3':
  MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT

Change-Id: I53c30dbef2ebcd9f85a753dffd93ddafbd000508
2016-06-01 21:12:10 +00:00
Jeff Sharkey
98bf12f999 Release AssetManagers when ejecting storage.
When ejecting a storage device, the system process needs to rapidly
release any open FDs to prevent itself from being killed by vold.

This change examines all ResourceImpls cached inside the system
process and evicts any that reference the storage device being
ejected.  (ResourcesManager will gladly recreate any evicted entries
when asked again in the future.)

Also replace broken use of WeakHashMap, since we want the values to
be weak references, not the keys.

Bug: 28867548
Change-Id: Ib9cfc66497149b6d3f8d49213e9779408a331d2a
2016-06-01 14:52:27 -06:00
Dianne Hackborn
7aaeb394a9 Merge "Fix issue #29058724: Improve JobScheduler API demo" into nyc-dev
am: 61721ee3d7

* commit '61721ee3d7b7d55a0535584449b49143b1c2e039':
  Fix issue #29058724: Improve JobScheduler API demo

Change-Id: Icbee904b90fe52afaa8074b3165e4618d1fae526
2016-06-01 19:37:43 +00:00
Dianne Hackborn
61721ee3d7 Merge "Fix issue #29058724: Improve JobScheduler API demo" into nyc-dev 2016-06-01 19:29:43 +00:00
Dianne Hackborn
5101b95710 resolve merge conflicts of e174476 to master
Change-Id: I4005cf91b8a6bf3faa2301d8ce97ab1ad5eed94f
2016-06-01 12:01:38 -07:00
Dianne Hackborn
c43a7f89f7 Fix issue #29058724: Improve JobScheduler API demo
We can now include it in the java docs!

Change-Id: I46b4f58e6220347e4f3f12139c9484d1b964c6a2
2016-06-01 10:48:43 -07:00
Adrian Roos
86a0e3befe Merge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev am: ff39d3ec2f
am: 72bc1299f2

* commit '72bc1299f2020c4acd51defed6da430d61edc5fa':
  MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT

Change-Id: Ifcba6fe03700c39b9777c3c08ffa1c4bf4873dd7
2016-06-01 17:34:05 +00:00