Commit Graph

1457 Commits

Author SHA1 Message Date
Nick Kralevich
3d28abf392 am 19db8894: am 19f9f445: am 7a56d949: Merge "Fix SELinux.java doc errors"
* commit '19db889424addfdf2eae9e3dac1c97d93e13cb74':
  Fix SELinux.java doc errors
2013-09-27 09:40:09 -07:00
Nick Kralevich
19db889424 am 19f9f445: am 7a56d949: Merge "Fix SELinux.java doc errors"
* commit '19f9f445bfe368f801f893aad6dbd372562746ac':
  Fix SELinux.java doc errors
2013-09-27 09:37:56 -07:00
Nick Kralevich
7a56d949ef Merge "Fix SELinux.java doc errors" 2013-09-27 16:32:57 +00:00
Adam Lesinski
9c437bcb57 am 7979e170: am bde988ad: Merge "Add Graphics alloc tracking via memtrack" into klp-dev
* commit '7979e170b5bdfb6922d758f2c66f06829b6b5d9b':
  Add Graphics alloc tracking via memtrack
2013-09-26 10:31:27 -07:00
Adam Lesinski
7979e170b5 am bde988ad: Merge "Add Graphics alloc tracking via memtrack" into klp-dev
* commit 'bde988ade5f75c3d241422dce2ee4124871fab53':
  Add Graphics alloc tracking via memtrack
2013-09-26 10:27:55 -07:00
Adam Lesinski
bde988ade5 Merge "Add Graphics alloc tracking via memtrack" into klp-dev 2013-09-26 17:22:31 +00:00
Dianne Hackborn
f3647c7bdc am f9ad7b9d: am 66a9b2d7: Merge "Fix issue #10903002: com.facebook.katana keeps itself in A Services" into klp-dev
* commit 'f9ad7b9d92f0464bdffb36f4b9f9f63292ba9863':
  Fix issue #10903002: com.facebook.katana keeps itself in A Services
2013-09-25 16:50:14 -07:00
Dianne Hackborn
f9ad7b9d92 am 66a9b2d7: Merge "Fix issue #10903002: com.facebook.katana keeps itself in A Services" into klp-dev
* commit '66a9b2d7392a7f6334b5fe23d00ba718f3fa1851':
  Fix issue #10903002: com.facebook.katana keeps itself in A Services
2013-09-25 16:09:13 -07:00
Dianne Hackborn
cbd9a52f25 Fix issue #10903002: com.facebook.katana keeps itself in A Services
Now when memory low, if a service's process is above
a selected pss, then the process is not allowed to go
in to the service a list.

Also simplified the normal meminfo details dump to not
include the shared dirty and shared clean sizes by
default, since these can be very confusing.  You will
still get to see them with the "-a" flag.

Finally some small steps to better managing service
processes in the LRU list, so hopefully we can some
day be better about letting them drop down in the list
when there isn't really much interesting happening in
the process.  Not yet used at this point.

Change-Id: I654bfd6d05de2a63120185ebb15ffda8cbeb5dac
2013-09-25 15:45:56 -07:00
Adam Lesinski
5b4ef81f2b Add Graphics alloc tracking via memtrack
Any OpenGL memory reported by /proc/pid/smaps will not be included
in the GPU GL memory count and will be considered Unknown. This is
an artifact of how some memory reporting is done in libmemtrack
and some is done in this module.

bug:10294768

Change-Id: Id8fb63b2e86520f4dbc8410573a509e66b96b13b
2013-09-25 14:41:49 -07:00
Dianne Hackborn
6885d577cb am 8715dc14: am 4213e68f: am 3a7d5f71: Merge "Replace SEAndroid with SELinux."
* commit '8715dc1401557f5ec068f9214ab0712291a3b403':
  Replace SEAndroid with SELinux.
2013-09-25 11:48:40 -07:00
Dianne Hackborn
8715dc1401 am 4213e68f: am 3a7d5f71: Merge "Replace SEAndroid with SELinux."
* commit '4213e68f67d59c0912d2a8729fcec4539197756a':
  Replace SEAndroid with SELinux.
