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

102064 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Tinker
16b8cffb28 MediaDrm API update 
Clarify offline usage of sessions and keys and implement
implement CryptoSession to support additional crypto use
cases.

Change-Id: Id3f8c706e9e3034b09af8e2a6a2f26bd74a49f93
 2013-04-01 21:59:35 -07:00
Irfan Sheriff
8074cc0c06 Merge "Fix string for tablet" into jb-mr2-dev 2013-03-26 22:11:11 +00:00
Elliott Hughes
c5f790f3ba am 145e60b3: am 6c75deb5: Merge "Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo." 
* commit '145e60b3e31f8daaf8e12dba0668c12e47968dd1':
  Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo.
 2013-03-26 14:58:10 -07:00
Elliott Hughes
145e60b3e3 am 6c75deb5: Merge "Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo." 
* commit '6c75deb5050c7fdde15b04aa96aa61c7b586e1f9':
  Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo.
 2013-03-26 14:56:03 -07:00
Elliott Hughes
6c75deb505 Merge "Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo." 2013-03-26 21:39:51 +00:00
Jeff Sharkey
0e93adc6e9 Merge "Update TrafficStats docs to reflect behavior." into jb-mr2-dev 2013-03-26 21:20:19 +00:00
Irfan Sheriff
cf7c1b4dfb Fix string for tablet 
Bug: 7467441
Change-Id: I77661097a8562d789089b81bc8b3ae93ff6ddcc4
 2013-03-26 14:17:28 -07:00
Jason Sams
f3f0e155e1 Merge "Add yuv get" into jb-mr2-dev 2013-03-26 21:15:36 +00:00
Irfan Sheriff
f51864176b Merge "Fix clearing linkproperties on disconnect" into jb-mr2-dev 2013-03-26 20:47:25 +00:00
Jeff Sharkey
dddace7582 Update TrafficStats docs to reflect behavior. 
Bug: 8399623
Change-Id: If9ccd305e8a077f318a09ac1bb160b8efbf903aa
 2013-03-26 13:46:09 -07:00
Irfan Sheriff
81196b207a Fix clearing linkproperties on disconnect 
Bug: 5472644
Change-Id: If2b32b16fd3d65f1da12a9c5a8083d50125283d5
 2013-03-26 13:38:57 -07:00
Jason Sams
5a722cf8b2 Add yuv get 
Change-Id: I6df5c0a8129283c0ad600b232790da10c395b479
 2013-03-26 13:27:37 -07:00
Elliott Hughes
a480dafbf2 Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo. 
It was possible to overrun this buffer, and even if you did fill
the buffer in a single read and exit the loop, the "string" still
wouldn't be terminated.

Bug: 8468088
Change-Id: Ia19f4d26dfd79e7b63807a7ec9540b932163d246
 2013-03-26 13:18:52 -07:00
Michael Wright
c3d8790d53 Merge "Remove misleading documentation from SystemClock" into jb-mr2-dev 2013-03-26 20:13:17 +00:00
Jeff Sharkey
7e9221c554 Merge "It helps to catch the right exception." into jb-mr2-dev 2013-03-26 17:29:43 +00:00
Jeff Sharkey
9ae62f5934 It helps to catch the right exception. 
Bug: 7238149
Change-Id: I7b60ec44d1d1d5ece8a871cb089f811b611f4a4a
 2013-03-26 10:29:01 -07:00
Joe Malin
3be53a86dc am 3e904d62: am e4ba94e5: am e64253fb: am 0e84afdb: am 1be81a96: am 98827948: Merge "Android Training: Accessing Contacts" into jb-mr1-dev 
* commit '3e904d62b6df1b8b99aa53ff62aee752b41c5163':
  Android Training: Accessing Contacts
 2013-03-26 09:42:51 -07:00
Joe Malin
3e904d62b6 am e4ba94e5: am e64253fb: am 0e84afdb: am 1be81a96: am 98827948: Merge "Android Training: Accessing Contacts" into jb-mr1-dev 
* commit 'e4ba94e550814422784b630acab80f104460384d':
  Android Training: Accessing Contacts
 2013-03-26 09:41:30 -07:00
Joe Malin
e4ba94e550 am e64253fb: am 0e84afdb: am 1be81a96: am 98827948: Merge "Android Training: Accessing Contacts" into jb-mr1-dev 
* commit 'e64253fbcaa1a8eae4dc5e3d52e8404f40e853ff':
  Android Training: Accessing Contacts
 2013-03-26 09:39:23 -07:00
