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

102525 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
fc87ea5b50 am 7d9bfc9b: Merge "Handle external storage errors uniformly." into jb-mr2-dev 
* commit '7d9bfc9b8291aa4ec997ecb4002f4c411aa177ac':
  Handle external storage errors uniformly.
 2013-03-26 00:39:54 +00:00
Jeff Sharkey
7d9bfc9b82 Merge "Handle external storage errors uniformly." into jb-mr2-dev 2013-03-26 00:37:03 +00:00
Fabrice Di Meglio
47479a5556 am 04c710ad: Merge "Fix bug #8200928 ExpandableListView should be RTL-aware" into jb-mr2-dev 
* commit '04c710ad9da56c45d4e4778ca6d8283ea79e44db':
  Fix bug #8200928 ExpandableListView should be RTL-aware
 2013-03-26 00:32:01 +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
b93e7dc0f5 am d8b50ab6: Merge "AudioService: rewrite sound effects loading" into jb-mr2-dev 
* commit 'd8b50ab6fedf97d0667ba26a2a3d6eb6694e4add':
  AudioService: rewrite sound effects loading
 2013-03-25 23:41:57 +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
8c668daf0d am a32c7e8f: am a9af6c37: (-s ours) am 48718c85: Merge "Proper security labeling of multi-user data directories." 
* commit 'a32c7e8f9df1612d690a34258c014be661dc66ca':
  Proper security labeling of multi-user data directories.
 2013-03-25 22:13:08 +00: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
f7dbedb7a8 am 21a34de7: am 40a85bbc: (-s ours) am 4bcea122: Merge "Add seinfo parsing to PackageManagerService." 
* commit '21a34de7a87a55b608dd2b694e4522bd9d17e277':
  Add seinfo parsing to PackageManagerService.
 2013-03-25 22:00:53 +00: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
2e53c2a80b am c1905339: Merge "AppSecurityPermissions: Modify isDisplayablePermission" into jb-mr2-dev 
* commit 'c1905339bcb67c11380a366c5ac98da82e6e9b7b':
  AppSecurityPermissions: Modify isDisplayablePermission
 2013-03-25 21:35:13 +00:00
Nick Kralevich
c1905339bc Merge "AppSecurityPermissions: Modify isDisplayablePermission" into jb-mr2-dev 2013-03-25 21:32:45 +00:00
Nick Kralevich
1076e13d81 am b07220c8: Merge "Remove dead code." into jb-mr2-dev 
* commit 'b07220c8ef82511a2e1de670d026171b99891155':
  Remove dead code.
 2013-03-25 21:30:21 +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
Nick Kralevich
b07220c8ef Merge "Remove dead code." into jb-mr2-dev 2013-03-25 21:27:18 +00:00
Christopher Tate
ef6747cf98 am a04f33d8: am 6e7a6b10: am 0e3411b2: am d738f49a: am b559b58e: am 5769c0b8: am 9432f83c: am 7b3ac9ad: am 0cb27e28: Validate restored file paths against their nominal domain 
* commit 'a04f33d828788445aa585eb586c1cbd399a5e189':
  Validate restored file paths against their nominal domain
 2013-03-25 21:25:29 +00:00
Christopher Tate
a04f33d828 am 6e7a6b10: am 0e3411b2: am d738f49a: am b559b58e: am 5769c0b8: am 9432f83c: am 7b3ac9ad: am 0cb27e28: Validate restored file paths against their nominal domain 
* commit '6e7a6b101be849cee776205ed5d854524463f583':
  Validate restored file paths against their nominal domain
 2013-03-25 14:22:36 -07:00
Fabrice Di Meglio
410ff3aef7 am f7ed8937: Merge "Fix bug #8447352 Contextual ActionBar vertical divider is incorrectly aligned in RTL mode" into jb-mr2-dev 
* commit 'f7ed89372d5f2d93f2e8f4697363a209cc0f76f2':
  Fix bug #8447352 Contextual ActionBar vertical divider is incorrectly aligned in RTL mode
 2013-03-25 21:21:58 +00:00
Christopher Tate
6e7a6b101b am 0e3411b2: am d738f49a: am b559b58e: am 5769c0b8: am 9432f83c: am 7b3ac9ad: am 0cb27e28: Validate restored file paths against their nominal domain 
* commit '0e3411b20c173ada46fe4abf5f14fe28e699da70':
  Validate restored file paths against their nominal domain
 2013-03-25 14:20:20 -07:00
Fabrice Di Meglio
f7ed89372d Merge "Fix bug #8447352 Contextual ActionBar vertical divider is incorrectly aligned in RTL mode" into jb-mr2-dev 2013-03-25 21:18:53 +00:00
Christopher Tate
0e3411b20c am d738f49a: am b559b58e: am 5769c0b8: am 9432f83c: am 7b3ac9ad: am 0cb27e28: Validate restored file paths against their nominal domain 
* commit 'd738f49a1edeaf9c17b8b7ae7b5a5aeb9b56f16e':
  Validate restored file paths against their nominal domain
 2013-03-25 14:18:06 -07:00
