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

113661 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
5bb9c2edb7 am f6f36a95: am 540421ba: Merge "When launching home activity, make sure it is top." into klp-dev 
* commit 'f6f36a95a238381740a92263a76af790bc93ae37':
  When launching home activity, make sure it is top.
 2013-09-13 17:30:36 -07:00
Vineeta Srivastava
6a60c7bd4e am 2089abdf: am 45fa4219: Merge "Roaming Icon should not displayed with Indosat\'s old SIM" into klp-dev 
* commit '2089abdf787df5a179db6486f39441c57db82833':
  Roaming Icon should not displayed with Indosat's old SIM
 2013-09-13 17:30:33 -07:00
Dianne Hackborn
1cd9a73ac0 am f3b4cf7d: am 28eeb420: Merge "Implement #10749688: Improve low memory reporting" into klp-dev 
* commit 'f3b4cf7d01b68418dd652e201868d140de081bd8':
  Implement #10749688: Improve low memory reporting
 2013-09-13 17:30:31 -07:00
Zhihai Xu
078c1f3606 am a33ebcb9: am 78d47240: Merge "Fixed review comments" into klp-dev 
* commit 'a33ebcb9edd5d8a8148d9080d2bf48b76d2b93fb':
  Fixed review comments
 2013-09-13 17:30:27 -07:00
Victoria Lease
a98655f053 am fff3f7cc: am 22e2c225: Merge "NotoColorEmoji.ttf is the new AndroidEmoji.ttf" into klp-dev 
* commit 'fff3f7cc824ea92fd14e8e528baf06d1af620749':
  NotoColorEmoji.ttf is the new AndroidEmoji.ttf
 2013-09-13 17:30:24 -07:00
Baligh Uddin
4e87843a20 am 649bb2dc: (-s ours) am 62f3bdec: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '649bb2dc30f6b43806c52829f9329f8d35f1ecd5':
  Import translations. DO NOT MERGE
 2013-09-13 17:30:21 -07:00
Deepanshu Gupta
f392e5d4f6 am 68862f07: (-s ours) am 79a1a7c3: am 31207780: am 0ecfe381: am 54d88f76: Fix ClassCastException when rendering ListView 
* commit '68862f07b6b8421a2d0aeafe62e4285525e14166':
  Fix ClassCastException when rendering ListView
 2013-09-13 17:30:18 -07:00
Wink Saville
d80b0a9515 am 12d3f488: am 7770dcc3: Merge "checkMobileProvisioning should not block." into klp-dev 
* commit '12d3f488e79ba5afcc30bb2b4e555d06b2a34c74':
  checkMobileProvisioning should not block.
 2013-09-13 17:22:56 -07:00
Jason Monk
103a02453b am f9464838: am 312c495f: Merge "Guarantee that PAC Local Proxy owns Port" into klp-dev 
* commit 'f9464838fe141aac1c677e2f4ec0133381fbb5af':
  Guarantee that PAC Local Proxy owns Port
 2013-09-13 17:22:53 -07:00
Scott Main
94a766a342 am bd04940c: am cac2428d: am a73e5df0: am cdde6dc6: am 95e7df91: fix title for uses-sdk doc 
* commit 'bd04940ca71d977c75c704a835faade2d311ab96':
  fix title for uses-sdk doc
 2013-09-13 17:22:49 -07:00
Christopher Tate
9b6c9a1592 am fcda3283: am 7560c256: Merge "Add hidden API for querying available \'home\' activities" into klp-dev 
* commit 'fcda3283d27f8dfaa812fb735af43eea2e077c64':
  Add hidden API for querying available 'home' activities
 2013-09-13 17:22:45 -07:00
Jeff Sharkey
4c7c51480e am f5513f41: am 0bf2ed90: Merge "Move search to roots; Documents root; hide empty." into klp-dev 
* commit 'f5513f41fe041bef29ec70abdce7cc6f582a11c2':
  Move search to roots; Documents root; hide empty.
 2013-09-13 17:22:41 -07:00