Joe Malin
e64253fbca am 0e84afdb: am 1be81a96: am 98827948: Merge "Android Training: Accessing Contacts" into jb-mr1-dev 
* commit '0e84afdb946613ef3ccfd40f9eccf98eaf3f1521':
  Android Training: Accessing Contacts
 2013-03-26 09:37:58 -07:00
Joe Malin
0e84afdb94 am 1be81a96: am 98827948: Merge "Android Training: Accessing Contacts" into jb-mr1-dev 
* commit '1be81a96bbd43133eb70ce52515d5cc91d270bc8':
  Android Training: Accessing Contacts
 2013-03-26 09:36:26 -07:00
Joe Malin
1be81a96bb am 98827948: Merge "Android Training: Accessing Contacts" into jb-mr1-dev 
* commit '98827948f1911af89687d991c5549ec1b8b8549a':
  Android Training: Accessing Contacts
 2013-03-26 09:33:51 -07:00
Joe Malin
98827948f1 Merge "Android Training: Accessing Contacts" into jb-mr1-dev 2013-03-26 16:31:22 +00:00
Geremy Condra
df4144f4df am 9fa57b74: am 2aee33c1: Merge "BackupManagerService files need new security labeling." 
* commit '9fa57b74d8acb99c86f761a98f6e76998de8aff2':
  BackupManagerService files need new security labeling.
 2013-03-25 22:29:10 -07:00
Geremy Condra
9fa57b74d8 am 2aee33c1: Merge "BackupManagerService files need new security labeling." 
* commit '2aee33c1cdf89c0754bb660cd2e0ec95a007d4a8':
  BackupManagerService files need new security labeling.
 2013-03-25 22:26:56 -07:00
Geremy Condra
2aee33c1cd Merge "BackupManagerService files need new security labeling." 2013-03-26 05:10:38 +00:00
Fabrice Di Meglio
172fc865d3 Merge "Fix the build" into jb-mr2-dev 2013-03-26 02:19:34 +00:00
Fabrice Di Meglio
768f272976 Fix the build 
See bug #8200928

Change-Id: I014590f41d74f16cf3c3de618ef08ee490bf05aa
 2013-03-25 19:18:18 -07:00
Chet Haase
bc6c050f9c Merge "Fix touch processing for Overlay views" into jb-mr2-dev 2013-03-26 01:55:12 +00:00
Geremy Condra
51163e3baa Merge "Add seinfo parsing to PackageManagerService." into jb-mr2-dev 2013-03-26 01:38:56 +00:00
Chet Haase
9c17fe693d Fix touch processing for Overlay views 
Previous implementation processed Overlay touch after other children in
a ViewGroup; it should be the other way around.

Also, fixed some invalidation issues.

Finally, added new behavior to automatically place View which is already
parented into the same global position, by calculating where the overlay is
on the screen relative to the previous parent of the View.

Issue #8459085 Overlay needs to handle touch correctly

Change-Id: Ic2cee12d2bc345f64ed3f4d855a5c3496967a201
 2013-03-25 18:22:58 -07:00
kmccormick
3bafc1a705 am 33d388b0: am adc2d143: am 81f7ff7c: am c15f817e: am 81aaf3b0: Merge "Doc update: fix bug in Calendar Provider docs." into jb-mr1.1-docs 
* commit '33d388b05759cbd715d65de4ee9dd01be0bc210a':
  Doc update: fix bug in Calendar Provider docs.
 2013-03-25 18:19:49 -07:00
Jeff Sharkey
7d9bfc9b82 Merge "Handle external storage errors uniformly." into jb-mr2-dev 2013-03-26 00:37:03 +00:00
Jeff Sharkey
45d01ea282 Handle external storage errors uniformly. 
Bug: 6777728
Change-Id: I021db160bc959fdf02bfd448edf977961bd1d9d0
 2013-03-25 17:30:20 -07:00
Robert Craig
0f40dc923c Add seinfo parsing to PackageManagerService. 
This patch set allows the PMS to parse the
mac_permissions.xml file which contains the
seinfo values. Each package that is installed
on the device will be assigned an seinfo value
based on policy. This seinfo value will help label
the app process and data directory.  Modifications
include adjustments to ApplicationInfo.java
to store the seinfo tag per package as well as
adjustments to installd to communicate the seinfo
tag to libselinux.

Change-Id: I61ad1ea12fb6a9a6d0b108ec163bc4bf4c954b58
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
 2013-03-25 17:30:08 -07:00
