OSDN Git Service

android-x86/frameworks-base.git
11 years agoFix build.
Dianne Hackborn [Wed, 27 Mar 2013 01:00:42 +0000 (18:00 -0700)]
Fix build.

Change-Id: I51b87ee5f0b7f396aad7e239893d9f0764f04bb6

11 years agoMerge "Fix issue #8470131: Process thrash kills battery" into jb-mr2-dev
Dianne Hackborn [Wed, 27 Mar 2013 00:22:43 +0000 (00:22 +0000)]
Merge "Fix issue #8470131: Process thrash kills battery" into jb-mr2-dev

11 years agoMerge "Change wm commands to return size and density info." into jb-mr2-dev
Dianne Hackborn [Wed, 27 Mar 2013 00:22:27 +0000 (00:22 +0000)]
Merge "Change wm commands to return size and density info." into jb-mr2-dev

11 years agoMerge "Avoid multiple font cache texture uploads Bug #8378964" into jb-mr2-dev
Romain Guy [Wed, 27 Mar 2013 00:21:05 +0000 (00:21 +0000)]
Merge "Avoid multiple font cache texture uploads Bug #8378964" into jb-mr2-dev

11 years agoam 6f14ef70: am 083bfa5a: Merge "Remove dead DateUtils code that was never in an...
Elliott Hughes [Tue, 26 Mar 2013 23:51:10 +0000 (16:51 -0700)]
am 6f14ef70: am 083bfa5a: Merge "Remove dead DateUtils code that was never in an API level."

* commit '6f14ef70664d13295ffca524fb0b08365351b1f7':
  Remove dead DateUtils code that was never in an API level.

11 years agoMerge "Fix docs build." into jb-mr2-dev
Amith Yamasani [Tue, 26 Mar 2013 23:23:31 +0000 (23:23 +0000)]
Merge "Fix docs build." into jb-mr2-dev

11 years agoFix docs build.
Amith Yamasani [Tue, 26 Mar 2013 23:15:43 +0000 (16:15 -0700)]
Fix docs build.

Change-Id: I959db164f0ed7badfcdf921ffa1bfff60b4fb952

11 years agoMerge "Deliver key repeats for artificial dpad events" into jb-mr2-dev
Michael Wright [Tue, 26 Mar 2013 23:11:15 +0000 (23:11 +0000)]
Merge "Deliver key repeats for artificial dpad events" into jb-mr2-dev

11 years agoMerge "Fix some visibility state transition issues with ActionBarView" into jb-mr2-dev
Adam Powell [Tue, 26 Mar 2013 22:51:48 +0000 (22:51 +0000)]
Merge "Fix some visibility state transition issues with ActionBarView" into jb-mr2-dev

11 years agoFix some visibility state transition issues with ActionBarView
Adam Powell [Tue, 26 Mar 2013 22:38:26 +0000 (15:38 -0700)]
Fix some visibility state transition issues with ActionBarView

Restore state as expected for titles and expanded action views.

Bug 8246128

Bug 8479205

Change-Id: Icad59685c5eab241f19ecd94479dc5e7a9f678b6

11 years agoam 083bfa5a: Merge "Remove dead DateUtils code that was never in an API level."
Elliott Hughes [Tue, 26 Mar 2013 22:34:25 +0000 (15:34 -0700)]
am 083bfa5a: Merge "Remove dead DateUtils code that was never in an API level."

* commit '083bfa5a4cc867a62723537fc6f9a5213865bb19':
  Remove dead DateUtils code that was never in an API level.

11 years agoMatch tests to new API.
Amith Yamasani [Tue, 26 Mar 2013 22:32:29 +0000 (15:32 -0700)]
Match tests to new API.

Change-Id: I9a537a437c721ae64d9307b889b9de5d5429670f

11 years agoMerge "Device Owner, a special kind of device admin" into jb-mr2-dev
Amith Yamasani [Tue, 26 Mar 2013 22:26:38 +0000 (22:26 +0000)]
Merge "Device Owner, a special kind of device admin" into jb-mr2-dev