Craig Mautner
f6f36a95a2 am 540421ba: Merge "When launching home activity, make sure it is top." into klp-dev 
* commit '540421ba984655b07f2b70bae1db9ae1bc3052aa':
  When launching home activity, make sure it is top.
 2013-09-13 17:15:58 -07:00
Vineeta Srivastava
2089abdf78 am 45fa4219: Merge "Roaming Icon should not displayed with Indosat\'s old SIM" into klp-dev 
* commit '45fa42195efc6f3d7ca531d405905963a4de6e0e':
  Roaming Icon should not displayed with Indosat's old SIM
 2013-09-13 17:15:55 -07:00
Dianne Hackborn
f3b4cf7d01 am 28eeb420: Merge "Implement #10749688: Improve low memory reporting" into klp-dev 
* commit '28eeb42012018bfa3cffc77e9a970e8f5c13f70b':
  Implement #10749688: Improve low memory reporting
 2013-09-13 17:15:23 -07:00
Zhihai Xu
a33ebcb9ed am 78d47240: Merge "Fixed review comments" into klp-dev 
* commit '78d47240fb71a55897c1ef2e2d06492acbe29ad6':
  Fixed review comments
 2013-09-13 17:15:17 -07:00
Victoria Lease
fff3f7cc82 am 22e2c225: Merge "NotoColorEmoji.ttf is the new AndroidEmoji.ttf" into klp-dev 
* commit '22e2c2254244da4cf9ead06a6d03dc21b54d2a8a':
  NotoColorEmoji.ttf is the new AndroidEmoji.ttf
 2013-09-13 17:15:03 -07:00
Baligh Uddin
649bb2dc30 am 62f3bdec: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '62f3bdecc049464617328638d32ddca3bfb3e860':
  Import translations. DO NOT MERGE
 2013-09-13 17:14:58 -07:00
Deepanshu Gupta
68862f07b6 am 79a1a7c3: am 31207780: am 0ecfe381: am 54d88f76: Fix ClassCastException when rendering ListView 
* commit '79a1a7c367214e86d1ea18fe07bc4d2d5bc00f76':
  Fix ClassCastException when rendering ListView
 2013-09-13 17:14:48 -07:00
Wink Saville
12d3f488e7 am 7770dcc3: Merge "checkMobileProvisioning should not block." into klp-dev 
* commit '7770dcc3d351a494d0f5fe44feb776cc512e9b18':
  checkMobileProvisioning should not block.
 2013-09-13 17:14:15 -07:00
Jason Monk
f9464838fe am 312c495f: Merge "Guarantee that PAC Local Proxy owns Port" into klp-dev 
* commit '312c495f4b8d002264772f61fe1fa3ef87bf3e52':
  Guarantee that PAC Local Proxy owns Port
 2013-09-13 17:14:10 -07:00
Scott Main
bd04940ca7 am cac2428d: am a73e5df0: am cdde6dc6: am 95e7df91: fix title for uses-sdk doc 
* commit 'cac2428da4a22d9526af09e1457a6b644b2c2057':
  fix title for uses-sdk doc
 2013-09-13 17:14:05 -07:00
Christopher Tate
fcda3283d2 am 7560c256: Merge "Add hidden API for querying available \'home\' activities" into klp-dev 
* commit '7560c256ecacb5fa3904ec5c957e88331328f38b':
  Add hidden API for querying available 'home' activities
 2013-09-13 17:14:00 -07:00
Jeff Sharkey
f5513f41fe am 0bf2ed90: Merge "Move search to roots; Documents root; hide empty." into klp-dev 
* commit '0bf2ed90c42d3a1f1d4be4b70c337f9eaec9cd14':
  Move search to roots; Documents root; hide empty.
 2013-09-13 17:13:56 -07:00
