OSDN Git Service

android-x86/frameworks-base.git
11 years agoInitial implementation of IntentFirewall functionality
Ben Gruver [Wed, 3 Apr 2013 04:18:41 +0000 (21:18 -0700)]
Initial implementation of IntentFirewall functionality

This has the full filter functionality, but is currently only
able to block Activity intents. Logging intents, or blocking
service/broadcast intents is not yet implemented.

Change-Id: Ied3d8dedf982e17bcbdff3e328eeb87477954df7

11 years agoMerge "Make isHostRoute match only host routes" into jb-mr2-dev
Lorenzo Colitti [Wed, 27 Mar 2013 21:58:06 +0000 (21:58 +0000)]
Merge "Make isHostRoute match only host routes" into jb-mr2-dev

11 years agoMerge "Disable some noisy error logs." into jb-mr2-dev
Jeff Brown [Wed, 27 Mar 2013 21:57:33 +0000 (21:57 +0000)]
Merge "Disable some noisy error logs." into jb-mr2-dev

11 years agoMerge "Sync APIs use seconds instead of ms." into jb-mr2-dev
Jeff Sharkey [Wed, 27 Mar 2013 21:48:42 +0000 (21:48 +0000)]
Merge "Sync APIs use seconds instead of ms." into jb-mr2-dev

11 years agoSync APIs use seconds instead of ms.
Jeff Sharkey [Wed, 27 Mar 2013 21:46:55 +0000 (14:46 -0700)]
Sync APIs use seconds instead of ms.

Bug: 7668972
Change-Id: I7b253fe17d9539695adc474a69546645586b5f1a

11 years agoMerge "Revert "Remove all public mention of RS graphics from docs."" into jb-mr2-dev
Tim Murray [Wed, 27 Mar 2013 21:32:31 +0000 (21:32 +0000)]
Merge "Revert "Remove all public mention of RS graphics from docs."" into jb-mr2-dev

11 years agoRevert "Remove all public mention of RS graphics from docs."
Tim Murray [Wed, 27 Mar 2013 21:31:28 +0000 (21:31 +0000)]
Revert "Remove all public mention of RS graphics from docs."

This reverts commit d72f932b8cbf461ebb79c249ce92b9b811122190

Change-Id: I056b13d0b2beb508e4215bc0d289cf3e76a3a986

11 years agoMerge "Remove all public mention of RS graphics from docs." into jb-mr2-dev
Tim Murray [Wed, 27 Mar 2013 21:01:37 +0000 (21:01 +0000)]
Merge "Remove all public mention of RS graphics from docs." into jb-mr2-dev

11 years agoMerge "Set ignore flag during deferred savelayer" into jb-mr2-dev
Chris Craik [Wed, 27 Mar 2013 19:47:59 +0000 (19:47 +0000)]
Merge "Set ignore flag during deferred savelayer" into jb-mr2-dev

11 years agoDisable some noisy error logs.
Jeff Brown [Wed, 27 Mar 2013 19:34:30 +0000 (12:34 -0700)]
Disable some noisy error logs.

Disabled some error logs that occur when an input channel is
closed remotely by its peer.  These can happen during normal
course of operations because the act of removing windows or
finishing IME sessions is asynchronous so both peers may react
to the change independently at different times.

The coordination with the input dispatcher is designed to
avoid logging these errors.  However it's not possible to achieve
the same coordination with the IME so we might as well silence
the errors since they don't tell us anything useful.

If something truly bad happens then one of two things will occur:

1. The system will realize that the process crashed because
   of a DeadObjectException or other error, so it will take
   measures to clean up.

2. If the error was spurious and non-fatal (how?) then at worst
   an ANR may occur because the consumer stopped reading from
   the input channel.  However this has never been observed
   and I doubt it's even possible.

Change-Id: I11a05d6d75e63e91be003971a544069b3a0d77f4