11 years agoMerge "Remove dead DateUtils code that was never in an API level."
Elliott Hughes [Tue, 26 Mar 2013 22:25:22 +0000 (22:25 +0000)]
Merge "Remove dead DateUtils code that was never in an API level."

11 years agoAvoid multiple font cache texture uploads
Romain Guy [Tue, 26 Mar 2013 22:05:58 +0000 (15:05 -0700)]
Avoid multiple font cache texture uploads
Bug #8378964

This change defers drawing into layers until after the renderer for FBO0
is ready to draw. At that point, all the precaching is done which means
all glyphs can be uploaded at once in the font caches.

Change-Id: Ie1f7a7ff30f76f06fb3dbc72c7d05e66207d1ecb

11 years agoChange wm commands to return size and density info.
Dianne Hackborn [Tue, 26 Mar 2013 22:24:24 +0000 (15:24 -0700)]
Change wm commands to return size and density info.

Change-Id: Id25722fe5f0cd9470d04d657f067e5ad29927c98

11 years agoRemove dead DateUtils code that was never in an API level.
Elliott Hughes [Tue, 26 Mar 2013 22:11:28 +0000 (15:11 -0700)]
Remove dead DateUtils code that was never in an API level.

Also rewrite @deprecated comments to use an initial capital so they
look right in the generated documentation.

Also improve formatIpAddress documentation.

Change-Id: I317ebe411ef76e16a4535318ce73e00b63af38da

11 years agoMerge "Fix string for tablet" into jb-mr2-dev
Irfan Sheriff [Tue, 26 Mar 2013 22:11:11 +0000 (22:11 +0000)]
Merge "Fix string for tablet" into jb-mr2-dev

11 years agoDevice Owner, a special kind of device admin
Amith Yamasani [Mon, 25 Mar 2013 00:39:28 +0000 (17:39 -0700)]
Device Owner, a special kind of device admin

A Device Owner cannot be uninstalled and is available to all users. It must
be registered before the device_provisioned flag is set.

Device admins can be disabled until used, but visible to device policy
manager, so that users wont be bothered with update requests.

Opened up a few related APIs for use by a system-installed Device Owner.

Change-Id: I847b5fe68c0f724863f778a67602b5bddc79d8e5

11 years agoam 145e60b3: am 6c75deb5: Merge "Remove the fixed-length buffer in DdmHandleNativeHea...
Elliott Hughes [Tue, 26 Mar 2013 21:58:10 +0000 (14:58 -0700)]
am 145e60b3: am 6c75deb5: Merge "Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo."

* commit '145e60b3e31f8daaf8e12dba0668c12e47968dd1':
  Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo.

11 years agoam 6c75deb5: Merge "Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo."
Elliott Hughes [Tue, 26 Mar 2013 21:56:03 +0000 (14:56 -0700)]
am 6c75deb5: Merge "Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo."

* commit '6c75deb5050c7fdde15b04aa96aa61c7b586e1f9':
  Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo.

11 years agoMerge "Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo."
Elliott Hughes [Tue, 26 Mar 2013 21:39:51 +0000 (21:39 +0000)]
Merge "Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo."

11 years agoDeliver key repeats for artificial dpad events
Michael Wright [Tue, 26 Mar 2013 20:11:30 +0000 (13:11 -0700)]
Deliver key repeats for artificial dpad events

Bug: 8425219
Change-Id: Ib41b06ed40d43f2e30ce2a647871a76cea80177b

11 years agoMerge "Update TrafficStats docs to reflect behavior." into jb-mr2-dev
Jeff Sharkey [Tue, 26 Mar 2013 21:20:19 +0000 (21:20 +0000)]
Merge "Update TrafficStats docs to reflect behavior." into jb-mr2-dev

11 years agoFix string for tablet
Irfan Sheriff [Tue, 26 Mar 2013 21:17:28 +0000 (14:17 -0700)]
Fix string for tablet

Bug: 7467441
Change-Id: I77661097a8562d789089b81bc8b3ae93ff6ddcc4

