Commit Graph

4511 Commits

Author SHA1 Message Date
Jim Miller
db72969e93 am 9c9d3c42: am 694a6bbc: am c5cabe2d: Merge "Hide trust agent whitelisting until new API is ready." into lmp-dev
* commit '9c9d3c4257c1cbd4a7831b28378ff368566bb081':
  Hide trust agent whitelisting until new API is ready.
2014-08-27 22:06:22 +00:00
Jim Miller
6979cd1e4d am 58c53113: am 56c0e1db: am 61043233: Merge "Change name of confirm credentials method after API review" into lmp-dev
* commit '58c53113c4fb2cc13ac3e8f37d73fc0dad9b5799':
  Change name of confirm credentials method after API review
2014-08-27 21:51:36 +00:00
Jim Miller
e193455ee2 Merge "Hide trust agent whitelisting until new API is ready." into lmp-dev 2014-08-27 21:29:12 +00:00
Jim Miller
b1474f4432 Hide trust agent whitelisting until new API is ready.
Fixes bug 17008504

Change-Id: Ic93d52042e9b6d6f7d634f22aa04642f2da1af32
2014-08-27 14:27:49 -07:00
Jim Miller
f88c2569e9 Merge "Change name of confirm credentials method after API review" into lmp-dev 2014-08-27 20:42:19 +00:00
Julia Reynolds
f1e13ba1a2 am f7f6b67d: am 68ddd6d9: am e21130fd: Merge "Limit the settings profile/device owners can update." into lmp-dev
* commit 'f7f6b67dfc68404e9b18e944ff0ef8ae2c0465b0':
  Limit the settings profile/device owners can update.
2014-08-27 17:28:28 +00:00
Sander Alewijnse
b6c0fc8625 am 12df8729: am 45fb047d: am eb3f4b1c: Merge "Provide lockdown of date/time device owners." into lmp-dev
* commit '12df87292e529a13ae033cda7197abacdd68b9ee':
  Provide lockdown of date/time device owners.
2014-08-27 17:05:48 +00:00
Julia Reynolds
19d431f330 Merge "Limit the settings profile/device owners can update." into lmp-dev 2014-08-27 16:49:46 +00:00
Julia Reynolds
9ed66da8df Limit the settings profile/device owners can update.
Bug: 16351901
Change-Id: Id33a57ad651b5b7b58de0549eb90d5a1fe5c19c5
2014-08-27 11:49:37 -04:00
Sander Alewijnse
ebaf5c70e9 Merge "Provide lockdown of date/time device owners." into lmp-dev 2014-08-27 14:25:35 +00:00
Dianne Hackborn
b1d1fd0e06 am 7e6e7230: am eb7a0e4e: am 0d006c60: Fix issue #17146552: system anr
* commit '7e6e7230ebbc7085c2e0bb84741f5f1df0fc45e2':
  Fix issue #17146552: system anr
2014-08-27 09:47:50 +00:00
Dianne Hackborn
14efe16be5 am e6495bb0: am bad701ee: am 61b7055e: Merge "Fix issue #17179314: Make recents limits consistent" into lmp-dev
* commit 'e6495bb01be4af93f60dff947b66a8ef474ac2af':
  Fix issue #17179314: Make recents limits consistent
2014-08-27 09:03:49 +00:00
Dianne Hackborn
5232271a41 Fix issue #17146552: system anr
Add a safe path for Slog.wtf that doesn't acquire an activity manager
lock or block in any way.

Change-Id: I8fef8251a0cb85081442cae55d85063944248d15
2014-08-26 22:55:47 -07:00
Jim Miller
d262f6941f am b4a5c851: am b0400d12: am 771ad8b7: Merge "Limit grantTrust() duration to DevicePolicy-imposed limit." into lmp-dev
* commit 'b4a5c8511288c1a4e234120bbb3b32d0980c47e3':
  Limit grantTrust() duration to DevicePolicy-imposed limit.