Fabrice Di Meglio
04c710ad9d Merge "Fix bug #8200928 ExpandableListView should be RTL-aware" into jb-mr2-dev 2013-03-26 00:27:22 +00:00
Eric Laurent
d8b50ab6fe Merge "AudioService: rewrite sound effects loading" into jb-mr2-dev 2013-03-25 23:39:52 +00:00
Eric Laurent
5d3eb44a74 AudioService: rewrite sound effects loading 
Handle all access to SoundPool in the message Handler to
synchronize load/unload and play requests.

Add a timeout to load operations in case a problem occurs while loading
a sample and the SoundPool callback is not called.

Bug 6633095

Change-Id: I39949e4c8b2f7ca2d8b760b1f92c7e0fcd0a46e1
 2013-03-25 16:28:35 -07:00
kmccormick
33d388b057 am adc2d143: am 81f7ff7c: am c15f817e: am 81aaf3b0: Merge "Doc update: fix bug in Calendar Provider docs." into jb-mr1.1-docs 
* commit 'adc2d143996ed98b5d5aa9fa5d5c964258a1f719':
  Doc update: fix bug in Calendar Provider docs.
 2013-03-25 16:21:03 -07:00
kmccormick
adc2d14399 am 81f7ff7c: am c15f817e: am 81aaf3b0: Merge "Doc update: fix bug in Calendar Provider docs." into jb-mr1.1-docs 
* commit '81f7ff7c498cbd82181e29db58961f6dc73ee319':
  Doc update: fix bug in Calendar Provider docs.
 2013-03-25 16:18:24 -07:00
kmccormick
81f7ff7c49 am c15f817e: am 81aaf3b0: Merge "Doc update: fix bug in Calendar Provider docs." into jb-mr1.1-docs 
* commit 'c15f817e5092970820e6c3fa32c5715127e7bf37':
  Doc update: fix bug in Calendar Provider docs.
 2013-03-25 16:16:48 -07:00
kmccormick
c15f817e50 am 81aaf3b0: Merge "Doc update: fix bug in Calendar Provider docs." into jb-mr1.1-docs 
* commit '81aaf3b0195ceb3c134c1b8a31e558fa31fc3e77':
  Doc update: fix bug in Calendar Provider docs.
 2013-03-25 16:15:11 -07:00
kmccormick
81aaf3b019 Merge "Doc update: fix bug in Calendar Provider docs." into jb-mr1.1-docs 2013-03-25 23:11:30 +00:00
kmccormick
3a2608cc17 Doc update: fix bug in Calendar Provider docs. 
"Bug: 8472477"

Change-Id: Ib2d8b27a0343db45bb1efa326bd573c383573af2
 2013-03-25 16:02:19 -07:00
Geremy Condra
a32c7e8f9d am a9af6c37: (-s ours) am 48718c85: Merge "Proper security labeling of multi-user data directories." 
* commit 'a9af6c37868c0c3295fe16b7c0865fbbf3dd2c4f':
  Proper security labeling of multi-user data directories.
 2013-03-25 15:08:43 -07:00
Geremy Condra
21a34de7a8 am 40a85bbc: (-s ours) am 4bcea122: Merge "Add seinfo parsing to PackageManagerService." 
* commit '40a85bbc8449fe36bee287ae030f7f779c4a979f':
  Add seinfo parsing to PackageManagerService.
 2013-03-25 14:59:06 -07:00
Geremy Condra
a9af6c3786 am 48718c85: Merge "Proper security labeling of multi-user data directories." 
* commit '48718c85b41b785cf6f6ae72beb4c5d46559b735':
  Proper security labeling of multi-user data directories.
 2013-03-25 14:49:28 -07:00
Geremy Condra
40a85bbc84 am 4bcea122: Merge "Add seinfo parsing to PackageManagerService." 
* commit '4bcea1222ce447d9969d12927995ffdfad7c8322':
  Add seinfo parsing to PackageManagerService.
 2013-03-25 14:49:25 -07:00
Nick Kralevich
c1905339bc Merge "AppSecurityPermissions: Modify isDisplayablePermission" into jb-mr2-dev 2013-03-25 21:32:45 +00:00
Nick Kralevich
a5043ed7ea AppSecurityPermissions: Modify isDisplayablePermission 
Add optional permission support to isDisplayablePermission.

A permission is displayable if it's required, or was previously
granted to the app.

Currently, this change is a no-op. The package parser code
does not currently honor <uses-permission android:required="false"> in
the application's manifest, and assumes a permission is always required.

This change sets the ground for future optional permissions work.

Change-Id: I2ec4a49adbfab9980e116ed43354f16bdeaa301d
 2013-03-25 14:28:30 -07:00