11 years agoMerge "Add yuv get" into jb-mr2-dev
Jason Sams [Tue, 26 Mar 2013 21:15:35 +0000 (21:15 +0000)]
Merge "Add yuv get" into jb-mr2-dev

11 years agoMerge "Fix clearing linkproperties on disconnect" into jb-mr2-dev
Irfan Sheriff [Tue, 26 Mar 2013 20:47:25 +0000 (20:47 +0000)]
Merge "Fix clearing linkproperties on disconnect" into jb-mr2-dev

11 years agoUpdate TrafficStats docs to reflect behavior.
Jeff Sharkey [Tue, 26 Mar 2013 20:46:05 +0000 (13:46 -0700)]
Update TrafficStats docs to reflect behavior.

Bug: 8399623
Change-Id: If9ccd305e8a077f318a09ac1bb160b8efbf903aa

11 years agoFix clearing linkproperties on disconnect
Irfan Sheriff [Tue, 26 Mar 2013 20:38:57 +0000 (13:38 -0700)]
Fix clearing linkproperties on disconnect

Bug: 5472644
Change-Id: If2b32b16fd3d65f1da12a9c5a8083d50125283d5

11 years agoAdd yuv get
Jason Sams [Tue, 26 Mar 2013 20:27:37 +0000 (13:27 -0700)]
Add yuv get

Change-Id: I6df5c0a8129283c0ad600b232790da10c395b479

11 years agoRemove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo.
Elliott Hughes [Tue, 26 Mar 2013 20:18:52 +0000 (13:18 -0700)]
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

11 years agoMerge "Remove misleading documentation from SystemClock" into jb-mr2-dev
Michael Wright [Tue, 26 Mar 2013 20:13:16 +0000 (20:13 +0000)]
Merge "Remove misleading documentation from SystemClock" into jb-mr2-dev

11 years agoMerge "It helps to catch the right exception." into jb-mr2-dev
Jeff Sharkey [Tue, 26 Mar 2013 17:29:43 +0000 (17:29 +0000)]
Merge "It helps to catch the right exception." into jb-mr2-dev

11 years agoIt helps to catch the right exception.
Jeff Sharkey [Tue, 26 Mar 2013 17:29:01 +0000 (10:29 -0700)]
It helps to catch the right exception.

Bug: 7238149
Change-Id: I7b60ec44d1d1d5ece8a871cb089f811b611f4a4a

11 years agoam 3e904d62: am e4ba94e5: am e64253fb: am 0e84afdb: am 1be81a96: am 98827948: Merge...
Joe Malin [Tue, 26 Mar 2013 16:42:51 +0000 (09:42 -0700)]
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

11 years agoam e4ba94e5: am e64253fb: am 0e84afdb: am 1be81a96: am 98827948: Merge "Android Train...
Joe Malin [Tue, 26 Mar 2013 16:41:30 +0000 (09:41 -0700)]
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

11 years agoam e64253fb: am 0e84afdb: am 1be81a96: am 98827948: Merge "Android Training: Accessin...
Joe Malin [Tue, 26 Mar 2013 16:39:23 +0000 (09:39 -0700)]
am e64253fb: am 0e84afdb: am 1be81a96: am 98827948: Merge "Android Training: Accessing Contacts" into jb-mr1-dev

* commit 'e64253fbcaa1a8eae4dc5e3d52e8404f40e853ff':
  Android Training: Accessing Contacts

11 years agoam 0e84afdb: am 1be81a96: am 98827948: Merge "Android Training: Accessing Contacts...
Joe Malin [Tue, 26 Mar 2013 16:37:58 +0000 (09:37 -0700)]
am 0e84afdb: am 1be81a96: am 98827948: Merge "Android Training: Accessing Contacts" into jb-mr1-dev

* commit '0e84afdb946613ef3ccfd40f9eccf98eaf3f1521':
  Android Training: Accessing Contacts

11 years agoam 1be81a96: am 98827948: Merge "Android Training: Accessing Contacts" into jb-mr1-dev
Joe Malin [Tue, 26 Mar 2013 16:36:26 +0000 (09:36 -0700)]
am 1be81a96: am 98827948: Merge "Android Training: Accessing Contacts" into jb-mr1-dev