11 years agoMerge "Expose data_usage_stat table in ContactsContract" into jb-mr2-dev
Yorke Lee [Wed, 27 Mar 2013 19:14:09 +0000 (19:14 +0000)]
Merge "Expose data_usage_stat table in ContactsContract" into jb-mr2-dev

11 years agoExpose data_usage_stat table in ContactsContract
Yorke Lee [Tue, 12 Mar 2013 19:48:06 +0000 (12:48 -0700)]
Expose data_usage_stat table in ContactsContract

Bug: 8124079
Change-Id: Ie60e489f08be270b9f3a4866c488a5e0598ceb26

11 years agoam bfd15fa0: am 6b96e2f0: Merge "Two REMOVE_PROVIDER messages caused by race condition."
Dianne Hackborn [Wed, 27 Mar 2013 18:37:08 +0000 (11:37 -0700)]
am bfd15fa0: am 6b96e2f0: Merge "Two REMOVE_PROVIDER messages caused by race condition."

* commit 'bfd15fa00557ea78567a30fe260dea62c37bd5a0':
  Two REMOVE_PROVIDER messages caused by race condition.

11 years agoSet ignore flag during deferred savelayer
Chris Craik [Wed, 27 Mar 2013 01:55:15 +0000 (18:55 -0700)]
Set ignore flag during deferred savelayer

bug:8471552

Additionally, add ignore check for draw functor

In deferred mode, if we don't set ignore, a 0 alpha displayList won't
be quickRejected, and not only would its contents be needlessly
deferred, but upon playback any functors would be drawn, ignoring the
state of the snapshot.

Change-Id: Ib1edb3252080f674254086edee6f965f0efcce78

11 years agoMerge "AudioEffect types in SDK" into jb-mr2-dev
Jean-Michel Trivi [Wed, 27 Mar 2013 17:35:44 +0000 (17:35 +0000)]
Merge "AudioEffect types in SDK" into jb-mr2-dev

11 years agoMerge "Allow leading slash in path argument for addURI() method." into jb-mr2-dev
Chiao Cheng [Wed, 27 Mar 2013 17:18:29 +0000 (17:18 +0000)]
Merge "Allow leading slash in path argument for addURI() method." into jb-mr2-dev

11 years agoAudioEffect types in SDK
Jean-Michel Trivi [Tue, 26 Mar 2013 22:37:28 +0000 (15:37 -0700)]
AudioEffect types in SDK

Not all effect types are defined by OpenSL ES. Add the full UUID
 effect identifier in the superclass of all audio effects.

bug 8113082

Change-Id: I8dfc6cdcfd2a145e792fb3669e6132e6f19d1c16

11 years agoMerge "Add new apis to CP2" into jb-mr2-dev
Yorke Lee [Wed, 27 Mar 2013 16:43:40 +0000 (16:43 +0000)]
Merge "Add new apis to CP2" into jb-mr2-dev

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 27 Mar 2013 16:38:07 +0000 (16:38 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

11 years agoMerge "AppSecurityPermissions: Add isGranted to isDisplayablePermission" into jb...
Nick Kralevich [Wed, 27 Mar 2013 16:20:26 +0000 (16:20 +0000)]
Merge "AppSecurityPermissions: Add isGranted to isDisplayablePermission" into jb-mr2-dev

11 years agoMerge "Add direct NDEF push API." into jb-mr2-dev
Martijn Coenen [Wed, 27 Mar 2013 16:04:47 +0000 (16:04 +0000)]
Merge "Add direct NDEF push API." into jb-mr2-dev

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 27 Mar 2013 15:35:28 +0000 (08:35 -0700)]
Import translations. DO NOT MERGE

Change-Id: I3115e513480f3a73084de898943db307a5294a08
Auto-generated-cl: translation import

11 years agoMake isHostRoute match only host routes
Lorenzo Colitti [Wed, 27 Mar 2013 04:07:18 +0000 (13:07 +0900)]
Make isHostRoute match only host routes

Currently, isHostRoute returns true iff the gateway address is
the unspecified address (0.0.0.0 or ::). Thus, it will return
true for any route that has no gateway (e.g., a route pointing at
a point-to-point interface), even if the route is not a host
route.