2013-09-25 11:45:38 -07:00
Dianne Hackborn
3a7d5f7145 Merge "Replace SEAndroid with SELinux." 2013-09-25 18:39:58 +00:00
David Christie
49580f5ce4 am f6a63c92: am fe538cb6: Merge "Fix broken method WorkSource.set (names aren\'t applied)." into klp-dev
* commit 'f6a63c92448be250208556520900c4309917a010':
  Fix broken method WorkSource.set (names aren't applied).
2013-09-24 10:23:09 -07:00
David Christie
dd3a021f4a Fix broken method WorkSource.set (names aren't applied).
Change-Id: I89273b99e312e48adc10debbb4e40d8684cceb23
2013-09-23 16:01:08 -07:00
Dianne Hackborn
c430e0dc76 am 28db9c64: am 90d51b1a: Merge "Fix issue #10807048: Groupon: The application crash when user rotates..." into klp-dev
* commit '28db9c64172c046118eede06a5cc6f8d729c50c8':
  Fix issue #10807048:  Groupon: The application crash when user rotates...
2013-09-20 18:30:43 -07:00
Dianne Hackborn
90d51b1abe Merge "Fix issue #10807048: Groupon: The application crash when user rotates..." into klp-dev 2013-09-21 01:21:26 +00:00
Dianne Hackborn
e784d1e4cf Fix issue #10807048: Groupon: The application crash when user rotates...
...device to another mode (portrait or landscape) on Main page.

So, it turns out that Bundle claimed to have an invariant that either
mParcelledData or mMap would hold its data, never both.  The new
implementation on top of ArrayMap assumed this was the case.  However,
there is one situation where it is not true: an application can take
an existing Bundle that contains data, and call readFromParcel() on it.
The implementation of readFromParcel() would just pull out the
parceled data and stuff it in to mParcelledData for later unparceling,
even if that Bundle already had a non-empty mMap.

To fix this, we just look for this case in readFromParcel() and
immediately unparcel at that point into the existing map, using a
new unparcelling method that doesn't rely on the target map being
empty.

Change-Id: Ib816b6876a6cd2760b7a3372c7a79ca2f12dfeba
2013-09-20 18:13:52 -07:00
Adam Lesinski
5fc67f98b9 am a35ff661: am d473ebb7: Merge "Surfaces ParcelFileDescriptor#parseMode() as API" into klp-dev
* commit 'a35ff66127d07117e93268482d7e9719abfd58c3':
  Surfaces ParcelFileDescriptor#parseMode() as API
2013-09-20 16:05:21 -07:00
Jeff Sharkey
f439bcd953 am 578f67c2: am dfed2448: Merge "Delegate mkdirs() to vold when lacking perms." into klp-dev
* commit '578f67c25c6bb160cf30bf39b7e41bc039000a5c':
  Delegate mkdirs() to vold when lacking perms.
2013-09-20 16:05:16 -07:00
Adam Lesinski
d473ebb7c4 Merge "Surfaces ParcelFileDescriptor#parseMode() as API" into klp-dev 2013-09-20 22:59:12 +00:00
Jeff Sharkey
dfed244876 Merge "Delegate mkdirs() to vold when lacking perms." into klp-dev 2013-09-20 22:56:07 +00:00
Adam Lesinski
eb8c3f93ed Surfaces ParcelFileDescriptor#parseMode() as API
Moves ContentResolver#modeToMode() to ParcelFileDescriptor#parseMode()

bug:10711271
Change-Id: I28a5de4ca70adfbec4caf739863b77f0fd7fd9a4
2013-09-20 14:59:34 -07:00
Jeff Sharkey
2d8b4e8013 Delegate mkdirs() to vold when lacking perms.
Apps without sdcard_r or sdcard_rw are still able to write to
their package-specific directory, but someone needs to first make
that directory on their behalf.  This change will delegate the
mkdirs() call through to vold when an app fails to create directly.

MountService validates that the path belongs to the calling user, and
that it's actually on external storage, before passing to vold.

Update Environment to make app-vs-vold paths clearer.

Bug: 10577808
Change-Id: I43b4a77fd6d2b9af2a0d899790da8d9d89386776
2013-09-20 14:34:02 -07:00
David Christie
2875fb8586 am 0e500803: am f31a7897: Merge "Clear names from externally supplied WorkSources to WifiManager (b/10733757)" into klp-dev
* commit '0e50080395d2ed9e3c703f769ea3fb84706f989a':
  Clear names from externally supplied WorkSources to WifiManager (b/10733757)
2013-09-20 13:13:54 -07:00
David Christie
f31a789774 Merge "Clear names from externally supplied WorkSources to WifiManager (b/10733757)" into klp-dev 2013-09-20 20:04:04 +00:00
David Christie
a31510e47a Clear names from externally supplied WorkSources to WifiManager (b/10733757)
Change-Id: I36102f13962df2093c1e35fb40081ead647eff32
2013-09-20 11:41:41 -07:00
Dianne Hackborn
af7968497e am 2d696ff9: am 76e6bcb8: Merge "Fix issue #10310128: CTS: android.security.cts.ServicePermissionsTest" into klp-dev
* commit '2d696ff910479457b0f01421c93f2f8516f64b13':
  Fix issue #10310128: CTS: android.security.cts.ServicePermissionsTest
2013-09-20 11:29:19 -07:00
Dianne Hackborn
a2067473e8 Fix issue #10310128: CTS: android.security.cts.ServicePermissionsTest
Change-Id: Id6432fc1b62db41c6c291ec08450c2fc37ced899
2013-09-20 10:54:16 -07:00
Amith Yamasani
0125d4bd25 am 2f9fd33f: am e8c01ddb: Merge "Changes to PFD based on API review" into klp-dev
* commit '2f9fd33fd9cad3bbd8edffefa9c65cbeb7e50c94':
  Changes to PFD based on API review
2013-09-18 16:47:50 -07:00
Amith Yamasani
e8c01ddbe7 Merge "Changes to PFD based on API review" into klp-dev 2013-09-18 23:43:11 +00:00
Amith Yamasani
b433bb8c96 Changes to PFD based on API review
Removed boolean param to ask for exception on detached fd. Use a
subclass of IOException instead.

Bug: 10461576
Change-Id: If7db16120297edcdb7d5d5905ed453003be0e38e
2013-09-18 16:35:05 -07:00
Amith Yamasani
dc7e0464b8 am a8b4da87: am 840b3bd6: Merge "Fix provider leak in PFD" into klp-dev
* commit 'a8b4da872a1824408b52fb1730699fde780cad04':
  Fix provider leak in PFD
2013-09-18 11:05:49 -07:00
Amith Yamasani
487c11a310 Fix provider leak in PFD
Code path to release content provider associated with the PFD was
inadvertently bypassed by a previous change. Reinstate that code
when closing the PFD.

Bug: 10767447
Change-Id: I23306cfb3c28c99e587892b17ca85efd3f7a8a07
2013-09-18 09:30:43 -07:00
Dianne Hackborn
3f7867b603 am 570d0ca3: am fc9122ec: Merge "Implement #10666712: NetworkOnMainThreadException should be..." into klp-dev
* commit '570d0ca39cd8d11faf7cc453cfd8096e07c3877b':
  Implement #10666712: NetworkOnMainThreadException should be...
2013-09-13 18:10:19 -07:00
David Christie
6180e84410 am 691a3191: am 5f68f717: Merge "Strip names out of externally supplied WorkSources to WifiManager (b/10710007)." into klp-dev
* commit '691a3191e3efb11f0607c45f29e460d2baf8188e':
  Strip names out of externally supplied WorkSources to WifiManager (b/10710007).
2013-09-13 18:10:16 -07:00
Dianne Hackborn
fc9122ecae Merge "Implement #10666712: NetworkOnMainThreadException should be..." into klp-dev 2013-09-14 01:04:05 +00:00
David Christie
5f68f71701 Merge "Strip names out of externally supplied WorkSources to WifiManager (b/10710007)." into klp-dev 2013-09-14 01:02:40 +00:00
David Christie
6ab2284c98 Strip names out of externally supplied WorkSources to WifiManager (b/10710007).
Change-Id: I69bd7ce9e942c2f9327415b2821d805e1b50a1a4
2013-09-13 17:34:40 -07:00
Dianne Hackborn
7e7144218e Implement #10666712: NetworkOnMainThreadException should be...
...relayed back to calling application

What's one more exception between friends?

Change-Id: Ib83c7bfbddd397457dcdbe506a8cd2bc0f4fb70b
2013-09-13 17:32:57 -07:00
Dianne Hackborn
e054986657 am 5b7359aa: am 76adfd71: Merge "Fix issue #10461477: KLP API Review: Debug.MemoryInfo" into klp-dev
* commit '5b7359aa442a120c2853a05bc987c501da659df2':
  Fix issue #10461477: KLP API Review: Debug.MemoryInfo
2013-09-13 17:32:18 -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
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
Dianne Hackborn
3fa8969021 Fix issue #10461477: KLP API Review: Debug.MemoryInfo
Oops.

Change-Id: I2143790af9e6649dba8d74618358c47232cf6cc4
2013-09-13 17:20:00 -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
Jeff Sharkey
3e1189b359 Move search to roots; Documents root; hide empty.
Documents searches now happen root-wide, instead of only under a
subdirectory.  Updates abstract class and flags to match.  Add flag
for a root to indicate it's empty, and hide empty roots in UI unless
creating.

Define "Documents" public directory and storage backend to contain
files.

Bug: 10712057, 10710865, 10710758
Change-Id: I8716367568969f9cb1d83927b2bf5a7013809350
2013-09-13 11:35:04 -07:00
Jeff Sharkey
123eeea6d6 am e2d76fa8: am cecccecc: Merge changes Ib1274847,I2eb2a1bf into klp-dev
* commit 'e2d76fa8c6d0f5c3d1a73a3ec9756c4bc545806d':
  Fix SDK build.
  Request all tethering interfaces, fix corruption.
2013-09-11 17:23:29 -07:00
Dianne Hackborn
8d717b917c resolved conflicts for merge of 03422d26 to master
Change-Id: I5d012fb122224c949a0039450bf0a9a475dc8e82
2013-09-11 16:43:22 -07:00
Jeff Sharkey
ceccceccff Merge changes Ib1274847,I2eb2a1bf into klp-dev
* changes:
  Fix SDK build.
  Request all tethering interfaces, fix corruption.
2013-09-11 20:16:59 +00:00