* commit '1be81a96bbd43133eb70ce52515d5cc91d270bc8':
  Android Training: Accessing Contacts

11 years agoam 98827948: Merge "Android Training: Accessing Contacts" into jb-mr1-dev
Joe Malin [Tue, 26 Mar 2013 16:33:51 +0000 (09:33 -0700)]
am 98827948: Merge "Android Training: Accessing Contacts" into jb-mr1-dev

* commit '98827948f1911af89687d991c5549ec1b8b8549a':
  Android Training: Accessing Contacts

11 years agoMerge "Android Training: Accessing Contacts" into jb-mr1-dev
Joe Malin [Tue, 26 Mar 2013 16:31:21 +0000 (16:31 +0000)]
Merge "Android Training: Accessing Contacts" into jb-mr1-dev

11 years agoam 9fa57b74: am 2aee33c1: Merge "BackupManagerService files need new security labeling."
Geremy Condra [Tue, 26 Mar 2013 05:29:10 +0000 (22:29 -0700)]
am 9fa57b74: am 2aee33c1: Merge "BackupManagerService files need new security labeling."

* commit '9fa57b74d8acb99c86f761a98f6e76998de8aff2':
  BackupManagerService files need new security labeling.

11 years agoam 2aee33c1: Merge "BackupManagerService files need new security labeling."
Geremy Condra [Tue, 26 Mar 2013 05:26:56 +0000 (22:26 -0700)]
am 2aee33c1: Merge "BackupManagerService files need new security labeling."

* commit '2aee33c1cdf89c0754bb660cd2e0ec95a007d4a8':
  BackupManagerService files need new security labeling.

11 years agoMerge "BackupManagerService files need new security labeling."
Geremy Condra [Tue, 26 Mar 2013 05:10:37 +0000 (05:10 +0000)]
Merge "BackupManagerService files need new security labeling."

11 years agoMerge "Fix the build" into jb-mr2-dev
Fabrice Di Meglio [Tue, 26 Mar 2013 02:19:34 +0000 (02:19 +0000)]
Merge "Fix the build" into jb-mr2-dev

11 years agoFix the build
Fabrice Di Meglio [Tue, 26 Mar 2013 01:30:59 +0000 (18:30 -0700)]
Fix the build

See bug #8200928

Change-Id: I014590f41d74f16cf3c3de618ef08ee490bf05aa

11 years agoMerge "Fix touch processing for Overlay views" into jb-mr2-dev
Chet Haase [Tue, 26 Mar 2013 01:55:12 +0000 (01:55 +0000)]
Merge "Fix touch processing for Overlay views" into jb-mr2-dev

11 years agoMerge "Add seinfo parsing to PackageManagerService." into jb-mr2-dev
Geremy Condra [Tue, 26 Mar 2013 01:38:55 +0000 (01:38 +0000)]
Merge "Add seinfo parsing to PackageManagerService." into jb-mr2-dev

11 years agoFix touch processing for Overlay views
Chet Haase [Sat, 23 Mar 2013 00:05:55 +0000 (17:05 -0700)]
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

11 years agoam 33d388b0: am adc2d143: am 81f7ff7c: am c15f817e: am 81aaf3b0: Merge "Doc update...
kmccormick [Tue, 26 Mar 2013 01:19:49 +0000 (18:19 -0700)]
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.

11 years agoFix issue #8470131: Process thrash kills battery
Dianne Hackborn [Tue, 26 Mar 2013 00:49:36 +0000 (17:49 -0700)]
Fix issue #8470131: Process thrash kills battery

Protect app widget broadcasts from abuse.

In this case the app was sending an APPWIDGET_UPDATE broadcast
without specifying a target, which (a) should not be allowed (you
should not be able to send updates to other apps), and (b) resulted
in every single potential app widget in the system being launched...
which was about 75 of them.

Change-Id: I9d48733610ce6d5a7c32e69a3e06b9f33bd79a34

