Commit Graph

8195 Commits

Author SHA1 Message Date
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
Mitchell Wills
e852018db5 Merge "Make WifiScanner state not static and use ConnectivityThread" into nyc-dev am: 3c58709
am: 53560db

* commit '53560db137aeab0a25c6a81c61da4426a676ce37':
  Make WifiScanner state not static and use ConnectivityThread

Change-Id: If2d49d771b63e0fd1bd96bdd976048da9435648a
2016-04-13 18:56:25 +00:00
Mitchell Wills
53560db137 Merge "Make WifiScanner state not static and use ConnectivityThread" into nyc-dev
am: 3c58709

* commit '3c5870912b6dc20e13c3af5e078a600b88904e99':
  Make WifiScanner state not static and use ConnectivityThread

Change-Id: Ia2c6bb955461884e88d13af885e0011fcafec7b5
2016-04-13 18:53:05 +00:00
Mitchell Wills
3c5870912b Merge "Make WifiScanner state not static and use ConnectivityThread" into nyc-dev 2016-04-13 18:41:55 +00:00
Dianne Hackborn
8db0fc15b8 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: If3fdff23c00c2f1b99901a9be096d851562d3439
2016-04-13 10:54:16 -07:00
Dianne Hackborn
7d4844eaba Merge "Fix issue #28035090: Disallow abuse of JobScheduler" into nyc-dev am: e3f617b
am: 3ba3ad2

* commit '3ba3ad21880ebc0b17171545e7c226b63e2c473b':
  Fix issue #28035090: Disallow abuse of JobScheduler

Change-Id: I4a02d5fed734846b1e9068950376d6db01cb0aba
2016-04-13 17:53:06 +00:00
Dianne Hackborn
3ba3ad2188 Merge "Fix issue #28035090: Disallow abuse of JobScheduler" into nyc-dev
am: e3f617b

* commit 'e3f617b23f202e11d4ee67d322609ee7b07b11bb':
  Fix issue #28035090: Disallow abuse of JobScheduler

Change-Id: I8ed129b1c5daabbddc57fdb95efdd15ba101184d
2016-04-13 17:49:32 +00:00
Dianne Hackborn
e3f617b23f Merge "Fix issue #28035090: Disallow abuse of JobScheduler" into nyc-dev 2016-04-13 17:44:52 +00:00
Dianne Hackborn
807de78c07 Fix issue #28035090: Disallow abuse of JobScheduler
We now keep track of how long each app has been running a job
for, in 30 minute batches.  If it is running jobs frequently,
we will bump down the priority its jobs run at to allow other
jobs to run before it.

Currently we count both pending and active as the job running,
which means that an app that has jobs waiting in the pending
queue will count against its abuse prevention.  This could
allow starvation -- if we bump down the priority of an app's
jobs and the system is so busy continually that they sit
in the pending queue a lot -- it could never recover.  But I
think that is okay...  if we are really in a state where we
are continually running as many jobs as possible, we probably
have other larger issues.

Change-Id: I838aa4b5840e91df49a1e17b53188d6e4a66a6d1
2016-04-13 10:42:51 -07:00
Michal Karpinski
dc8ac6fbb5 Merge "API polish in DPM for organization color and name methods" into nyc-dev am: 1271cef
am: 96d49b1

* commit '96d49b1ac6e197f64103e5454e308f65609b2853':
  API polish in DPM for organization color and name methods

Change-Id: I90b74fa1b0c3e2961fb26fc5e84e85d5bc5da1f5
2016-04-13 13:40:03 +00:00
Michal Karpinski
96d49b1ac6 Merge "API polish in DPM for organization color and name methods" into nyc-dev
am: 1271cef

* commit '1271cef419bdb7577f64b1dfa05d5678df706ef5':
  API polish in DPM for organization color and name methods

Change-Id: I6073662932fc256fc4860a19c4d45b1f9fcf9ced
2016-04-13 13:36:44 +00:00
Michal Karpinski
1271cef419 Merge "API polish in DPM for organization color and name methods" into nyc-dev 2016-04-13 13:28:08 +00:00
Clara Bayarri
a0c2dc3cf5 Provide startIntentSenderForResult for fragments
Bug: 27700608
Change-Id: Ibb7689ba0527048dd5944c4315b986f16030081d
2016-04-13 12:33:30 +01:00
TreeHugger Robot
a1cdc96faa Merge "TRON refinements for multi-window" into nyc-dev am: a74888d
am: e203cde

* commit 'e203cdefa1cc34057230ad83fdc5ef172e96f080':
  TRON refinements for multi-window

Change-Id: I2edd0f1e9b851234c21e42cd2e22e127a155e21f
2016-04-13 04:28:59 +00:00
Jorim Jaggi
e203cdefa1 Merge "TRON refinements for multi-window" into nyc-dev
am: a74888d

* commit 'a74888ddf6657b41aed28dff0b0b1d47a80f107f':
  TRON refinements for multi-window

Change-Id: I8a1a6d26bc94eca1afde2a1de920b4a39cd5e7f9
2016-04-13 04:26:04 +00:00
TreeHugger Robot
a74888ddf6 Merge "TRON refinements for multi-window" into nyc-dev 2016-04-13 04:18:31 +00:00