Fix this by checking the prefix length instead. This should be
safe because:

1. mDestination cannot be null, since it's created using new.
2. Host routes created using makeHostRoute (which is what
   ConnectivityService calls) always have the correct prefix
   lengths (/32 or /128) set.

Bug: 8276725
Change-Id: I14285398823fa6c312349128c7cc216cad4a84c9

11 years agoMerge "Benchmarks for IndentingPrintWriter." into jb-mr2-dev
Jeff Sharkey [Wed, 27 Mar 2013 03:18:06 +0000 (03:18 +0000)]
Merge "Benchmarks for IndentingPrintWriter." into jb-mr2-dev

11 years agoBenchmarks for IndentingPrintWriter.
Jeff Sharkey [Wed, 27 Mar 2013 00:37:46 +0000 (17:37 -0700)]
Benchmarks for IndentingPrintWriter.

Current timings on a mako listed below, which show minimal overhead
compared to writing directly. The increased code readability and
automatic indenting is worth the overhead.

Also worth noting is that writing concatenated strings is
substantially faster than printing components separately.

           benchmark      us linear runtime
       ComplexDirect 10712.7 =========================
    ComplexIndenting 12623.7 ==============================
       PairIndenting    45.8 =
             PairRaw    82.1 =
        SimpleDirect   282.2 =
     SimpleIndenting   294.4 =

Change-Id: I7c38690c14b017fa46248ebb0be69f6beff03371

11 years agoMerge "Use input transport for communications between app and IME." into jb-mr2-dev
Jeff Brown [Wed, 27 Mar 2013 02:43:54 +0000 (02:43 +0000)]
Merge "Use input transport for communications between app and IME." into jb-mr2-dev

11 years agoMerge "Fix build." into jb-mr2-dev
Dianne Hackborn [Wed, 27 Mar 2013 01:01:35 +0000 (01:01 +0000)]
Merge "Fix build." into jb-mr2-dev

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

Change-Id: I51b87ee5f0b7f396aad7e239893d9f0764f04bb6

11 years agoam 6b96e2f0: Merge "Two REMOVE_PROVIDER messages caused by race condition."
Dianne Hackborn [Wed, 27 Mar 2013 00:46:21 +0000 (17:46 -0700)]
am 6b96e2f0: Merge "Two REMOVE_PROVIDER messages caused by race condition."

* commit '6b96e2f0006b5c33973b3500d3bb72a8c7a3bd38':
  Two REMOVE_PROVIDER messages caused by race condition.

11 years agoMerge "Fix bug #8480245 ViewGroup layout margins can be wrong in RTL mode" into jb...
Fabrice Di Meglio [Wed, 27 Mar 2013 00:44:48 +0000 (00:44 +0000)]
Merge "Fix bug #8480245 ViewGroup layout margins can be wrong in RTL mode" into jb-mr2-dev

11 years agoMerge "Path precaching creates duplicate cache entries Bug #8478275" into jb-mr2-dev
Romain Guy [Wed, 27 Mar 2013 00:41:45 +0000 (00:41 +0000)]
Merge "Path precaching creates duplicate cache entries Bug #8478275" into jb-mr2-dev

11 years agoPath precaching creates duplicate cache entries
Romain Guy [Wed, 27 Mar 2013 00:29:51 +0000 (17:29 -0700)]
Path precaching creates duplicate cache entries
Bug #8478275

Change-Id: Ib541ea051e42e01cc0d277790e9c09de38ef72ee

11 years agoFix bug #8480245 ViewGroup layout margins can be wrong in RTL mode
Fabrice Di Meglio [Tue, 26 Mar 2013 22:50:24 +0000 (15:50 -0700)]
Fix bug #8480245 ViewGroup layout margins can be wrong in RTL mode

- fix resolution of MarginLayoutParams
- update related RelativeLayout code

