Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
117,662 Commits 3 Branches 0 Tags
35cb3efc8a3b755d23c614f960ea7be345b28c35
Commit Graph

1485 Commits

Author SHA1 Message Date
Jeff Sharkey
91695305f2 am 881cde33: am 16c4b8c5: am ddf5a170: Merge "Relax user constraint on storage state." into klp-dev 
* commit '881cde33589859e23a0af0a08b3c59d2f90cfd10':
  Relax user constraint on storage state.
 2013-10-15 04:02:52 -07:00
Jeff Sharkey
881cde3358 am 16c4b8c5: am ddf5a170: Merge "Relax user constraint on storage state." into klp-dev 
* commit '16c4b8c5999b4365bde5ad7c2f00337cee988dab':
  Relax user constraint on storage state.
 2013-10-14 19:01:30 -07:00
Jeff Sharkey
a6d1999529 Relax user constraint on storage state. 
Otherwise we wtf() when called various places in the system.

Bug: 11223886
Change-Id: I514d28603db02e3debd4af1cf20049af0c7399f4
 2013-10-14 16:43:42 -07:00
Kenny Root
183cd0ca64 am 7a2f4ae1: am 69779458: am 7878883e: Merge "Remove direct reference to X509CertImpl" 
* commit '7a2f4ae13223bb804417e9ce3294b22bd9bda49a':
  Remove direct reference to X509CertImpl
 2013-10-14 14:07:05 -07:00
Kenny Root
7a2f4ae132 am 69779458: am 7878883e: Merge "Remove direct reference to X509CertImpl" 
* commit '69779458aeef3fa9d9c6f54487784cf558c850e8':
  Remove direct reference to X509CertImpl
 2013-10-14 14:04:55 -07:00
Kenny Root
27e549428e Remove direct reference to X509CertImpl 
This should use the system default X.509 certificate provider.

Change-Id: Ibdfd800a9d10f9dc566a360401efe7c3dc6cef5d
 2013-10-14 13:39:43 -07:00
Jeff Sharkey
f22abb961b am ac50f60d: am 58ff8af5: am a6af40cd: Merge "Add secondary external storage support." into klp-dev 
* commit 'ac50f60da6ae9943321d4fe945e81d14dff0d4c2':
  Add secondary external storage support.
 2013-10-08 16:02:40 -07:00
Jeff Sharkey
ac50f60da6 am 58ff8af5: am a6af40cd: Merge "Add secondary external storage support." into klp-dev 
* commit '58ff8af53a8378ee50375b039c390ca7f0a29126':
  Add secondary external storage support.
 2013-10-08 14:12:37 -07:00
Jeff Sharkey
44cbdec292 Add secondary external storage support. 
When SECONDARY_STORAGE is defined by the hardware configuration,
include those paths in the new getExternalCacheDirs() and
getExternalFilesDirs() APIs.  Give secondary volumes valid state
until vold reports back.

Bug: 10330128, 10330229
Change-Id: Ifa55bfda47fd7c750f462dd26c98792ad462ab91
 2013-10-08 12:57:11 -07:00
Dianne Hackborn
a37bbc6afc am 8a5f7ab6: am 22c298a5: am 7192c6d7: Merge "KLP/KitKat is now API 19." into klp-dev 
* commit '8a5f7ab6e18e05a54a3ae7e0acb7e1b728ad613c':
  KLP/KitKat is now API 19.
 2013-10-04 09:11:32 -07:00
Dianne Hackborn
6588538ec5 am 7c55154d: am 80e75d39: am 0d763a90: Merge "Implement issue #11050739: Show swapped out RAM" into klp-dev 
* commit '7c55154d4776896c3e602f4739fd5b9cbbf1dba4':
  Implement issue #11050739: Show swapped out RAM
 2013-10-04 09:11:17 -07:00
Dianne Hackborn
4bfeed9499 am 61509ca5: am 479dde0b: am 6a6f96a2: Merge "Fix issue #10378741: configupdater needs to be explicit when it calls startService()" into klp-dev 
* commit '61509ca5bafbe59e29e1eaaaa938c5a668352cba':
  Fix issue #10378741: configupdater needs to be explicit when it calls startService()
 2013-10-04 09:11:14 -07:00
Dianne Hackborn
10a4d0b46e am 495fe22d: am 2d3f995a: am d585f954: Merge "Fix issue #10921903: CTS: android.os.cts.ParcelTest#testReadBundle..." into klp-dev 
* commit '495fe22d680c1674598184d08a01d5b961c13fc5':
  Fix issue #10921903: CTS: android.os.cts.ParcelTest#testReadBundle...
 2013-10-04 09:11:07 -07:00