Craig Mautner
540421ba98 Merge "When launching home activity, make sure it is top." into klp-dev 2013-09-13 23:33:17 +00:00
Vineeta Srivastava
45fa42195e Merge "Roaming Icon should not displayed with Indosat's old SIM" into klp-dev 2013-09-13 23:29:31 +00:00
Christopher Tate
b649443b3c am a5ec4d4b: am 5daf77d0: am ac39c604: Merge "Fix formatting in clearApplicationUserData exception message." 
* commit 'a5ec4d4b54440dd7f56661ebf602498d2b08526c':
  Fix formatting in clearApplicationUserData exception message.
 2013-09-13 16:11:11 -07:00
Dianne Hackborn
28eeb42012 Merge "Implement #10749688: Improve low memory reporting" into klp-dev 2013-09-13 23:06:07 +00:00
Dianne Hackborn
8e69257a9c Implement #10749688: Improve low memory reporting 
This significantly reworks the logging we do when
all cached processes are killed:

- We now collect the list of processes in-place so we
  have a snapshot of exactly when the low memory situation
  happened.
- In that snapshot we include the key process state: oom
  adj, proc state, adj reasons.
- The report then asynchronously collects pss information
  for those processes.
- The ultimate data printed to the log looks like a mix
  between the "dumpsys meminfo" and "dumpsys activity"
  output.  This code no longer uses "dumpsys meminfo"
  itself, so some of that data is no longer included,
  in particular pss organized by allocation type.

In doing this, I realized that the existing code that is
supposed to run "procstats" is not currently working.  And
at that point I realized, really, when we are collecting
this pss data we'd really like to include all those native
processes using ghod-only-knows how much RAM.  And guess
what, we have a list of processes available in
ProcessCpuTracker.

So we now also collect and print information for native
processes, and we also do this for "dumpsys meminfo" which
really seems like a good thing when we are printing summaries
of all pss and such.

I also improved the code for reading /proc/meminfo to be
able to load all the interesting fields from there, and
am now printing that as well.

Change-Id: I9e7d13e9c07a8249c7a7e12e5433973b2c0fdc11
 2013-09-13 16:02:01 -07:00
Zhihai Xu
78d47240fb Merge "Fixed review comments" into klp-dev 2013-09-13 23:00:21 +00:00
Craig Mautner
a82aa09ba3 When launching home activity, make sure it is top. 
Because recents sits on the same stack as launcher it can sometimes be
above launcher. When we were launching home activity because the flag
told us to we would sometimes launch recents instead. This fix makes
sure that the home activity is on the top when it is supposed to be
launched next.

Previously this was fixed by having recents move itself to the back
of the stack after it launched an activity (b/9750207 and ag/336019).
But that solution caused the AppTransition to be set to
TRANSIT_TASK_TO_BACK which left the SOFT_INPUT_IS_FORWARD_NAVIGATION
flag unset. This in turn caused IMEs to remain unlaunched when
returning from recents (b/10240567).

Fixes bug 10240567.

Change-Id: I35c6619af0e68d0e6d9ab87cad06ea7c27e11e27
 2013-09-13 15:46:51 -07:00
Victoria Lease
22e2c22542 Merge "NotoColorEmoji.ttf is the new AndroidEmoji.ttf" into klp-dev 2013-09-13 22:32:59 +00:00
Sungmin Choi
fa4e1d417c Roaming Icon should not displayed with Indosat's old SIM 
Bug: 10403087
Change-Id: If2ea5650ed9a665da94f2941507fb273800b3ab8
 2013-09-13 15:30:09 -07:00
Baligh Uddin
62f3bdecc0 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-13 22:13:09 +00:00
Christopher Tate
a5ec4d4b54 am 5daf77d0: am ac39c604: Merge "Fix formatting in clearApplicationUserData exception message." 
* commit '5daf77d00d0fd93f24f9dc6013ee838411e9adf9':
  Fix formatting in clearApplicationUserData exception message.
 2013-09-13 15:05:31 -07:00
