OSDN Git Service
Eric Laurent [Mon, 25 Mar 2013 23:44:46 +0000 (23:44 +0000)]
am
b93e7dc0: am
d8b50ab6: Merge "AudioService: rewrite sound effects loading" into jb-mr2-dev
* commit '
b93e7dc0f55f3e54d7098047471125ae68246908':
AudioService: rewrite sound effects loading
Eric Laurent [Mon, 25 Mar 2013 23:41:57 +0000 (23:41 +0000)]
am
d8b50ab6: Merge "AudioService: rewrite sound effects loading" into jb-mr2-dev
* commit '
d8b50ab6fedf97d0667ba26a2a3d6eb6694e4add':
AudioService: rewrite sound effects loading
Eric Laurent [Mon, 25 Mar 2013 23:39:52 +0000 (23:39 +0000)]
Merge "AudioService: rewrite sound effects loading" into jb-mr2-dev
Eric Laurent [Thu, 21 Mar 2013 22:35:10 +0000 (15:35 -0700)]
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
Geremy Condra [Mon, 25 Mar 2013 22:15:11 +0000 (22:15 +0000)]
am
8c668daf: am
a32c7e8f: am
a9af6c37: (-s ours) am
48718c85: Merge "Proper security labeling of multi-user data directories."
* commit '
8c668daf0dd114bb4f8f99d8168729b119005eea':
Proper security labeling of multi-user data directories.
Geremy Condra [Mon, 25 Mar 2013 22:13:08 +0000 (22:13 +0000)]
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.
Geremy Condra [Mon, 25 Mar 2013 22:08:43 +0000 (15:08 -0700)]
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.
Geremy Condra [Mon, 25 Mar 2013 22:02:47 +0000 (22:02 +0000)]
am
f7dbedb7: am
21a34de7: am
40a85bbc: (-s ours) am
4bcea122: Merge "Add seinfo parsing to PackageManagerService."
* commit '
f7dbedb7a859db2ddcc3065aacca8982b79bd158':
Add seinfo parsing to PackageManagerService.
Geremy Condra [Mon, 25 Mar 2013 22:00:53 +0000 (22:00 +0000)]
am
21a34de7: am
40a85bbc: (-s ours) am
4bcea122: Merge "Add seinfo parsing to PackageManagerService."
* commit '
21a34de7a87a55b608dd2b694e4522bd9d17e277':
Add seinfo parsing to PackageManagerService.
Geremy Condra [Mon, 25 Mar 2013 21:59:06 +0000 (14:59 -0700)]
am
40a85bbc: (-s ours) am
4bcea122: Merge "Add seinfo parsing to PackageManagerService."
* commit '
40a85bbc8449fe36bee287ae030f7f779c4a979f':
Add seinfo parsing to PackageManagerService.
Geremy Condra [Mon, 25 Mar 2013 21:49:28 +0000 (14:49 -0700)]
am
48718c85: Merge "Proper security labeling of multi-user data directories."
* commit '
48718c85b41b785cf6f6ae72beb4c5d46559b735':
Proper security labeling of multi-user data directories.
Geremy Condra [Mon, 25 Mar 2013 21:49:25 +0000 (14:49 -0700)]
am
4bcea122: Merge "Add seinfo parsing to PackageManagerService."
* commit '
4bcea1222ce447d9969d12927995ffdfad7c8322':
Add seinfo parsing to PackageManagerService.
Nick Kralevich [Mon, 25 Mar 2013 21:37:08 +0000 (21:37 +0000)]
am
2e53c2a8: am
c1905339: Merge "AppSecurityPermissions: Modify isDisplayablePermission" into jb-mr2-dev
* commit '
2e53c2a80bb9e059182a321367aad1d7ab0b19ae':
AppSecurityPermissions: Modify isDisplayablePermission
Nick Kralevich [Mon, 25 Mar 2013 21:35:13 +0000 (21:35 +0000)]
am
c1905339: Merge "AppSecurityPermissions: Modify isDisplayablePermission" into jb-mr2-dev
* commit '
c1905339bcb67c11380a366c5ac98da82e6e9b7b':
AppSecurityPermissions: Modify isDisplayablePermission
Nick Kralevich [Mon, 25 Mar 2013 21:32:45 +0000 (21:32 +0000)]
Merge "AppSecurityPermissions: Modify isDisplayablePermission" into jb-mr2-dev
Nick Kralevich [Mon, 25 Mar 2013 21:32:38 +0000 (21:32 +0000)]
am
1076e13d: am
b07220c8: Merge "Remove dead code." into jb-mr2-dev
* commit '
1076e13d8126aa349f68545b7d08a3de0c43c8ea':
Remove dead code.
Nick Kralevich [Mon, 25 Mar 2013 21:30:21 +0000 (21:30 +0000)]
am
b07220c8: Merge "Remove dead code." into jb-mr2-dev
* commit '
b07220c8ef82511a2e1de670d026171b99891155':
Remove dead code.
Nick Kralevich [Mon, 25 Mar 2013 19:11:58 +0000 (12:11 -0700)]
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
Christopher Tate [Mon, 25 Mar 2013 21:27:37 +0000 (21:27 +0000)]
am
ef6747cf: 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 '
ef6747cf9852bbcc8d5b5162b7792e2dc6f4c2fd':
Validate restored file paths against their nominal domain
Nick Kralevich [Mon, 25 Mar 2013 21:27:18 +0000 (21:27 +0000)]
Merge "Remove dead code." into jb-mr2-dev
Christopher Tate [Mon, 25 Mar 2013 21:25:29 +0000 (21:25 +0000)]
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
Fabrice Di Meglio [Mon, 25 Mar 2013 21:24:03 +0000 (21:24 +0000)]
am
410ff3ae: am
f7ed8937: Merge "Fix bug #
8447352 Contextual ActionBar vertical divider is incorrectly aligned in RTL mode" into jb-mr2-dev
* commit '
410ff3aef729c6962bb826535336a779c29ddf12':
Fix bug #
8447352 Contextual ActionBar vertical divider is incorrectly aligned in RTL mode
Christopher Tate [Mon, 25 Mar 2013 21:22:36 +0000 (14:22 -0700)]
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
Fabrice Di Meglio [Mon, 25 Mar 2013 21:21:58 +0000 (21:21 +0000)]
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
Christopher Tate [Mon, 25 Mar 2013 21:20:20 +0000 (14:20 -0700)]
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
Fabrice Di Meglio [Mon, 25 Mar 2013 21:18:53 +0000 (21:18 +0000)]
Merge "Fix bug #
8447352 Contextual ActionBar vertical divider is incorrectly aligned in RTL mode" into jb-mr2-dev
Christopher Tate [Mon, 25 Mar 2013 21:18:06 +0000 (14:18 -0700)]
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
Geremy Condra [Mon, 25 Mar 2013 21:17:46 +0000 (21:17 +0000)]
Merge "Proper security labeling of multi-user data directories."
Christopher Tate [Mon, 25 Mar 2013 21:15:38 +0000 (14:15 -0700)]
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
Christopher Tate [Mon, 25 Mar 2013 21:14:02 +0000 (14:14 -0700)]
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
Christopher Tate [Mon, 25 Mar 2013 21:11:10 +0000 (14:11 -0700)]
am
9432f83c: am
7b3ac9ad: am
0cb27e28: Validate restored file paths against their nominal domain
* commit '
9432f83cea107240bcb71b9230b3af7de4c2a036':
Validate restored file paths against their nominal domain
Christopher Tate [Mon, 25 Mar 2013 21:08:37 +0000 (14:08 -0700)]
am
7b3ac9ad: am
0cb27e28: Validate restored file paths against their nominal domain
* commit '
7b3ac9add80fde8e36201e7c2e05a3da10c44cec':
Validate restored file paths against their nominal domain
Geremy Condra [Mon, 25 Mar 2013 21:07:37 +0000 (21:07 +0000)]
Merge "Add seinfo parsing to PackageManagerService."
Christopher Tate [Mon, 25 Mar 2013 21:05:47 +0000 (14:05 -0700)]
am
0cb27e28: Validate restored file paths against their nominal domain
* commit '
0cb27e28071af59000198c8588c588a2e63cc0a3':
Validate restored file paths against their nominal domain
Christopher Tate [Mon, 25 Mar 2013 17:06:34 +0000 (10:06 -0700)]
Validate restored file paths against their nominal domain
Bug
8460775
(cherry picked from commit
7323765bbf13d9638cf2cc1e06113bffcdac46c4)
Change-Id: I6710503799a6df2de142a827513d5b4c107b6ec9
Christopher Tate [Mon, 25 Mar 2013 20:31:18 +0000 (20:31 +0000)]
am
537dc873: am
aad37a1e: Merge "Validate restored file paths against their nominal domain" into jb-mr2-dev
* commit '
537dc8733586a051300c740c737c58000c36a0b4':
Validate restored file paths against their nominal domain
Baligh Uddin [Mon, 25 Mar 2013 20:27:41 +0000 (20:27 +0000)]
am
e0096223: (-s ours) am
30df1dd3: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
e00962234bde3a9396b24f3f651024ace208427b':
Import translations. DO NOT MERGE
Jeff Tinker [Mon, 25 Mar 2013 20:27:38 +0000 (20:27 +0000)]
am
6555a64f: am
4d572b01: Merge "Load crypto plugins from additional shared libraries" into jb-mr2-dev
* commit '
6555a64fb9c761113eb17a8f19312a6bd5846fa3':
Load crypto plugins from additional shared libraries
Christopher Tate [Mon, 25 Mar 2013 20:26:39 +0000 (20:26 +0000)]
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
Christopher Tate [Mon, 25 Mar 2013 20:23:29 +0000 (20:23 +0000)]
Merge "Validate restored file paths against their nominal domain" into jb-mr2-dev
Baligh Uddin [Mon, 25 Mar 2013 20:23:03 +0000 (20:23 +0000)]
am
30df1dd3: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
30df1dd37f044ab51fa0fdcb562ee39039794641':
Import translations. DO NOT MERGE
Jeff Tinker [Mon, 25 Mar 2013 20:23:00 +0000 (20:23 +0000)]
am
4d572b01: Merge "Load crypto plugins from additional shared libraries" into jb-mr2-dev
* commit '
4d572b0134318433467b95f829545753147c0b43':
Load crypto plugins from additional shared libraries
Baligh Uddin [Mon, 25 Mar 2013 20:22:04 +0000 (20:22 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 25 Mar 2013 20:19:09 +0000 (20:19 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Jeff Tinker [Mon, 25 Mar 2013 20:18:18 +0000 (20:18 +0000)]
Merge "Load crypto plugins from additional shared libraries" into jb-mr2-dev
Christopher Tate [Mon, 25 Mar 2013 17:06:34 +0000 (10:06 -0700)]
Validate restored file paths against their nominal domain
Bug
8460775
Change-Id: Ib16d740a001adf4f9cb9ccaa31066ac7cadfb430
Craig Mautner [Mon, 25 Mar 2013 19:52:58 +0000 (19:52 +0000)]
Merge "Modify StackBox and TaskStack methods."
Craig Mautner [Mon, 25 Mar 2013 19:49:50 +0000 (19:49 +0000)]
Merge "Introduce ActivityStackSupervisor."
Nick Kralevich [Mon, 25 Mar 2013 18:42:48 +0000 (11:42 -0700)]
Remove dead code.
This code is never called.
Change-Id: I2ed3fee93004e967bfb2a3080106c3950bf43ce2
Baligh Uddin [Mon, 25 Mar 2013 18:28:36 +0000 (11:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: I42f8a1d6c5e8ba55dace27af96e4e6153fb06d36
Auto-generated-cl: translation import
Baligh Uddin [Mon, 25 Mar 2013 18:20:16 +0000 (11:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I62d1b7581b9598af132ec708c358848ac2edb32a
Auto-generated-cl: translation import
Nick Kralevich [Mon, 25 Mar 2013 18:19:42 +0000 (18:19 +0000)]
am
d7afbeb5: am
f00529d9: Merge "PackageManagerService: update grantPermission / revokePermission" into jb-mr2-dev
* commit '
d7afbeb52a289b98095872489928783fa008d424':
PackageManagerService: update grantPermission / revokePermission
Nick Kralevich [Mon, 25 Mar 2013 18:17:33 +0000 (18:17 +0000)]
am
f00529d9: Merge "PackageManagerService: update grantPermission / revokePermission" into jb-mr2-dev
* commit '
f00529d901da11d98ddf4b3b06d411e6879c9591':
PackageManagerService: update grantPermission / revokePermission
Nick Kralevich [Mon, 25 Mar 2013 18:14:04 +0000 (18:14 +0000)]
Merge "PackageManagerService: update grantPermission / revokePermission" into jb-mr2-dev
Nick Kralevich [Sun, 24 Mar 2013 21:27:17 +0000 (14:27 -0700)]
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
Nick Kralevich [Mon, 25 Mar 2013 17:44:41 +0000 (17:44 +0000)]
am
7d2a4b41: am
754aa113: Merge "AppSecurityPermissions: minor code cleanup" into jb-mr2-dev
* commit '
7d2a4b41393d3a774a403e29ebdd7eec92777f03':
AppSecurityPermissions: minor code cleanup
Nick Kralevich [Mon, 25 Mar 2013 17:42:14 +0000 (17:42 +0000)]
am
754aa113: Merge "AppSecurityPermissions: minor code cleanup" into jb-mr2-dev
* commit '
754aa113821046f563a5773ad07e9f4ea49804eb':
AppSecurityPermissions: minor code cleanup
Nick Kralevich [Mon, 25 Mar 2013 17:37:35 +0000 (17:37 +0000)]
Merge "AppSecurityPermissions: minor code cleanup" into jb-mr2-dev
Eric Laurent [Mon, 25 Mar 2013 17:13:01 +0000 (17:13 +0000)]
am
e4ad1a74: am
7c566bf3: Merge "audio service: add config option for fixed volume" into jb-mr2-dev
* commit '
e4ad1a7420f6ad9b7f3b1d28205ed3d18e2dd04d':
audio service: add config option for fixed volume
Eric Laurent [Mon, 25 Mar 2013 17:10:47 +0000 (17:10 +0000)]
am
7c566bf3: Merge "audio service: add config option for fixed volume" into jb-mr2-dev
* commit '
7c566bf3e4a10d74588b3e92ea3f6af310930f37':
audio service: add config option for fixed volume
Eric Laurent [Mon, 25 Mar 2013 17:08:28 +0000 (17:08 +0000)]
Merge "audio service: add config option for fixed volume" into jb-mr2-dev
Craig Mautner [Mon, 25 Mar 2013 16:13:41 +0000 (09:13 -0700)]
Modify StackBox and TaskStack methods.
Also add dump() throughout.
Change-Id: I5369d2e71262645d9b1015bd4e72fad395cc7547
Craig Mautner [Mon, 25 Mar 2013 15:05:25 +0000 (08:05 -0700)]
Introduce ActivityStackSupervisor.
- New coordinating class to juggle multiple ActivityStacks.
- First job: take singleton Keyguard dismiss behavior out of
ActivityStack.
Change-Id: I68e4b44411d3ec9401e86ac23703d6540dcb12e8
rpcraig [Wed, 28 Nov 2012 13:37:06 +0000 (08:37 -0500)]
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>
Robert Craig [Mon, 25 Mar 2013 10:33:03 +0000 (06:33 -0400)]
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>
Nick Kralevich [Sun, 24 Mar 2013 21:27:00 +0000 (14:27 -0700)]
AppSecurityPermissions: minor code cleanup
Convert more instance variables to private.
Delete some dead code.
Simplify some code.
Change-Id: Iedd55857138b71b2915b9886128adfcd9e4b3c57
Dianne Hackborn [Sat, 23 Mar 2013 01:50:06 +0000 (01:50 +0000)]
am
dd24a32b: am
37f180b4: Merge "App ops: don\'t crash when provide read access is off." into jb-mr2-dev
* commit '
dd24a32b7c14337a20071ac8afe23c48157c32aa':
App ops: don't crash when provide read access is off.
Dianne Hackborn [Sat, 23 Mar 2013 01:47:45 +0000 (01:47 +0000)]
am
37f180b4: Merge "App ops: don\'t crash when provide read access is off." into jb-mr2-dev
* commit '
37f180b4a52e4c1d0b6a7b400b6579b7ff25f307':
App ops: don't crash when provide read access is off.
Dianne Hackborn [Sat, 23 Mar 2013 01:43:37 +0000 (01:43 +0000)]
Merge "App ops: don't crash when provide read access is off." into jb-mr2-dev
Dianne Hackborn [Sat, 23 Mar 2013 01:42:14 +0000 (18:42 -0700)]
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
Dianne Hackborn [Sat, 23 Mar 2013 01:33:03 +0000 (01:33 +0000)]
am
8277f248: am
b685faa2: Merge "Implement #
8323587, #
8323342, #
8323590: new features." into jb-mr2-dev
* commit '
8277f24865e52915b4825517860629c0385f79ed':
Implement #
8323587, #
8323342, #
8323590: new features.
Dianne Hackborn [Sat, 23 Mar 2013 01:30:35 +0000 (01:30 +0000)]
am
b685faa2: Merge "Implement #
8323587, #
8323342, #
8323590: new features." into jb-mr2-dev
* commit '
b685faa2cee2f8d74c82547fa7585027cbcfba5f':
Implement #
8323587, #
8323342, #
8323590: new features.
Dianne Hackborn [Sat, 23 Mar 2013 01:26:07 +0000 (01:26 +0000)]
Merge "Implement #
8323587, #
8323342, #
8323590: new features." into jb-mr2-dev
Fabrice Di Meglio [Sat, 23 Mar 2013 01:23:03 +0000 (18:23 -0700)]
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
Michael Wright [Sat, 23 Mar 2013 01:02:58 +0000 (01:02 +0000)]
am
4e58e9c5: am
53d13667: Fix log tags in trackball debugging
* commit '
4e58e9c579b5ca3496118177728119531c066666':
Fix log tags in trackball debugging
Michael Wright [Sat, 23 Mar 2013 01:00:59 +0000 (01:00 +0000)]
am
53d13667: Fix log tags in trackball debugging
* commit '
53d13667e39f12644d03278c33298351ac68ec26':
Fix log tags in trackball debugging
Michael Wright [Thu, 21 Mar 2013 01:05:30 +0000 (18:05 -0700)]
Fix log tags in trackball debugging
Change-Id: I02a623c96aff8b6ffbe11161feea39ad26ba0e83
Dianne Hackborn [Sat, 23 Mar 2013 00:27:25 +0000 (17:27 -0700)]
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
Svetoslav [Sat, 23 Mar 2013 00:19:43 +0000 (00:19 +0000)]
am
8d023d80: am
320a31c6: Merge "Incorrect unbinding of accessibility services." into jb-mr2-dev
* commit '
8d023d80eaabac42f4abf746a126209da4997221':
Incorrect unbinding of accessibility services.
Svetoslav [Sat, 23 Mar 2013 00:17:15 +0000 (00:17 +0000)]
am
320a31c6: Merge "Incorrect unbinding of accessibility services." into jb-mr2-dev
* commit '
320a31c604230566c2d269edf4327c97d99966a1':
Incorrect unbinding of accessibility services.
Svetoslav [Sat, 23 Mar 2013 00:14:43 +0000 (00:14 +0000)]
Merge "Incorrect unbinding of accessibility services." into jb-mr2-dev
Svetoslav [Sat, 23 Mar 2013 00:09:11 +0000 (17:09 -0700)]
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
Dianne Hackborn [Fri, 22 Mar 2013 23:20:02 +0000 (23:20 +0000)]
am
c31dc858: am
1a89c532: Merge "New media button API." into jb-mr2-dev
* commit '
c31dc858488ce291f434ab8bb7b90629f7a0ce27':
New media button API.
Dianne Hackborn [Fri, 22 Mar 2013 23:18:15 +0000 (23:18 +0000)]
am
1a89c532: Merge "New media button API." into jb-mr2-dev
* commit '
1a89c5324badd10dac142a5a0c40a203503db65f':
New media button API.
Dianne Hackborn [Fri, 22 Mar 2013 23:13:49 +0000 (23:13 +0000)]
Merge "New media button API." into jb-mr2-dev
Craig Mautner [Fri, 22 Mar 2013 22:57:36 +0000 (22:57 +0000)]
am
78089c3c: am
5341f377: Merge "Reduce situations where black thumbnail occurs." into jb-mr2-dev
* commit '
78089c3c225c27c326f5e4aad0084e173a7075e9':
Reduce situations where black thumbnail occurs.
Michael Wright [Fri, 22 Mar 2013 22:57:33 +0000 (22:57 +0000)]
am
a329c83d: am
88a0765d: Merge "Add pipelining optimization to IME dispatching" into jb-mr2-dev
* commit '
a329c83d6673f51c539a6f99d9b16e03c55eeac4':
Add pipelining optimization to IME dispatching
Craig Mautner [Fri, 22 Mar 2013 22:54:46 +0000 (22:54 +0000)]
am
5341f377: Merge "Reduce situations where black thumbnail occurs." into jb-mr2-dev
* commit '
5341f377ccdd71471894d23afaab4d7a75fd03ba':
Reduce situations where black thumbnail occurs.
Michael Wright [Fri, 22 Mar 2013 22:54:44 +0000 (22:54 +0000)]
am
88a0765d: Merge "Add pipelining optimization to IME dispatching" into jb-mr2-dev
* commit '
88a0765dd4f18ce367f2874f5972816644090b0d':
Add pipelining optimization to IME dispatching
Craig Mautner [Fri, 22 Mar 2013 22:51:57 +0000 (22:51 +0000)]
Merge "Reduce situations where black thumbnail occurs." into jb-mr2-dev
Michael Wright [Fri, 22 Mar 2013 22:49:53 +0000 (22:49 +0000)]
Merge "Add pipelining optimization to IME dispatching" into jb-mr2-dev
Jeff Tinker [Fri, 22 Mar 2013 22:32:27 +0000 (15:32 -0700)]
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
Christopher Tate [Fri, 22 Mar 2013 22:31:37 +0000 (22:31 +0000)]
am
a35c0c04: am
57b0f363: Merge "Throw on illegal arguments to ArrayUtils.equals(a1, a2, len)" into jb-mr2-dev
* commit '
a35c0c0475d66921c933b93c262bf3e8721e3710':
Throw on illegal arguments to ArrayUtils.equals(a1, a2, len)
Christopher Tate [Fri, 22 Mar 2013 22:29:14 +0000 (22:29 +0000)]
am
57b0f363: Merge "Throw on illegal arguments to ArrayUtils.equals(a1, a2, len)" into jb-mr2-dev
* commit '
57b0f3638297242baca5db3e8ab4b5aab151f09e':
Throw on illegal arguments to ArrayUtils.equals(a1, a2, len)
Christopher Tate [Fri, 22 Mar 2013 22:24:21 +0000 (22:24 +0000)]
Merge "Throw on illegal arguments to ArrayUtils.equals(a1, a2, len)" into jb-mr2-dev
Chris Craik [Fri, 22 Mar 2013 22:17:07 +0000 (22:17 +0000)]
am
27c809db: am
81cce37d: Merge "Restore final canvas state after deferred flush" into jb-mr2-dev
* commit '
27c809dba4b470bfcc00d7dc89ccf81ac36e1c3c':
Restore final canvas state after deferred flush
Chris Craik [Fri, 22 Mar 2013 22:15:37 +0000 (22:15 +0000)]
am
81cce37d: Merge "Restore final canvas state after deferred flush" into jb-mr2-dev
* commit '
81cce37deda2bd097d245c4d54806a354971a97c':
Restore final canvas state after deferred flush
Chris Craik [Fri, 22 Mar 2013 22:11:33 +0000 (22:11 +0000)]
Merge "Restore final canvas state after deferred flush" into jb-mr2-dev
Christopher Tate [Fri, 22 Mar 2013 22:01:13 +0000 (15:01 -0700)]
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
Wink Saville [Fri, 22 Mar 2013 21:49:32 +0000 (21:49 +0000)]
am
439eea83: am
c1b40c79: Merge "Add some new constants." into jb-mr2-dev
* commit '
439eea8328f6259dd9c029f90eb90e73f940f87b':
Add some new constants.