102018 Commits

Author SHA1 Message Date
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
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
Nick Kralevich
b07220c8ef Merge "Remove dead code." into jb-mr2-dev 2013-03-25 21:27:18 +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
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
aad37a1eeb Merge "Validate restored file paths against their nominal domain" into jb-mr2-dev 2013-03-25 20:23:30 +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
f00529d901 Merge "PackageManagerService: update grantPermission / revokePermission" into jb-mr2-dev 2013-03-25 18:14:04 +00:00
Nick Kralevich
c498614414 PackageManagerService: update grantPermission / revokePermission
Currently, grantPermission / revokePermission only handles development
permissions. This change extends these two functions to handle normal
and dangerous permissions.

A normal / dangerous permission can modified if it is marked as
optional (android:required="false") using the "am grant" / "am revoke"
commands.

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: I34f02ffd714e8a9a37b9f87df89cef915b1b6780
2013-03-25 11:01:20 -07:00
Nick Kralevich
754aa11382 Merge "AppSecurityPermissions: minor code cleanup" into jb-mr2-dev 2013-03-25 17:37:35 +00:00
Eric Laurent
7c566bf3e4 Merge "audio service: add config option for fixed volume" into jb-mr2-dev 2013-03-25 17:08:28 +00:00
rpcraig
1e0c8e6989 Proper security labeling of multi-user data directories.
This patch covers 2 cases. When an app is installed
and the resulting data directory is created for all
existing users. And when a new user is created and
all existing app data directories are created for
the new user.

Change-Id: Iacaba6d9d18d5337e65713960d14efe32006b330
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2013-03-25 14:35:00 +00:00
Robert Craig
d3f8d0333c 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 06:33:03 -04:00
Nick Kralevich
10ac1d125a AppSecurityPermissions: minor code cleanup
Convert more instance variables to private.
Delete some dead code.
Simplify some code.

Change-Id: Iedd55857138b71b2915b9886128adfcd9e4b3c57
2013-03-24 15:49:33 -07:00
Dianne Hackborn
37f180b4a5 Merge "App ops: don't crash when provide read access is off." into jb-mr2-dev 2013-03-23 01:43:37 +00:00
Dianne Hackborn
9fa39bd255 App ops: don't crash when provide read access is off.
If the caller supplied an empty selection string (instead
of null) we would crash due to creating a bad SQLite statement.

Change-Id: I462803b80c81815ed9a3a320c23060daa28e8114
2013-03-22 18:42:14 -07:00
Dianne Hackborn
b685faa2ce Merge "Implement #8323587, #8323342, #8323590: new features." into jb-mr2-dev 2013-03-23 01:26:08 +00:00
Fabrice Di Meglio
071f6333dd Fix bug #8447352 Contextual ActionBar vertical divider is incorrectly aligned in RTL mode
- add missing RTL drawables
- known issue: please note that because dalvik is caching drawables, a Locale change will
still show the wrong version of the drawables. You will need to reboot the device to see
the correct versions.

Change-Id: Ic522ba54ef19b0ff573b3a56c46ee76176aff4bb
2013-03-22 18:23:03 -07:00
Michael Wright
53d13667e3 Fix log tags in trackball debugging
Change-Id: I02a623c96aff8b6ffbe11161feea39ad26ba0e83
2013-03-23 00:57:51 +00:00
Dianne Hackborn
119bbc378d Implement #8323587, #8323342, #8323590: new features.
8323587: Add feature for supporting app widgets
8323342: Add feature for replacing the home screen
8323590: Add feature for supporting input methods

The app widget service looks for the app widget feature
and refuses to work if it doesn't exist.  I didn't do
this for the input method service because some devices
will probably want to still make use of that mechanism
without supporting third party input methods.

Change-Id: Ie3b089105e104f4d767cdb03cdbe4fdb1c17382e
2013-03-22 17:27:25 -07:00
Svetoslav
320a31c604 Merge "Incorrect unbinding of accessibility services." into jb-mr2-dev 2013-03-23 00:14:43 +00:00
Svetoslav
cefac5acc8 Incorrect unbinding of accessibility services.
If no accessibility services are enabled, we disable the
accessibility event firing to save resources. When the last
such services is disabled the system was not unbinding. As
a result the user was seeing the touch exploration enable
dialog when the service that requested it is disabled. Also
there is one service the system is bound to that is not used.

bug:8439191

Change-Id: I6f37f2573a815bfb29870298aa0abbb1fa105588
2013-03-22 17:13:01 -07:00
Dianne Hackborn
1a89c5324b Merge "New media button API." into jb-mr2-dev 2013-03-22 23:13:49 +00:00
Craig Mautner
5341f377cc Merge "Reduce situations where black thumbnail occurs." into jb-mr2-dev 2013-03-22 22:51:57 +00:00
Michael Wright
88a0765dd4 Merge "Add pipelining optimization to IME dispatching" into jb-mr2-dev 2013-03-22 22:49:53 +00:00
Jeff Tinker
90defba919 Load crypto plugins from additional shared libraries
Currently crypto plugins are expected to be in libdrmdecrypt.so.
When there are multiple plugins supporting different schemes,
this approach requires source code integration across
vendors which is unmanagable.  Also, for integration with
MediaDrm where the crypto keys are obtained from a drm server,
the MediaCrypto plugin needs to interoperate with the MediaDrm
plugin. This change allows {MediaCrypto, MediaDrm} pairs that
are logically related to be implemented in a common shared
library.

Multi-repository commit, goes with:
https://googleplex-android-review.googlesource.com/287838

Change-Id: I08577cda0cbcb22ebe3cb874f5fcafe411c36be3
2013-03-22 15:32:27 -07:00
Christopher Tate
57b0f36382 Merge "Throw on illegal arguments to ArrayUtils.equals(a1, a2, len)" into jb-mr2-dev 2013-03-22 22:24:21 +00:00
Chris Craik
81cce37ded Merge "Restore final canvas state after deferred flush" into jb-mr2-dev 2013-03-22 22:11:33 +00:00
Christopher Tate
fc05434908 Throw on illegal arguments to ArrayUtils.equals(a1, a2, len)
Specifically, throw an explicit IllegalArgumentException if
'len' is negative, rather than falling over in some other
way further down the line.

Change-Id: If955de7ec1a15aa9aa8c42b6994b059e0cdffcee
2013-03-22 15:01:13 -07:00
Dianne Hackborn
961cae9254 New media button API.
This allows sending media buttons to any PendingIntent,
so they can be captured with a registered receiver.

Also add some new ViewTreeObserver APIs; this is all for
a new support library API to watch media buttons while an
app has input focus.

Change-Id: I3c51cef59460662b008c9a2cc87d6a6383c21855
2013-03-22 14:49:28 -07:00