Marco Nelissen
2a0a5d1022 am d9ff894e: am 05f56fc1: am 95867a65: Merge "Add PowerManager method to assign blame to a single uid" into klp-dev 
* commit 'd9ff894eae0b3acd3c89585a80ebd2039ed1de8c':
  Add PowerManager method to assign blame to a single uid
 2013-10-04 09:10:53 -07:00
Dianne Hackborn
8a5f7ab6e1 am 22c298a5: am 7192c6d7: Merge "KLP/KitKat is now API 19." into klp-dev 
* commit '22c298a5df7a9fa53826ecfa4925372b1eebf8bc':
  KLP/KitKat is now API 19.
 2013-10-03 15:39:44 -07:00
Dianne Hackborn
7c55154d47 am 80e75d39: am 0d763a90: Merge "Implement issue #11050739: Show swapped out RAM" into klp-dev 
* commit '80e75d3946fd4c5cdd913d217df1b8d32ec464ee':
  Implement issue #11050739: Show swapped out RAM
 2013-10-03 15:39:36 -07:00
Dianne Hackborn
61509ca5ba am 479dde0b: am 6a6f96a2: Merge "Fix issue #10378741: configupdater needs to be explicit when it calls startService()" into klp-dev 
* commit '479dde0bc21a1e9d0bb8dad801cfe015f6c7e416':
  Fix issue #10378741: configupdater needs to be explicit when it calls startService()
 2013-10-03 15:39:33 -07:00
Dianne Hackborn
495fe22d68 am 2d3f995a: am d585f954: Merge "Fix issue #10921903: CTS: android.os.cts.ParcelTest#testReadBundle..." into klp-dev 
* commit '2d3f995a65f2acd60559b1db57ae3ab2346a1df0':
  Fix issue #10921903: CTS: android.os.cts.ParcelTest#testReadBundle...
 2013-10-03 15:39:27 -07:00
Marco Nelissen
d9ff894eae am 05f56fc1: am 95867a65: Merge "Add PowerManager method to assign blame to a single uid" into klp-dev 
* commit '05f56fc121e176ef4e227639a7b636a875f38037':
  Add PowerManager method to assign blame to a single uid
 2013-10-03 15:39:18 -07:00
Dianne Hackborn
7192c6d7c6 Merge "KLP/KitKat is now API 19." into klp-dev 2013-10-03 19:19:10 +00:00
Dianne Hackborn
6bc3789b39 KLP/KitKat is now API 19. 
Bug: 10348975

Change-Id: I19bf1a56064deda2e59085520960aac8ce3a825b
 2013-10-03 12:17:31 -07:00
Dianne Hackborn
0d763a901e Merge "Implement issue #11050739: Show swapped out RAM" into klp-dev 2013-10-03 17:45:42 +00:00
Dianne Hackborn
6a6f96a296 Merge "Fix issue #10378741: configupdater needs to be explicit when it calls startService()" into klp-dev 2013-10-03 17:44:38 +00:00
Dianne Hackborn
fd6c7b12c3 Fix issue #10378741: configupdater needs to be explicit when it calls startService() 
Not enough time to fix everything, so instead we'll make it a warning
in this release and finish up turning it into a target-SDK based
exception in the next release.

Change-Id: I5aae64a1225a145f03ba4162238b53d5e401aba2
 2013-10-03 10:42:26 -07:00
Dianne Hackborn
d585f95406 Merge "Fix issue #10921903: CTS: android.os.cts.ParcelTest#testReadBundle..." into klp-dev 2013-10-03 17:23:04 +00:00
Dianne Hackborn
4a7d824c3b Fix issue #10921903: CTS: android.os.cts.ParcelTest#testReadBundle... 
...fails from KRS84 across all platforms

My fix for issue #10807048 was wrong, wrong, wrong.  The problem was
actually just a stupid mistake in ArrayMap.erase().  This makes it
all right.

Change-Id: I762f7a2d5100bceb86a091ab3d6368edc21b4266
 2013-10-03 10:19:20 -07:00
Marco Nelissen
d983ba5cac Add PowerManager method to assign blame to a single uid 
Currently used by audioflinger to account for recording wakelocks.
b/10985160

Change-Id: I18fc8487f2a197bf02b5269a4bcae9e75b6c2207
 2013-10-03 08:49:36 -07:00
Dianne Hackborn
8883ced18a Implement issue #11050739: Show swapped out RAM 
Add "swapped out" field to mem info everywhere.

Change-Id: I89abe8eb0e91fa5c193da93815dc592593c8a3c8
 2013-10-02 17:40:05 -07:00
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