2014-08-27 05:00:45 +00:00
Adam Powell
c55fd9e225 am 3f9989e0: am f6925920: am 78f0a6e5: Merge "Adjust toolbar/action bar title handling" into lmp-dev
* commit '3f9989e0e7fa5ce8a425bb95d1957126e2630459':
  Adjust toolbar/action bar title handling
2014-08-27 05:00:30 +00:00
Christopher Tate
0cff332a68 am 569464bb: am 663c889c: am 7bd36619: Merge "Briefly log wallpaper restore outcomes" into lmp-dev
* commit '569464bbdedb099616015351d1c8ee377f72d737':
  Briefly log wallpaper restore outcomes
2014-08-27 04:33:58 +00:00
Dianne Hackborn
80e29b66c5 Merge "Fix issue #17179314: Make recents limits consistent" into lmp-dev 2014-08-27 04:31:26 +00:00
Dianne Hackborn
852975d537 Fix issue #17179314: Make recents limits consistent
The max limit is now 100 (or 50 on svelte devices), and that is
what everyone used.

Re-arranged things so we have a big expensive "fix the world!"
function for recents that we go in to at only select points:
when first initializing the system, when external storage comes
and goes, and if we detect something wrong with the recents
structure.

With that, now getRecentTasks() and addRecentTaskLocked() are
generally much simpler, doing very little work in most cases.
This will help a lot with scaling up to many more recents
entries.

Change-Id: I7b5ae89edc06568f68c8af54a4420aff7635581c
2014-08-26 21:24:42 -07:00
Jim Miller
d22a667731 Merge "Limit grantTrust() duration to DevicePolicy-imposed limit." into lmp-dev 2014-08-27 03:08:02 +00:00
Jim Miller
bde3d18dd5 Change name of confirm credentials method after API review
Changed from getConfirmDeviceCredentialIntent to createConfirmDeviceCredentialIntent

Fixes bug 17288988

Change-Id: Iae9a997d9ea49ce23bdbbe38ad7b0763779b8f59
2014-08-26 19:53:17 -07:00
Adam Powell
4902a89103 Merge "Adjust toolbar/action bar title handling" into lmp-dev 2014-08-27 01:31:18 +00:00
Adam Powell
af2d85973e Adjust toolbar/action bar title handling
Treat activity title changes as window title changes when propagating
to action bars. This gives it lower priority if a "hard" title has
been set. Fix some lifecycle handling around this that previously
resulted in multiple calls.

Automatically detect the starting display options for a
ToolbarWidgetWrapper if we're not grabbing them from styles. This
prevents setTitle and friends from going totally out to lunch if
constructed around a Toolbar with no starting title.

Bug 17138048

Change-Id: I9f58a3d222546745c8aa873e996b8f0d52a0ad21
2014-08-26 18:28:17 -07:00
Christopher Tate
1871b9352e Merge "Briefly log wallpaper restore outcomes" into lmp-dev 2014-08-27 00:56:19 +00:00
Christopher Tate
8ab0865156 Briefly log wallpaper restore outcomes
Bug 17112780

Change-Id: I3e9a23d28c9df4f708eb24b4688322c21a8c8382
2014-08-26 17:08:04 -07:00
Jeff Hao
d72790e900 am 92c7379c: am c4ef03d0: am 73fb1feb: Merge "Add sample profiling option to am." into lmp-dev
* commit '92c7379cf75b6ddce98f03c223d14267227436d2':
  Add sample profiling option to am.
2014-08-26 23:39:57 +00:00
Jeff Hao
1b012d302b Add sample profiling option to am.
Also bundles all profiling options into a class.

Bug: 17040932
Change-Id: I85d675ee1494bdc7308caffdf94145d27c996e9d
2014-08-26 15:54:25 -07:00
Christoph Studer
469e5c127a am 46a63c20: am 48308602: am e25ac583: Merge "Notification: Optimize L icon processing" into lmp-dev
* commit '46a63c20759747e0aef2b76d3a378013f6084d04':
  Notification: Optimize L icon processing
