102492 Commits

Author SHA1 Message Date
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
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
7d2a4b4139 am 754aa113: Merge "AppSecurityPermissions: minor code cleanup" into jb-mr2-dev
* commit '754aa113821046f563a5773ad07e9f4ea49804eb':
  AppSecurityPermissions: minor code cleanup
2013-03-25 17:42:14 +00:00
Nick Kralevich
754aa11382 Merge "AppSecurityPermissions: minor code cleanup" into jb-mr2-dev 2013-03-25 17:37:35 +00:00
Eric Laurent
e4ad1a7420 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
2013-03-25 17:10:47 +00:00
Joe Malin
421435d2be Android Training: Accessing Contacts
Change-Id: I4de9f2a9ef18415225e1c85d53602bbaacbb7bb6
2013-03-25 10:10:35 -07: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
The Android Automerger
61a9962c61 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-25 05:56:01 -07: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
dd24a32b7c 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.
2013-03-23 01:47:45 +00: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
8277f24865 am b685faa2: Merge "Implement #8323587, #8323342, #8323590: new features." into jb-mr2-dev
* commit 'b685faa2cee2f8d74c82547fa7585027cbcfba5f':
  Implement #8323587, #8323342, #8323590: new features.
2013-03-23 01:30:35 +00: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
4e58e9c579 am 53d13667: Fix log tags in trackball debugging
* commit '53d13667e39f12644d03278c33298351ac68ec26':
  Fix log tags in trackball debugging
2013-03-23 01:00:59 +00:00
Michael Wright
53d13667e3 Fix log tags in trackball debugging
Change-Id: I02a623c96aff8b6ffbe11161feea39ad26ba0e83
2013-03-23 00:57:51 +00:00
Michael Wright
c8ee44d4b6 Remove misleading documentation from SystemClock
Change-Id: Ic97f911dca5c2b8911a4b2c670c4c79578f2cec0
2013-03-22 17:55:14 -07: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
8d023d80ea am 320a31c6: Merge "Incorrect unbinding of accessibility services." into jb-mr2-dev
* commit '320a31c604230566c2d269edf4327c97d99966a1':
  Incorrect unbinding of accessibility services.
2013-03-23 00:17:15 +00: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
c31dc85848 am 1a89c532: Merge "New media button API." into jb-mr2-dev
* commit '1a89c5324badd10dac142a5a0c40a203503db65f':
  New media button API.
2013-03-22 23:18:15 +00:00
Dianne Hackborn
1a89c5324b Merge "New media button API." into jb-mr2-dev 2013-03-22 23:13:49 +00:00
Craig Mautner
78089c3c22 am 5341f377: Merge "Reduce situations where black thumbnail occurs." into jb-mr2-dev
* commit '5341f377ccdd71471894d23afaab4d7a75fd03ba':
  Reduce situations where black thumbnail occurs.
2013-03-22 22:54:46 +00:00
Michael Wright
a329c83d66 am 88a0765d: Merge "Add pipelining optimization to IME dispatching" into jb-mr2-dev
* commit '88a0765dd4f18ce367f2874f5972816644090b0d':
  Add pipelining optimization to IME dispatching
2013-03-22 22:54:44 +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
a35c0c0475 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)
2013-03-22 22:29:14 +00:00