drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
148,918 Commits 1 Branch 0 Tags
Commit Graph

148918 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
b34eeb70a6 Merge "Notify VM of native pixelref allocations" into lmp-dev 2014-08-26 21:47:46 +00:00
Jeff Sharkey
7837dac462 Merge "Report FileBridge failures as wtf()." into lmp-dev 2014-08-26 21:27:11 +00:00
vandwalle
7aea15a08e Merge "remove passpoint - DO NOT MERGE" into lmp-dev 2014-08-26 21:26:42 +00:00
Jeff Sharkey
d3ca991700 Report FileBridge failures as wtf(). 
Bug: 17183379
Change-Id: Ifd4dc690c04439e1f7abebd8e0ca4e1ff97d9cc8
 2014-08-26 14:23:28 -07:00
Christoph Studer
f50d82a1e4 Merge "NoMan: Cancel children when update removes summary" into lmp-dev 2014-08-26 21:17:18 +00:00
Christoph Studer
faa9957fd3 Merge "NoListener: meetsInterruptionFilter -> matchesInterruptionFilter" into lmp-dev 2014-08-26 21:16:22 +00:00
Christoph Studer
6b6e9e05d3 Merge "Notification: Optimize L icon processing" into lmp-dev 2014-08-26 21:15:27 +00:00
Christoph Studer
7f05a69637 Merge "SysUI: Uprank current media notification" into lmp-dev 2014-08-26 21:14:16 +00:00
Jay Shrauner
f196e3fe45 Merge "Fix NPE when have no phone accounts" into lmp-dev 2014-08-26 21:04:33 +00:00
Baligh Uddin
25f6868665 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-26 21:03:36 +00:00
Baligh Uddin
cb54f6dfff Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-26 21:03:27 +00:00
Jay Shrauner
7746a94fd6 Fix NPE when have no phone accounts 
Return empty List instead of null so calling functions don't throw NPE
when dereferencing return value.

Bug:17282683
Bug:17262485
Change-Id: Ica4952b11a8af28787a4a0b6a991ab888386aa7b
 2014-08-26 21:01:18 +00:00
Sungsoo Lim
9dd43afbb9 Ensure system apps can be granted MODIFY_PARENTAL_CONTROLS 
Bug: 16948874
Change-Id: If44aaa7085705e8a2f55c71dae61bf6ac0cdfc09
 2014-08-26 13:56:42 -07:00
vandwalle
242540d9ea Merge "add radio stats to link layer" into lmp-dev 2014-08-26 20:46:19 +00:00
Jae Seo
ff9ec7779a Merge "TIF: Make TV content rating names consistent" into lmp-dev 2014-08-26 20:32:03 +00:00
Jeff Sharkey
264a5f5b34 Merge "Treat moving app as installing in new location." into lmp-dev 2014-08-26 20:29:13 +00:00
Libin.Tang@motorola.com
c47b18fb25 IMS: modify sendDtmf interface. 
Bug: 17282921
Change-Id: If96f209e91db420e089d429bb5c7a0f9882b4057
 2014-08-26 20:15:33 +00:00
Chris Craik
4cd7dbc90f Notify VM of native pixelref allocations 
bug:17178931
Change-Id: I0de22bb0d2ae8233d392b7e222f72391aaa12ce8
 2014-08-26 13:10:33 -07:00
Adam Lesinski
1dc0f36401 Merge "Split up ComponentName in UsageEvents.Event" into lmp-dev 2014-08-26 20:09:07 +00:00
Paul Jensen
5b62d263a7 Merge "Implement VpnConfig.addAllowedApplication()." into lmp-dev 2014-08-26 20:09:00 +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
Michael Wright
15741d0e0b Merge "Add missing attr for KEYCODE_VOICE_ASSIST" into lmp-dev 2014-08-26 19:42:40 +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
27046c88bf Merge "Add indexOf method to ArrayMap & ArraySet" into lmp-dev 2014-08-26 19:38:04 +00:00
Ji-Hwan Lee
56bfc2bc24 Merge "TIF: Reset main TvView only for explicit reset() call" into lmp-dev 2014-08-26 19:20:46 +00:00
Calin Juravle
4db289eb54 Merge "Make native bridge property read-only." into lmp-dev 2014-08-26 19:18:24 +00:00
Calin Juravle
d68f83cc47 Merge "Pass vmSafeMode (manifest attribute) to installd." into lmp-dev 2014-08-26 19:10:25 +00:00
Selim Gurun
790f6f449d Merge "Remove synchronized from acceptThirdPartyCookies()" into lmp-dev 2014-08-26 19:09:48 +00:00
Calin Juravle
685a12b446 Make native bridge property read-only. 
Bug: 17104449