2014-08-26 22:16:22 +00:00
vandwalle
7aea15a08e Merge "remove passpoint - DO NOT MERGE" into lmp-dev 2014-08-26 21:26:42 +00:00
Christoph Studer
6b6e9e05d3 Merge "Notification: Optimize L icon processing" into lmp-dev 2014-08-26 21:15:27 +00:00
Adam Lesinski
d3eb9151b4 am 2626a16b: am 90675431: am a707b2b8: Merge "Split up ComponentName in UsageEvents.Event" into lmp-dev
* commit '2626a16b53267832f13a8c222f7b65514f24ae9d':
  Split up ComponentName in UsageEvents.Event
2014-08-26 20:39:41 +00:00
Dianne Hackborn
e9c13a60c0 am 11bba84c: am f1bb15d2: am 55953caa: Merge "Fix issue #16311398: Limit number of documents a process can open" into lmp-dev
* commit '11bba84c2da1c30e0d3b67456c04995d16a5db52':
  Fix issue #16311398: Limit number of documents a process can open
2014-08-26 20:23:49 +00:00
Adam Lesinski
1dc0f36401 Merge "Split up ComponentName in UsageEvents.Event" into lmp-dev 2014-08-26 20:09:07 +00:00
Dianne Hackborn
4610545dd2 Merge "Fix issue #16311398: Limit number of documents a process can open" into lmp-dev 2014-08-26 19:56:26 +00:00
Adam Lesinski
9d9607527f Split up ComponentName in UsageEvents.Event
Some events in the future may not have originated
from a class, so we shouldn't be using ComponentName.

Bug:17259858
Change-Id: Id7fe3245b91596cf27ae4ec51655602f01665622
2014-08-26 12:41:31 -07:00
Adam Lesinski
e12ee81137 am 85a006d7: am 806d4cfb: am 521edf85: Merge "Have R classes generate their own reference rewrite logic" into lmp-dev
* commit '85a006d758765266984a912841a13503b49ea665':
  Have R classes generate their own reference rewrite logic
2014-08-26 18:54:15 +00:00
Winson Chung
04b0cd61a3 am 927754d7: am 77b91f7d: am 319b4b57: Merge "Multiple performance changes to speed recents invocation/app launching time. (Bug 16987565)" into lmp-dev
* commit '927754d79665a95e1945640e2f618450f3475395':
  Multiple performance changes to speed recents invocation/app launching time. (Bug 16987565)
2014-08-26 18:54:06 +00:00
Adam Lesinski
3aa6076083 Merge "Have R classes generate their own reference rewrite logic" into lmp-dev 2014-08-26 18:23:57 +00:00
Winson Chung
5c1b42e4f5 Merge "Multiple performance changes to speed recents invocation/app launching time. (Bug 16987565)" into lmp-dev 2014-08-26 18:23:10 +00:00
Dianne Hackborn
89ad456ea4 Fix issue #16311398: Limit number of documents a process can open
In application processes, monitor for when we start getting close
to the Dalvik heap limit, and ask the activity manager to try to
prune old activity instances in that case.

Add an explicit API for apps to ask that they have their own
activity instances cleaned up, if they want.

Fix some bugs in launching activities that were not correctly
applying the "multi task" behavior in the appropriate situations
of document-centric recents.

Clean up the activity manager's process removal code to all share
a common path.

Add a new "Spam" option to ActivityTests, which continually creates
new tasks, checking that the activity manager will now prune old
tasks rather than letting the app run out of RAM.

And while I was was doing this, I found problems with the path
for bringing an empty task to the foreground -- it could make
a new task instead of re-starting the root activity in the
existing task.  This is fixed, and some code in the recents
UI for working around the bug is removed.