Christopher Tate
5daf77d00d am ac39c604: Merge "Fix formatting in clearApplicationUserData exception message." 
* commit 'ac39c604d6df8631922c2295b3341cd561f172a5':
  Fix formatting in clearApplicationUserData exception message.
 2013-09-13 15:02:06 -07:00
Deepanshu Gupta
79a1a7c367 am 31207780: am 0ecfe381: am 54d88f76: Fix ClassCastException when rendering ListView 
* commit '31207780338b97e396927701ca0da7a61d6d44b2':
  Fix ClassCastException when rendering ListView
 2013-09-13 15:01:00 -07:00
Christopher Tate
ac39c604d6 Merge "Fix formatting in clearApplicationUserData exception message." 2013-09-13 21:58:45 +00:00
Deepanshu Gupta
3120778033 am 0ecfe381: am 54d88f76: Fix ClassCastException when rendering ListView 
* commit '0ecfe3819269062805c4c56cdc1470c2fc3856c8':
  Fix ClassCastException when rendering ListView
 2013-09-13 14:57:35 -07:00
Deepanshu Gupta
0ecfe38192 am 54d88f76: Fix ClassCastException when rendering ListView 
* commit '54d88f7678387a6eb871ec2dccd36af4ff35b1fe':
  Fix ClassCastException when rendering ListView
 2013-09-13 14:55:06 -07:00
Tor Norbye
a7726271f7 Replace wildcard imports with explicit imports 
The wildcard imports interfered with the new typedef annotations (and
99% of the tests were using explicit imports anyway.)

Change-Id: I3784b9d700131fe4a0ba30283f052820b2fa5122
 2013-09-13 14:22:36 -07:00
Victoria Lease
54769862ff NotoColorEmoji.ttf is the new AndroidEmoji.ttf 
Bug: 10144988
Change-Id: I04ebb86e283b752c43597b5f908f5c28f7806ee1
 2013-09-13 14:11:58 -07:00
Wink Saville
7770dcc3d3 Merge "checkMobileProvisioning should not block." into klp-dev 2013-09-13 20:59:16 +00:00
Jason Monk
312c495f4b Merge "Guarantee that PAC Local Proxy owns Port" into klp-dev 2013-09-13 20:31:54 +00:00
Dianne Hackborn
cd71cf1738 am bab31979: am 9210bc85: Implement #10744011: Serialize running of background services 
* commit 'bab3197988bd95629d74541ab62f3b7dc1b247ce':
  Implement #10744011: Serialize running of background services
 2013-09-13 13:27:17 -07:00
John Spurlock
19522aba8d am 0899d983: am 49580cf1: Merge "SystemUI status bar/quick settings updates." into klp-dev 
* commit '0899d983ffbbcf7b9bd9ff0eb83f11f5fe260e26':
  SystemUI status bar/quick settings updates.
 2013-09-13 13:27:13 -07:00
Dianne Hackborn
bab3197988 am 9210bc85: Implement #10744011: Serialize running of background services 
* commit '9210bc85545f31973c957b5179e6a82d05f473c6':
  Implement #10744011: Serialize running of background services
 2013-09-13 13:20:34 -07:00
John Spurlock
0899d983ff am 49580cf1: Merge "SystemUI status bar/quick settings updates." into klp-dev 
* commit '49580cf1f768eb90a85f79f1cb7019d08d93332a':
  SystemUI status bar/quick settings updates.
 2013-09-13 13:20:01 -07:00
Scott Main
cac2428da4 am a73e5df0: am cdde6dc6: am 95e7df91: fix title for uses-sdk doc 
* commit 'a73e5df060262d1fc92f76fcc7a3a3d4537f9a0a':
  fix title for uses-sdk doc
 2013-09-13 13:04:43 -07:00
Scott Main
a73e5df060 am cdde6dc6: am 95e7df91: fix title for uses-sdk doc 
* commit 'cdde6dc6675207708020fbe7458b13ccf22fe492':
  fix title for uses-sdk doc
 2013-09-13 13:02:20 -07:00