11 years agoMerge "Handle external storage errors uniformly." into jb-mr2-dev
Jeff Sharkey [Tue, 26 Mar 2013 00:37:02 +0000 (00:37 +0000)]
Merge "Handle external storage errors uniformly." into jb-mr2-dev

11 years agoHandle external storage errors uniformly.
Jeff Sharkey [Tue, 26 Mar 2013 00:30:16 +0000 (17:30 -0700)]
Handle external storage errors uniformly.

Bug: 6777728
Change-Id: I021db160bc959fdf02bfd448edf977961bd1d9d0

11 years agoAdd seinfo parsing to PackageManagerService.
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>
11 years agoMerge "Fix bug #8200928 ExpandableListView should be RTL-aware" into jb-mr2-dev
Fabrice Di Meglio [Tue, 26 Mar 2013 00:27:22 +0000 (00:27 +0000)]
Merge "Fix bug #8200928 ExpandableListView should be RTL-aware" into jb-mr2-dev

11 years agoMerge "AudioService: rewrite sound effects loading" into jb-mr2-dev
Eric Laurent [Mon, 25 Mar 2013 23:39:52 +0000 (23:39 +0000)]
Merge "AudioService: rewrite sound effects loading" into jb-mr2-dev

11 years agoAudioService: rewrite sound effects loading
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

11 years agoam adc2d143: am 81f7ff7c: am c15f817e: am 81aaf3b0: Merge "Doc update: fix bug in...
kmccormick [Mon, 25 Mar 2013 23:21:03 +0000 (16:21 -0700)]
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.

11 years agoam 81f7ff7c: am c15f817e: am 81aaf3b0: Merge "Doc update: fix bug in Calendar Provide...
kmccormick [Mon, 25 Mar 2013 23:18:24 +0000 (16:18 -0700)]
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.

11 years agoam c15f817e: am 81aaf3b0: Merge "Doc update: fix bug in Calendar Provider docs."...
kmccormick [Mon, 25 Mar 2013 23:16:48 +0000 (16:16 -0700)]
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.

11 years agoam 81aaf3b0: Merge "Doc update: fix bug in Calendar Provider docs." into jb-mr1.1...
kmccormick [Mon, 25 Mar 2013 23:15:11 +0000 (16:15 -0700)]
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.

11 years agoMerge "Doc update: fix bug in Calendar Provider docs." into jb-mr1.1-docs
kmccormick [Mon, 25 Mar 2013 23:11:30 +0000 (23:11 +0000)]
Merge "Doc update: fix bug in Calendar Provider docs." into jb-mr1.1-docs

11 years agoDoc update: fix bug in Calendar Provider docs.
kmccormick [Mon, 25 Mar 2013 23:00:56 +0000 (16:00 -0700)]
Doc update: fix bug in Calendar Provider docs.

"Bug: 8472477"

Change-Id: Ib2d8b27a0343db45bb1efa326bd573c383573af2

11 years agoam a9af6c37: (-s ours) am 48718c85: Merge "Proper security labeling of multi-user...
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.

11 years agoam 40a85bbc: (-s ours) am 4bcea122: Merge "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.

11 years agoam 48718c85: Merge "Proper security labeling of multi-user data directories."
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.

11 years agoam 4bcea122: Merge "Add seinfo parsing to PackageManagerService."
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.

11 years agoMerge "AppSecurityPermissions: Modify isDisplayablePermission" into jb-mr2-dev
Nick Kralevich [Mon, 25 Mar 2013 21:32:45 +0000 (21:32 +0000)]
Merge "AppSecurityPermissions: Modify isDisplayablePermission" into jb-mr2-dev

11 years agoAppSecurityPermissions: Modify isDisplayablePermission
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

11 years agoMerge "Remove dead code." into jb-mr2-dev
Nick Kralevich [Mon, 25 Mar 2013 21:27:18 +0000 (21:27 +0000)]
Merge "Remove dead code." into jb-mr2-dev

11 years agoam 6e7a6b10: am 0e3411b2: am d738f49a: am b559b58e: am 5769c0b8: am 9432f83c: am...
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