Geremy Condra
48718c85b4 Merge "Proper security labeling of multi-user data directories." 2013-03-25 21:17:46 +00:00
Christopher Tate
d738f49a1e am b559b58e: am 5769c0b8: am 9432f83c: am 7b3ac9ad: am 0cb27e28: Validate restored file paths against their nominal domain 
* commit 'b559b58e950c8fe7ffe0c3201443ab814f24a701':
  Validate restored file paths against their nominal domain
 2013-03-25 14:15:38 -07:00
Christopher Tate
b559b58e95 am 5769c0b8: am 9432f83c: am 7b3ac9ad: am 0cb27e28: Validate restored file paths against their nominal domain 
* commit '5769c0b803ec604efafbf983dbf38e223646fb74':
  Validate restored file paths against their nominal domain
 2013-03-25 14:14:02 -07:00
Christopher Tate
5769c0b803 am 9432f83c: am 7b3ac9ad: am 0cb27e28: Validate restored file paths against their nominal domain 
* commit '9432f83cea107240bcb71b9230b3af7de4c2a036':
  Validate restored file paths against their nominal domain
 2013-03-25 14:11:10 -07:00
Christopher Tate
9432f83cea am 7b3ac9ad: am 0cb27e28: Validate restored file paths against their nominal domain 
* commit '7b3ac9add80fde8e36201e7c2e05a3da10c44cec':
  Validate restored file paths against their nominal domain
 2013-03-25 14:08:37 -07:00
Geremy Condra
4bcea1222c Merge "Add seinfo parsing to PackageManagerService." 2013-03-25 21:07:37 +00:00
Christopher Tate
7b3ac9add8 am 0cb27e28: Validate restored file paths against their nominal domain 
* commit '0cb27e28071af59000198c8588c588a2e63cc0a3':
  Validate restored file paths against their nominal domain
 2013-03-25 14:05:47 -07:00
Christopher Tate
0cb27e2807 Validate restored file paths against their nominal domain 
Bug 8460775

(cherry picked from commit 7323765bbf13d9638cf2cc1e06113bffcdac46c4)

Change-Id: I6710503799a6df2de142a827513d5b4c107b6ec9
 2013-03-25 13:44:34 -07:00
Christopher Tate
537dc87335 am aad37a1e: Merge "Validate restored file paths against their nominal domain" into jb-mr2-dev 
* commit 'aad37a1eeb4dcd35500a382401b889d34f6430d2':
  Validate restored file paths against their nominal domain
 2013-03-25 20:26:39 +00:00
Christopher Tate
aad37a1eeb Merge "Validate restored file paths against their nominal domain" into jb-mr2-dev 2013-03-25 20:23:30 +00:00
Baligh Uddin
e00962234b am 30df1dd3: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '30df1dd37f044ab51fa0fdcb562ee39039794641':
  Import translations. DO NOT MERGE
 2013-03-25 20:23:03 +00:00
Jeff Tinker
6555a64fb9 am 4d572b01: Merge "Load crypto plugins from additional shared libraries" into jb-mr2-dev 
* commit '4d572b0134318433467b95f829545753147c0b43':
  Load crypto plugins from additional shared libraries
 2013-03-25 20:23:00 +00:00
Baligh Uddin
30df1dd37f Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-03-25 20:19:10 +00:00
Jeff Tinker
4d572b0134 Merge "Load crypto plugins from additional shared libraries" into jb-mr2-dev 2013-03-25 20:18:18 +00:00
Christopher Tate
7323765bbf Validate restored file paths against their nominal domain 
Bug 8460775

Change-Id: Ib16d740a001adf4f9cb9ccaa31066ac7cadfb430
 2013-03-25 13:06:04 -07:00
Nick Kralevich
d6182f993d Remove dead code. 
This code is never called.

Change-Id: I2ed3fee93004e967bfb2a3080106c3950bf43ce2
 2013-03-25 11:43:19 -07:00
Baligh Uddin
233f32a894 Import translations. DO NOT MERGE 
Change-Id: I62d1b7581b9598af132ec708c358848ac2edb32a
Auto-generated-cl: translation import
 2013-03-25 11:20:16 -07:00
Nick Kralevich
d7afbeb52a am f00529d9: Merge "PackageManagerService: update grantPermission / revokePermission" into jb-mr2-dev 
* commit 'f00529d901da11d98ddf4b3b06d411e6879c9591':
  PackageManagerService: update grantPermission / revokePermission
 2013-03-25 18:17:33 +00:00