Change-Id: I261f127a8897f60d316fed2a73e6e76020e542cc

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 agoAppSecurityPermissions: Add isGranted to isDisplayablePermission
Nick Kralevich [Tue, 26 Mar 2013 23:59:26 +0000 (16:59 -0700)]
AppSecurityPermissions: Add isGranted to isDisplayablePermission

Modify isDisplayablePermission to display a permission if the
app update will grant a new optional permission to the app.

Change-Id: Ic647826b0c48f9f7ec8e4f69b90197211f83278d

11 years agoMerge "Two REMOVE_PROVIDER messages caused by race condition."
Dianne Hackborn [Wed, 27 Mar 2013 00:17:41 +0000 (00:17 +0000)]
Merge "Two REMOVE_PROVIDER messages caused by race condition."

11 years agoTwo REMOVE_PROVIDER messages caused by race condition.
Guobin Zhang [Thu, 21 Mar 2013 05:57:11 +0000 (13:57 +0800)]
Two REMOVE_PROVIDER messages caused by race condition.

Fix a bug in unstable ContentProvider.
IllegalStateException: ref counts can't go to zero here: stable=0 unstable=0
IllegalStateException: unstable count < 0: -1

There is a race between main thread and background database thread. Main thread
is responsible for handling the REMOVE_PROVIDER message. Database thread starts
insert or query request again and again. acquireProvider in db thread will often
snatch provider from the jaws of death, sometime it fails to remove REMOVE_PROVIDER
which is already fired out from MessageQueue. But completeRemoveProvider in main
thread gets suspended when trying to execute the critical section. If db thread
released the provider before main thread resumes the execution, then two
REMOVE_PROVIDER messages will be executed.

Change-Id: I8588aa1d1a8bc444dcd2adf6f8bc3f055cebbdc4
Signed-off-by: Guobin Zhang <guobin.zhang@intel.com>
11 years agoAdd direct NDEF push API.
Martijn Coenen [Wed, 27 Feb 2013 17:21:22 +0000 (09:21 -0800)]
Add direct NDEF push API.

Hidden for now. Also, modified callback that is called
from NfcService to pass all data in a single object
(BeamShareData). This avoids having to do multiple IPCs
at touch time.

Bug: 5134061
Change-Id: I235f608cef9935041b33b4b7a6980f109c15576c

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 agoUse input transport for communications between app and IME.
Jeff Brown [Tue, 26 Mar 2013 22:42:39 +0000 (15:42 -0700)]
Use input transport for communications between app and IME.

The input method manager service now supplies an input channel for
communication while creating an IME session on behalf of the
application.

This change significanly reduces the overhead of IME event dispatch
by using a standard input channel to send input events rather than
using binder.  This results in fewer thread context switches
and fewer object allocations.

What's more, the IME may perform additional batching of the motion
events that it receives which may help it catch up if it is
getting behind while processing them.

Bug: 7984576
Bug: 8473020
Change-Id: Ibe26311edd0060cdcae80194f1753482e635786f

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 agoAllow leading slash in path argument for addURI() method.
Chiao Cheng [Wed, 20 Mar 2013 20:12:41 +0000 (13:12 -0700)]
Allow leading slash in path argument for addURI() method.

The original documentation for this class indicated a leading slash was possible
but the code did not support it.  Since then, the docs were changed to reflect
what the code does.

The purpose of this change is to allow the use of uri.getPath() as an argument.
With this change, the following can be done

matcher.addURI(ContactsContract.AUTHORITY,
        ContactsContract.CONTENT_FILTER_URI.getPath(), CONTACTS_FILTER)

instead of

matcher.addURI(ContactsContract.AUTHORITY,
        "contacts/filter", CONTACTS_FILTER)

Change-Id: I76a9e3133365be9fe7a8de86eae57f9eea1cd2a3

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 agoRemove all public mention of RS graphics from docs.
Tim Murray [Thu, 14 Mar 2013 19:11:18 +0000 (12:11 -0700)]
Remove all public mention of RS graphics from docs.

Change-Id: I50b29c89ae80ba3ae7b12dc60fee8585e17ed560

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.