11 years agoam 0e3411b2: am d738f49a: am b559b58e: am 5769c0b8: am 9432f83c: am 7b3ac9ad: am...
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

11 years agoMerge "Fix bug #8447352 Contextual ActionBar vertical divider is incorrectly aligned...
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

11 years agoam d738f49a: am b559b58e: am 5769c0b8: am 9432f83c: am 7b3ac9ad: am 0cb27e28: Validat...
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

11 years agoMerge "Proper security labeling of multi-user data directories."
Geremy Condra [Mon, 25 Mar 2013 21:17:46 +0000 (21:17 +0000)]
Merge "Proper security labeling of multi-user data directories."

11 years agoam b559b58e: am 5769c0b8: am 9432f83c: am 7b3ac9ad: am 0cb27e28: Validate restored...
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

11 years agoam 5769c0b8: am 9432f83c: am 7b3ac9ad: am 0cb27e28: Validate restored file paths...
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

11 years agoam 9432f83c: am 7b3ac9ad: am 0cb27e28: Validate restored file paths against their...
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

11 years agoam 7b3ac9ad: am 0cb27e28: 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

11 years agoMerge "Add seinfo parsing to PackageManagerService."
Geremy Condra [Mon, 25 Mar 2013 21:07:37 +0000 (21:07 +0000)]
Merge "Add seinfo parsing to PackageManagerService."

11 years agoam 0cb27e28: Validate restored file paths against their nominal domain
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

11 years agoValidate 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

11 years agoMerge "Validate restored file paths against their nominal domain" into jb-mr2-dev
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

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Mon, 25 Mar 2013 20:19:09 +0000 (20:19 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

11 years agoMerge "Load crypto plugins from additional shared libraries" 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

11 years agoValidate 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

Change-Id: Ib16d740a001adf4f9cb9ccaa31066ac7cadfb430

11 years agoRemove dead code.
Nick Kralevich [Mon, 25 Mar 2013 18:42:48 +0000 (11:42 -0700)]
Remove dead code.

This code is never called.

Change-Id: I2ed3fee93004e967bfb2a3080106c3950bf43ce2

11 years agoImport translations. DO NOT MERGE
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

11 years agoMerge "PackageManagerService: update grantPermission / revokePermission" into jb...
Nick Kralevich [Mon, 25 Mar 2013 18:14:04 +0000 (18:14 +0000)]
Merge "PackageManagerService: update grantPermission / revokePermission" into jb-mr2-dev

11 years agoPackageManagerService: update grantPermission / revokePermission
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

11 years agoMerge "AppSecurityPermissions: minor code cleanup" into jb-mr2-dev
Nick Kralevich [Mon, 25 Mar 2013 17:37:35 +0000 (17:37 +0000)]
Merge "AppSecurityPermissions: minor code cleanup" into jb-mr2-dev

11 years agoAndroid Training: Accessing Contacts
Joe Malin [Tue, 15 Jan 2013 23:06:08 +0000 (15:06 -0800)]
Android Training: Accessing Contacts

Change-Id: I4de9f2a9ef18415225e1c85d53602bbaacbb7bb6

11 years agoMerge "audio service: add config option for fixed volume" into jb-mr2-dev
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

11 years agoProper security labeling of multi-user data directories.
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>
11 years agoAdd seinfo parsing to PackageManagerService.
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>
11 years agoAppSecurityPermissions: minor code cleanup
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

11 years agoMerge "App ops: don't crash when provide read access is off." into jb-mr2-dev
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

11 years agoApp ops: don't crash when provide read access is off.
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

11 years agoMerge "Implement #8323587, #8323342, #8323590: new features." into jb-mr2-dev
Dianne Hackborn [Sat, 23 Mar 2013 01:26:07 +0000 (01:26 +0000)]
Merge "Implement #8323587, #8323342, #8323590: new features." into jb-mr2-dev

11 years agoFix bug #8447352 Contextual ActionBar vertical divider is incorrectly aligned in...
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