(cherry picked from commit 53db6ae7819177abb9df156b269726a69a8c72df)

Change-Id: I926356f1e472a20d571e40c0c7dbb9c5a66a44a9
 2014-08-26 20:07:51 +01:00
Amith Yamasani
1771d39ebf Merge "Fix SetupWizard crash when creating Guest or Restricted profile" into lmp-dev 2014-08-26 19:02:18 +00:00
Svetoslav
e39baa7307 Merge "Fix accessiblity CTS tests (framework)." into lmp-dev 2014-08-26 19:01:50 +00:00
Baligh Uddin
2d1d387d3f Import translations. DO NOT MERGE 
Change-Id: Iac6630d0b618bc97f0bb62047cee97a797c52df7
Auto-generated-cl: translation import
 2014-08-26 11:57:30 -07:00
Adam Lesinski
4e9c07c0de Add indexOf method to ArrayMap & ArraySet 
Getting the indexOf is useful for doing compound operations
like:

int i = set.indexOf(key);
if (i >= 0) {
    Object o = set.valueAt(i);
    o.blah();
    set.removeAt(i);
}

Change-Id: I3d4b77d1461ba969fc6b4d332d52d4d084b5b53c
 2014-08-26 11:53:32 -07:00
Jorim Jaggi
6183cc1a68 Merge "Update IME switcher icon" into lmp-dev 2014-08-26 18:51:08 +00:00
Andrew Solovay
3442b412e1 am 8d8cf0b2: am e7c7993e: Merge "docs: Fixed error in code sample." into klp-modular-docs 
* commit '8d8cf0b22f9f8eaf06914697fbe22a77cb27e307':
  docs: Fixed error in code sample.
 2014-08-26 18:47:25 +00:00
Jorim Jaggi
31fc3e8047 Update IME switcher icon 
Also make the transparency consistent with the other icons.

Bug: 15597889
Change-Id: Ia5c8ea0bed192b57c552c62358b365d979c4b062
 2014-08-26 20:42:38 +02:00
Diego Pontoriero
c9256d3da1 Merge "Remove unused constant from TelephonyIntents." into lmp-dev 2014-08-26 18:36:41 +00:00
Andrew Solovay
8d8cf0b22f am e7c7993e: Merge "docs: Fixed error in code sample." into klp-modular-docs 
* commit 'e7c7993e4d490b67b329ef2502e35c8aad763ca1':
  docs: Fixed error in code sample.
 2014-08-26 18:36:23 +00:00
Andrew Solovay
e7c7993e4d Merge "docs: Fixed error in code sample." into klp-modular-docs 2014-08-26 18:25:33 +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
Jorim Jaggi
b0768f6ad0 Merge "Fix jumping animation when using two-finger expand" into lmp-dev 2014-08-26 18:21:31 +00:00
ztenghui
bed17d21b0 Merge "Correctly detect the wrong Z value for the light" into lmp-dev 2014-08-26 18:18:31 +00:00
ztenghui
ae82e604fa Merge "VD: Update the fillColor default as transparent" into lmp-dev 2014-08-26 18:18:16 +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
Georgi Nikolov
ffc596bd22 Merge "Add maximum time-out to sync operation" into lmp-dev 2014-08-26 18:16:54 +00:00
Georgi Nikolov
1877924da0 Merge "Don't back-off ALREADY_IN_PROGRESS syncs" into lmp-dev 2014-08-26 18:13:14 +00:00
Diego Pontoriero
04154bcd91 Remove unused constant from TelephonyIntents. 
Bug: 16457806
Change-Id: Ia987c3167e5731a1eceb6b1ff4a8795ced826a5d
 2014-08-26 10:58:57 -07:00
Ji-Hwan Lee
d0f0058883 TIF: Reset main TvView only for explicit reset() call 
Or, do not reset when it's called internaly while tuning.

Bug: 17269010
Change-Id: I3447ef0e628c066f71eee5a1416347fa6c721504
 2014-08-27 02:55:10 +09:00
Tim Murray
29d35997a3 am cb16b55b: am 2a866f07: Update RenderScript docs. 
* commit 'cb16b55b5ed9e4388b36e457226c96962004dd6c':
  Update RenderScript docs.
 2014-08-26 17:51:21 +00:00