And as long as I am doing that, we now have nice hooks in to
the activity manager for AppTask to give some APIs for better
managing the task, so add those along with more tests for these
APIs in ActivityTests.

We should look at also having the activity manager try to prune
old tasks when it sees app processes being killed, to better balance
memory use across multiple processes when some processes may host
many documents.  That however is for another CL...

Change-Id: I2bb81c3f92819350c868c7a7470b35817eb9bea9
2014-08-26 11:16:59 -07:00
Esteban Talavera
119bea6460 am 57d9b9c5: am 4835644c: am 14dcf0ff: Merge "Revert API constants to previous value to match hardcoded value in google3 apps" into lmp-dev
* commit '57d9b9c5d67f64f94071731839524fe6b7308558':
  Revert API constants to previous value to match hardcoded value in google3 apps
2014-08-26 16:27:28 +00:00
Christoph Studer
239f835f54 Notification: Optimize L icon processing
Bug: 16862480
Change-Id: I6c71eba232184ce948aafe81fec3a313fecbbaf1
2014-08-26 17:04:13 +02:00
vandwalle
808079bd27 remove passpoint - DO NOT MERGE
This CL is dependent on I3d2a230b0362520b9f1b2bc3792260116971e106

Change-Id: I1a0d655877d9368d833d62e231797af4b2560862
2014-08-26 14:56:04 +00:00
Esteban Talavera
fbb28dfb95 Revert API constants to previous value to match hardcoded value in google3 apps
Revert value of DevicePolicyManager constants that were hardcoded in dmagent. See previous change I6f60a43fe23526cfe855d81015feb759cf643926.

Bug: 17275391,17005622
Change-Id: I606b010eb0399f7b34b59c99f96549949410bafc
2014-08-26 15:38:44 +01:00
Sander Alewijnse
0ced627291 Provide lockdown of date/time device owners.
Fixed two minor issues with the screencapture as well.
Updated documentation and added enforceCrossUserPermission.

Bug:16948504
Change-Id: I9a645dcf480a4a044879ba481bce964d06fe5153
2014-08-26 14:44:53 +01:00
Dan Sandler
532d710d27 am e725ff74: am d25fdb22: am 9255b9f4: Allow listeners to fetch current notifications by key.
* commit 'e725ff74f3bfdddfda85a6f7fbf2345b8bdfed5e':
  Allow listeners to fetch current notifications by key.
2014-08-26 10:10:11 +00:00
Craig Mautner
21257b205b am 1a8416bf: am 7e587f00: am dbbb7951: Merge "Update API per council requests" into lmp-dev
* commit '1a8416bf597a287d8773eac2255c87e606cf853b':
  Update API per council requests
2014-08-26 10:09:45 +00:00
Dianne Hackborn
3d605c6f98 am d75419cf: am 2e4f0834: am 8db0a171: Merge "Fix issue #16366571: UIDs for work and normal Chrome processes are the same" into lmp-dev
* commit 'd75419cfd776c6504f024e4337e846f0aafbf473':
  Fix issue #16366571: UIDs for work and normal Chrome processes are the same
2014-08-26 10:09:31 +00:00
Nancy Chen
d7b43eae63 am ff0847ce: am 2ac6146c: am f9317703: Merge "API review PhoneManager -> TelecommManager. Rename methods (6/6)" into lmp-dev
* commit 'ff0847ced3191ba019b41524855646335d717f62':
  API review PhoneManager -> TelecommManager. Rename methods (6/6)
2014-08-26 10:09:02 +00:00
Dan Sandler
ea75fddbb4 Allow listeners to fetch current notifications by key.
Bug: 16574195
Change-Id: I269dbcc7fc8912d84229f6a3d950b0015625ae7a
2014-08-26 04:24:10 +00:00
Adam Lesinski
1e466385d4 Have R classes generate their own reference rewrite logic
Change-Id: I0e5b8311fc3479d966a49f9acf0d4c32a6a024d3
2014-08-25 20:04:07 -07:00