OSDN Git Service

android-x86/frameworks-native.git
9 years agoMark all InputReaderContext methods as pure virtual
Michael Wright [Fri, 17 Apr 2015 17:35:15 +0000 (18:35 +0100)]
Mark all InputReaderContext methods as pure virtual

Also, fix the build.

Change-Id: I45d3daa8c0710b2f9421e8ffd011d2d39c05e030

9 years agoFuse stylus and touch screen data.
Michael Wright [Sat, 14 Mar 2015 00:32:02 +0000 (17:32 -0700)]
Fuse stylus and touch screen data.

TODO: Ensure we dispatch new pressure and button data when stylus
is stationary.

Change-Id: I10a665a9b81ff4b9acd01bf72f0fc2e0c2abc203

9 years agoAdd method stubs for input device properties.
Tim Kilbourn [Mon, 6 Apr 2015 20:48:50 +0000 (13:48 -0700)]
Add method stubs for input device properties.

Change-Id: Icd785cb55ae2b225102fa249240837a91a41aae3

9 years agoMerge "am e06cba2..e06cba2 from mirror-m-wireless-internal-release"
Vinit Deshpande [Thu, 16 Apr 2015 02:36:02 +0000 (02:36 +0000)]
Merge "am e06cba2..e06cba2 from mirror-m-wireless-internal-release"

9 years agoam 66dc4ee3: am b47584f4: am 2e398e64: Merge "SF: Permit changing DispSync offsets...
Dan Stoza [Wed, 15 Apr 2015 22:16:03 +0000 (22:16 +0000)]
am 66dc4ee3: am b47584f4: am 2e398e64: Merge "SF: Permit changing DispSync offsets at runtime"

* commit '66dc4ee3729c4e6fea624805a1e58843ce920477':
  SF: Permit changing DispSync offsets at runtime

9 years agoam b47584f4: am 2e398e64: Merge "SF: Permit changing DispSync offsets at runtime"
Dan Stoza [Wed, 15 Apr 2015 21:54:30 +0000 (21:54 +0000)]
am b47584f4: am 2e398e64: Merge "SF: Permit changing DispSync offsets at runtime"

* commit 'b47584f46bd850723679d9212f66df1951bbdf5d':
  SF: Permit changing DispSync offsets at runtime

9 years agoam 2e398e64: Merge "SF: Permit changing DispSync offsets at runtime"
Dan Stoza [Wed, 15 Apr 2015 21:46:45 +0000 (21:46 +0000)]
am 2e398e64: Merge "SF: Permit changing DispSync offsets at runtime"

* commit '2e398e64b3bc827ec8caaa1457442a8b3d546aed':
  SF: Permit changing DispSync offsets at runtime

9 years agoam 19f06de0: am 40b2a8b4: am e7d20eb0: Merge "SurfaceFlinger: Pass surface damage...
Dan Stoza [Wed, 15 Apr 2015 21:42:44 +0000 (21:42 +0000)]
am 19f06de0: am 40b2a8b4: am e7d20eb0: Merge "SurfaceFlinger: Pass surface damage to HWC"

* commit '19f06de0930e0f741ed113c37faf306fceee39bd':
  SurfaceFlinger: Pass surface damage to HWC

9 years agoam 057a561a: am 57a9f5a0: am fd5f41be: Merge "libgui: Pass surface damage through...
Dan Stoza [Wed, 15 Apr 2015 21:42:43 +0000 (21:42 +0000)]
am 057a561a: am 57a9f5a0: am fd5f41be: Merge "libgui: Pass surface damage through BufferQueue"

* commit '057a561afbf30ede99b5ec627deec7ee11701f6d':
  libgui: Pass surface damage through BufferQueue

9 years agoam a161b6ce: am c02377e6: am 4d769d8b: Merge "libui: Clean up Fence and Region flatte...
Dan Stoza [Wed, 15 Apr 2015 21:42:36 +0000 (21:42 +0000)]
am a161b6ce: am c02377e6: am 4d769d8b: Merge "libui: Clean up Fence and Region flattening"

* commit 'a161b6cee9253a17be6b8dc232b05a41fde0030a':
  libui: Clean up Fence and Region flattening

9 years agoam f5330845: am 0b2ac673: am 22412a34: Merge "libEGL: Add wrappers for partial update...
Dan Stoza [Wed, 15 Apr 2015 21:42:35 +0000 (21:42 +0000)]
am f5330845: am 0b2ac673: am 22412a34: Merge "libEGL: Add wrappers for partial update functions"

* commit 'f5330845f9c4f03cd65296bd30e2ee00f77e0dcf':
  libEGL: Add wrappers for partial update functions

9 years agoMerge "SF: Permit changing DispSync offsets at runtime"
Dan Stoza [Wed, 15 Apr 2015 21:37:19 +0000 (21:37 +0000)]
Merge "SF: Permit changing DispSync offsets at runtime"

9 years agoam 40b2a8b4: am e7d20eb0: Merge "SurfaceFlinger: Pass surface damage to HWC"
Dan Stoza [Wed, 15 Apr 2015 20:57:33 +0000 (20:57 +0000)]
am 40b2a8b4: am e7d20eb0: Merge "SurfaceFlinger: Pass surface damage to HWC"

* commit '40b2a8b48c8b760699bde3f29e3dbee76015cc98':
  SurfaceFlinger: Pass surface damage to HWC

9 years agoSF: Permit changing DispSync offsets at runtime
Dan Stoza [Tue, 14 Apr 2015 18:34:01 +0000 (11:34 -0700)]
SF: Permit changing DispSync offsets at runtime

This modifies EventThread such that its phase offsets for both
Choreographer and SurfaceFlinger may be modified at runtime. It also
plumbs this functionality up to the SurfaceFlinger debug interface so
that it is possible to rapidly test different offsets without
restarting the framework.

Change-Id: I426873f8553f931250dfebc9a8a4a78e9f1f4309

9 years agoam e7d20eb0: Merge "SurfaceFlinger: Pass surface damage to HWC"
Dan Stoza [Wed, 15 Apr 2015 20:46:35 +0000 (20:46 +0000)]
am e7d20eb0: Merge "SurfaceFlinger: Pass surface damage to HWC"

* commit 'e7d20eb000c1d342c8f5f58011023c0eb7cea6d5':
  SurfaceFlinger: Pass surface damage to HWC

9 years agoam 57a9f5a0: am fd5f41be: Merge "libgui: Pass surface damage through BufferQueue"
Dan Stoza [Wed, 15 Apr 2015 20:45:44 +0000 (20:45 +0000)]
am 57a9f5a0: am fd5f41be: Merge "libgui: Pass surface damage through BufferQueue"

* commit '57a9f5a05327de352896612caf85c991e65ca7be':
  libgui: Pass surface damage through BufferQueue

9 years agoam fd5f41be: Merge "libgui: Pass surface damage through BufferQueue"
Dan Stoza [Wed, 15 Apr 2015 20:35:02 +0000 (20:35 +0000)]
am fd5f41be: Merge "libgui: Pass surface damage through BufferQueue"

* commit 'fd5f41bee9bcb2df64c39ff0de7d684e43d90d9c':
  libgui: Pass surface damage through BufferQueue

9 years agoMerge "SurfaceFlinger: Pass surface damage to HWC"
Dan Stoza [Wed, 15 Apr 2015 20:34:50 +0000 (20:34 +0000)]
Merge "SurfaceFlinger: Pass surface damage to HWC"

9 years agoam c02377e6: am 4d769d8b: Merge "libui: Clean up Fence and Region flattening"
Dan Stoza [Wed, 15 Apr 2015 20:29:45 +0000 (20:29 +0000)]
am c02377e6: am 4d769d8b: Merge "libui: Clean up Fence and Region flattening"

* commit 'c02377e6fd1e7380816ce5c4902330226f20721a':
  libui: Clean up Fence and Region flattening

9 years agoam 0b2ac673: am 22412a34: Merge "libEGL: Add wrappers for partial update functions"
Dan Stoza [Wed, 15 Apr 2015 20:29:44 +0000 (20:29 +0000)]
am 0b2ac673: am 22412a34: Merge "libEGL: Add wrappers for partial update functions"

* commit '0b2ac673137128cd781ab304ab1cab20e9335f8e':
  libEGL: Add wrappers for partial update functions

9 years agoMerge "libgui: Pass surface damage through BufferQueue"
Dan Stoza [Wed, 15 Apr 2015 20:26:55 +0000 (20:26 +0000)]
Merge "libgui: Pass surface damage through BufferQueue"

9 years agoSurfaceFlinger: Pass surface damage to HWC
Dan Stoza [Mon, 23 Mar 2015 22:50:23 +0000 (15:50 -0700)]
SurfaceFlinger: Pass surface damage to HWC

Passes the surface damage from the incoming SurfaceFlingerConsumer
BufferQueue down to the hardware composer HAL interface, if the
HWC version number is 1.5 or greater.

Bug: 11239309
Change-Id: Ic4305210593874a8d6deba3319055b2b8c57e926

9 years agolibgui: Pass surface damage through BufferQueue
Dan Stoza [Tue, 17 Mar 2015 23:23:42 +0000 (16:23 -0700)]
libgui: Pass surface damage through BufferQueue

This change adds support for passing surface damage all of the way
down from the EGL interface through the consumer side of the
BufferQueue. Depends on system/core change
Ie645e6a52b37b5c1b3be19481e8348570d1aa62c

Bug: 11239309
Change-Id: I4457ea826e9ade4ec187f973851d855b7b93a31b

9 years agoam 4d769d8b: Merge "libui: Clean up Fence and Region flattening"
Dan Stoza [Wed, 15 Apr 2015 20:18:44 +0000 (20:18 +0000)]
am 4d769d8b: Merge "libui: Clean up Fence and Region flattening"

* commit '4d769d8bdc2fd57d34ab0fa4b9208ac0eb67cd61':
  libui: Clean up Fence and Region flattening

9 years agoam 22412a34: Merge "libEGL: Add wrappers for partial update functions"
Dan Stoza [Wed, 15 Apr 2015 20:18:43 +0000 (20:18 +0000)]
am 22412a34: Merge "libEGL: Add wrappers for partial update functions"

* commit '22412a34c6d61394bad2c6e75105ea42a0c496cb':
  libEGL: Add wrappers for partial update functions

9 years agoMerge "libui: Clean up Fence and Region flattening"
Dan Stoza [Wed, 15 Apr 2015 20:13:53 +0000 (20:13 +0000)]
Merge "libui: Clean up Fence and Region flattening"

9 years agoMerge "libEGL: Add wrappers for partial update functions"
Dan Stoza [Wed, 15 Apr 2015 20:08:35 +0000 (20:08 +0000)]
Merge "libEGL: Add wrappers for partial update functions"

9 years agolibui: Clean up Fence and Region flattening
Dan Stoza [Mon, 23 Mar 2015 20:46:14 +0000 (13:46 -0700)]
libui: Clean up Fence and Region flattening

Fence was flattening incorrectly, causing issues with any fields
flattened after it, and Region was relying on being the last object
flattened. This change addresses both.

Change-Id: If49de061de6e2f11f4d846b4d8c18627dfb7e109

9 years agolibEGL: Add wrappers for partial update functions
Dan Stoza [Thu, 19 Feb 2015 23:27:36 +0000 (15:27 -0800)]
libEGL: Add wrappers for partial update functions

This adds EGL wrapper functions for the following EGL extensions:
    EGL_EXT_buffer_age
    EGL_KHR_partial_update
    EGL_KHR_swap_buffers_with_damage

Change-Id: I407acda1e0310f7f01a5efe9c915721a941138a4

9 years agoam e06cba2..e06cba2 from mirror-m-wireless-internal-release
Vinit Deshpande [Tue, 14 Apr 2015 22:06:07 +0000 (15:06 -0700)]
am e06cba2..e06cba2 from mirror-m-wireless-internal-release

e06cba2 multinetwork API: native header

9 years agoAdded IPCThreadState::blockUntilThreadAvailable() method.
Wale Ogunwale [Mon, 13 Apr 2015 23:16:10 +0000 (16:16 -0700)]
Added IPCThreadState::blockUntilThreadAvailable() method.

Will be used by the system_server watchdog to monitor the
availability of binder threads in the process to handle
incoming IPC requests.

Bug: 19297165
Change-Id: I39175f3869ad14da5620fddb47f454e6e4ee2b25

9 years agoam 6ea912c0: am ddabf640: am a3f8c2aa: Merge "Fix a memory corruption issue when...
Dan Stoza [Tue, 14 Apr 2015 18:38:43 +0000 (18:38 +0000)]
am 6ea912c0: am ddabf640: am a3f8c2aa: Merge "Fix a memory corruption issue when vector resize"

* commit '6ea912c0494fe67d342224b737078dd90b991db6':
  Fix a memory corruption issue when vector resize

9 years agoam ddabf640: am a3f8c2aa: Merge "Fix a memory corruption issue when vector resize"
Dan Stoza [Tue, 14 Apr 2015 18:18:41 +0000 (18:18 +0000)]
am ddabf640: am a3f8c2aa: Merge "Fix a memory corruption issue when vector resize"

* commit 'ddabf640292041fefca86609ee23f4803107cbb2':
  Fix a memory corruption issue when vector resize

9 years agoam a3f8c2aa: Merge "Fix a memory corruption issue when vector resize"
Dan Stoza [Tue, 14 Apr 2015 18:06:48 +0000 (18:06 +0000)]
am a3f8c2aa: Merge "Fix a memory corruption issue when vector resize"

* commit 'a3f8c2aaf1bb82b436306f65b86d25d4ea955d4d':
  Fix a memory corruption issue when vector resize

9 years agoMerge "Fix a memory corruption issue when vector resize"
Dan Stoza [Tue, 14 Apr 2015 17:50:39 +0000 (17:50 +0000)]
Merge "Fix a memory corruption issue when vector resize"

9 years agoBypass surface flinger permission check for calls from system.
Jeff Brown [Sat, 11 Apr 2015 03:20:13 +0000 (20:20 -0700)]
Bypass surface flinger permission check for calls from system.

Early during the boot, before activity manager is ready to handle
permission checks, the system needs to be able to change the display
state.  Added a hardcoded exemption for AID_SYSTEM (which already
has permission to talk to surface flinger anyhow).

Bug: 19029490
Change-Id: I6222edcab8e394e5fb6adf7a982be446e4505a1e

9 years agoam a36a43b3: am c200d20e: am dfc30ae3: Merge "Command to move private app data betwee...
Jeff Sharkey [Fri, 10 Apr 2015 21:32:03 +0000 (21:32 +0000)]
am a36a43b3: am c200d20e: am dfc30ae3: Merge "Command to move private app data between volumes."

* commit 'a36a43b354b248cef9407de42fb6b87e1c7085f6':
  Command to move private app data between volumes.

9 years agoam c200d20e: am dfc30ae3: Merge "Command to move private app data between volumes."
Jeff Sharkey [Fri, 10 Apr 2015 21:14:54 +0000 (21:14 +0000)]
am c200d20e: am dfc30ae3: Merge "Command to move private app data between volumes."

* commit 'c200d20e32af042e92d03574aaededf6d81d27e0':
  Command to move private app data between volumes.

9 years agoam dfc30ae3: Merge "Command to move private app data between volumes."
Jeff Sharkey [Fri, 10 Apr 2015 21:08:43 +0000 (21:08 +0000)]
am dfc30ae3: Merge "Command to move private app data between volumes."

* commit 'dfc30ae393fd610fcbd05a1ecfe7d4834a792de3':
  Command to move private app data between volumes.

9 years agoMerge "Add a method to associate MediaDrm session with MediaCrypto"
Jeff Tinker [Fri, 10 Apr 2015 21:03:40 +0000 (21:03 +0000)]
Merge "Add a method to associate MediaDrm session with MediaCrypto"

9 years agoMerge "Command to move private app data between volumes."
Jeff Sharkey [Fri, 10 Apr 2015 21:00:41 +0000 (21:00 +0000)]
Merge "Command to move private app data between volumes."

9 years agoMerge "openmax: add OMX_IndexConfigOperatingRate."
Ronghua Wu [Fri, 10 Apr 2015 20:10:41 +0000 (20:10 +0000)]
Merge "openmax: add OMX_IndexConfigOperatingRate."

9 years agoMerge "Adding a configuration file to support hifi sensors feature."
Ashutosh Joshi [Fri, 10 Apr 2015 18:40:01 +0000 (18:40 +0000)]
Merge "Adding a configuration file to support hifi sensors feature."

9 years agoAdding a configuration file to support hifi sensors feature.
Ashutosh Joshi [Fri, 10 Apr 2015 18:26:02 +0000 (11:26 -0700)]
Adding a configuration file to support hifi sensors feature.

Adding an XML file to be used to define the hi-fi sensors feature
by supporting devices.

Change-Id: Id586eff93d0d5a028037c9062d7d9c655587e408

9 years agoAdd a method to associate MediaDrm session with MediaCrypto
Jeff Tinker [Fri, 10 Apr 2015 11:10:10 +0000 (04:10 -0700)]
Add a method to associate MediaDrm session with MediaCrypto

Previously, to associate a MediaDrm session with MediaCrypto,
the MediaDrm sessionId was passed as initData to the MediaCrypto
constructor.  This is not ideal for two reasons: it's pretty
obscure and you can't change the association without tearing
down the MediaCodec/MediaCrypto and starting all over.  Use
cases like key rotation require being able to update the
MediaDrm session post-construction.  This CL addresses both of
these issues.

bug: 19570317
Change-Id: Iede35e73e9007df13254edaa5877cb4832b28646

9 years agoCommand to move private app data between volumes.
Jeff Sharkey [Thu, 9 Apr 2015 03:56:42 +0000 (20:56 -0700)]
Command to move private app data between volumes.

New "mvuserdata" command will move all private app data from one
volume UUID to another.  It leverages the existing "cp" toybox
command to do the heavy lifting for all known users, preserving
details like timestamps and permissions.  It invokes restorecon()
to correctly label the new location when the copy is finished.

Changes installd to no longer drop capabilities, so we run as root
again.  This also allows us to exec "cp" with CAP_DAC_OVERRIDE and
CAP_FOWNER still in effect.

Bug: 19993667
Change-Id: I1f407a7c4a1af97ca5afc27b04eb16b4936cbdef

9 years agoFix a memory corruption issue when vector resize
ywen [Thu, 26 Mar 2015 11:51:12 +0000 (19:51 +0800)]
Fix a memory corruption issue when vector resize

There is memory corruption in below code

const Rect* prev = &dst[prevIndex];
dst.add(Rect(prev->right, top, right, bottom));

prev points to a memory of vector dst, when dst resize in add()
call, the memory that prev points to will be copy to the new
allocated vector memory and the old memory will become undefined

Avoid pointer in this case, use a local copy instead

Change-Id: I4d95ceedd00c8fb615ac153082ade1b1ce0d0fa8

9 years agoMerge "multinetwork API: native header"
Erik Kline [Fri, 10 Apr 2015 01:57:17 +0000 (01:57 +0000)]
Merge "multinetwork API: native header"

9 years agoAdd expiration update and keys change events
Jeff Tinker [Tue, 31 Mar 2015 22:47:24 +0000 (15:47 -0700)]
Add expiration update and keys change events

In support of unprefixed EME

bug: 19771612
bug: 19771431
Change-Id: Ibb8471701a62dedfbf5231ad958e2c33ebb3c42f

9 years agoam 8571e647: am 997eb5dd: am 44a38d93: Merge "Start accepting volume UUIDs from frame...
Jeff Sharkey [Thu, 9 Apr 2015 22:17:46 +0000 (22:17 +0000)]
am 8571e647: am 997eb5dd: am 44a38d93: Merge "Start accepting volume UUIDs from framework."

* commit '8571e647da1e9c2227d22034ba6462235273cb02':
  Start accepting volume UUIDs from framework.

9 years agoam 997eb5dd: am 44a38d93: Merge "Start accepting volume UUIDs from framework."
Jeff Sharkey [Thu, 9 Apr 2015 21:57:30 +0000 (21:57 +0000)]
am 997eb5dd: am 44a38d93: Merge "Start accepting volume UUIDs from framework."

* commit '997eb5ddfb4ae83a95b0f90837ba67664e79acb0':
  Start accepting volume UUIDs from framework.

9 years agoam 44a38d93: Merge "Start accepting volume UUIDs from framework."
Jeff Sharkey [Thu, 9 Apr 2015 21:47:30 +0000 (21:47 +0000)]
am 44a38d93: Merge "Start accepting volume UUIDs from framework."

* commit '44a38d9337989742046c1e3faa6e7392ecc47cd4':
  Start accepting volume UUIDs from framework.

9 years agoMerge "Start accepting volume UUIDs from framework."
Jeff Sharkey [Thu, 9 Apr 2015 21:41:11 +0000 (21:41 +0000)]
Merge "Start accepting volume UUIDs from framework."

9 years agoStart accepting volume UUIDs from framework.
Jeff Sharkey [Thu, 9 Apr 2015 20:10:03 +0000 (13:10 -0700)]
Start accepting volume UUIDs from framework.

We're now parsing and passing through volume UUIDs sent across the
command socket.  The "!" argument value is treated as null, which
means internal storage.

Bug: 19993667
Change-Id: I17729a769ce687a2e94e85991a6338c77ded0b66

9 years agoam ad6f4996: am 25327881: am 066fadb9: Merge "More volume UUID awareness."
Jeff Sharkey [Thu, 9 Apr 2015 20:24:05 +0000 (20:24 +0000)]
am ad6f4996: am 25327881: am 066fadb9: Merge "More volume UUID awareness."

* commit 'ad6f4996dc909dcb8e6e369bf41be514077fb142':
  More volume UUID awareness.

9 years agoam 25327881: am 066fadb9: Merge "More volume UUID awareness."
Jeff Sharkey [Thu, 9 Apr 2015 20:03:58 +0000 (20:03 +0000)]
am 25327881: am 066fadb9: Merge "More volume UUID awareness."

* commit '25327881e339bd88045e0ecf17185d2edb479d7c':
  More volume UUID awareness.

9 years agoam 066fadb9: Merge "More volume UUID awareness."
Jeff Sharkey [Thu, 9 Apr 2015 19:53:33 +0000 (19:53 +0000)]
am 066fadb9: Merge "More volume UUID awareness."

* commit '066fadb983b117a7682af00780d23d16232ab0e2':
  More volume UUID awareness.

9 years agoMerge "More volume UUID awareness."
Jeff Sharkey [Thu, 9 Apr 2015 19:45:03 +0000 (19:45 +0000)]
Merge "More volume UUID awareness."

9 years agoMore volume UUID awareness.
Jeff Sharkey [Thu, 9 Apr 2015 18:34:03 +0000 (11:34 -0700)]
More volume UUID awareness.

Teach free_cache() and restorecon_data() about building per-volume
paths.  Also clean up restorecon_data() by using std::string when
building paths.

Clearer names for path building utility methods, and tests to verify.

Bug: 19993667
Change-Id: Iacfbcdaa5b901cc2490bc8eba366dfdeb44f1d93

9 years agoam 6930a29a: am cae83eca: am f9ab2ad2: Merge "Installd: Fix Clang build"
Andreas Gampe [Thu, 9 Apr 2015 17:36:05 +0000 (17:36 +0000)]
am 6930a29a: am cae83eca: am f9ab2ad2: Merge "Installd: Fix Clang build"

* commit '6930a29af13f4a958fa7cba544233d2febe4040b':
  Installd: Fix Clang build

9 years agoam cae83eca: am f9ab2ad2: Merge "Installd: Fix Clang build"
Andreas Gampe [Thu, 9 Apr 2015 17:16:47 +0000 (17:16 +0000)]
am cae83eca: am f9ab2ad2: Merge "Installd: Fix Clang build"

* commit 'cae83eca2476c5f730aebaffdfb6443e6780bb2f':
  Installd: Fix Clang build

9 years agoMerge "Pass through availability of audio mic for input devices."
Tim Kilbourn [Thu, 9 Apr 2015 17:06:47 +0000 (17:06 +0000)]
Merge "Pass through availability of audio mic for input devices."

9 years agoam f9ab2ad2: Merge "Installd: Fix Clang build"
Andreas Gampe [Thu, 9 Apr 2015 17:05:44 +0000 (17:05 +0000)]
am f9ab2ad2: Merge "Installd: Fix Clang build"

* commit 'f9ab2ad2d5786b2dd04f08f5d5a67102bd3d796a':
  Installd: Fix Clang build

9 years agoPass through availability of audio mic for input devices.
Tim Kilbourn [Wed, 8 Apr 2015 17:26:18 +0000 (10:26 -0700)]
Pass through availability of audio mic for input devices.

Bug: 15374820
Change-Id: Id2ca6da10165e3a887ebfbb18f663a3bf316ac79

9 years agoam 65fe5dfd: am cbde9b92: am d107c305: Merge "Plumb through volume UUID when building...
Jeff Sharkey [Thu, 9 Apr 2015 17:00:44 +0000 (17:00 +0000)]
am 65fe5dfd: am cbde9b92: am d107c305: Merge "Plumb through volume UUID when building paths."

* commit '65fe5dfdcd08650e0dfbb39f4a716567fb910cab':
  Plumb through volume UUID when building paths.

9 years agoMerge "Installd: Fix Clang build"
Andreas Gampe [Thu, 9 Apr 2015 16:55:48 +0000 (16:55 +0000)]
Merge "Installd: Fix Clang build"

9 years agoInstalld: Fix Clang build
Andreas Gampe [Thu, 9 Apr 2015 16:52:45 +0000 (09:52 -0700)]
Installd: Fix Clang build

Remove some unused parameters and variables.

Change-Id: I507ae48fe1744b800ceb29192d463fd26c2ccda7

9 years agoam cbde9b92: am d107c305: Merge "Plumb through volume UUID when building paths."
Jeff Sharkey [Thu, 9 Apr 2015 16:45:31 +0000 (16:45 +0000)]
am cbde9b92: am d107c305: Merge "Plumb through volume UUID when building paths."

* commit 'cbde9b920461225b5400abf5700eec1b62f5ce82':
  Plumb through volume UUID when building paths.

9 years agoam d107c305: Merge "Plumb through volume UUID when building paths."
Jeff Sharkey [Thu, 9 Apr 2015 16:35:20 +0000 (16:35 +0000)]
am d107c305: Merge "Plumb through volume UUID when building paths."

* commit 'd107c305f74592e8078754b317d840a2dde661db':
  Plumb through volume UUID when building paths.

9 years agoMerge "Plumb through volume UUID when building paths."
Jeff Sharkey [Thu, 9 Apr 2015 16:27:18 +0000 (16:27 +0000)]
Merge "Plumb through volume UUID when building paths."

9 years agoam b8d1ee37: am 19db8c88: am ab91d03b: Merge "installd: Add support for SELF_PATCHOAT...
Richard Uhler [Thu, 9 Apr 2015 14:51:00 +0000 (14:51 +0000)]
am b8d1ee37: am 19db8c88: am ab91d03b: Merge "installd: Add support for SELF_PATCHOAT_NEEDED."

* commit 'b8d1ee37c4a6897442f5d381d5eb7162e04fcebd':
  installd: Add support for SELF_PATCHOAT_NEEDED.

9 years agoam 19db8c88: am ab91d03b: Merge "installd: Add support for SELF_PATCHOAT_NEEDED."
Richard Uhler [Thu, 9 Apr 2015 14:31:03 +0000 (14:31 +0000)]
am 19db8c88: am ab91d03b: Merge "installd: Add support for SELF_PATCHOAT_NEEDED."

* commit '19db8c884bb6943113420395b581c72f2f3c6cae':
  installd: Add support for SELF_PATCHOAT_NEEDED.

9 years agoam ab91d03b: Merge "installd: Add support for SELF_PATCHOAT_NEEDED."
Richard Uhler [Thu, 9 Apr 2015 14:20:53 +0000 (14:20 +0000)]
am ab91d03b: Merge "installd: Add support for SELF_PATCHOAT_NEEDED."

* commit 'ab91d03b0dfebf40e98034670892c278ae0a46e5':
  installd: Add support for SELF_PATCHOAT_NEEDED.

9 years agoMerge "installd: Add support for SELF_PATCHOAT_NEEDED."
Richard Uhler [Thu, 9 Apr 2015 14:13:27 +0000 (14:13 +0000)]
Merge "installd: Add support for SELF_PATCHOAT_NEEDED."

9 years agomultinetwork API: native header
Erik Kline [Thu, 5 Mar 2015 05:59:54 +0000 (14:59 +0900)]
multinetwork API: native header

Bug: 19537384
Change-Id: I7bb2f4310755e0c2ea2f32288000e54d671aebbe

9 years agoam d029e95a: am 1b0a8702: am ad436ab5: Merge "dumpstate: scrub APANIC"
Mark Salyzyn [Wed, 8 Apr 2015 22:07:20 +0000 (22:07 +0000)]
am d029e95a: am 1b0a8702: am ad436ab5: Merge "dumpstate: scrub APANIC"

* commit 'd029e95a58ea0927ebd3431d9991cd316e568002':
  dumpstate: scrub APANIC

9 years agoam 1b0a8702: am ad436ab5: Merge "dumpstate: scrub APANIC"
Mark Salyzyn [Wed, 8 Apr 2015 21:37:14 +0000 (21:37 +0000)]
am 1b0a8702: am ad436ab5: Merge "dumpstate: scrub APANIC"

* commit '1b0a8702322b2b6ed2fa245cf92e87a1e5feea6c':
  dumpstate: scrub APANIC

9 years agoam ad436ab5: Merge "dumpstate: scrub APANIC"
Mark Salyzyn [Wed, 8 Apr 2015 18:11:30 +0000 (18:11 +0000)]
am ad436ab5: Merge "dumpstate: scrub APANIC"

* commit 'ad436ab54a649075b25ab755344fd011bd0c9262':
  dumpstate: scrub APANIC

9 years agoMerge "dumpstate: scrub APANIC"
Mark Salyzyn [Wed, 8 Apr 2015 18:03:35 +0000 (18:03 +0000)]
Merge "dumpstate: scrub APANIC"

9 years agodumpstate: scrub APANIC
Mark Salyzyn [Wed, 8 Apr 2015 17:51:51 +0000 (10:51 -0700)]
dumpstate: scrub APANIC

Bug: 19525200
Change-Id: Ia2d2857cac953fb4ceafb66ddf775d89d7a777b1

9 years agoPlumb through volume UUID when building paths.
Jeff Sharkey [Wed, 8 Apr 2015 01:14:05 +0000 (18:14 -0700)]
Plumb through volume UUID when building paths.

Since app data paths can live on expanded storage devices, accept the
target volume UUID when building paths.  The null UUID indicates the
default internal storage.

To improve readability, start using std::string in several places,
which throws when allocations fail.  For now, perform last-second
sanity checks on incoming path arguments, but we'll eventually want
to check arguments as they come through installd.cpp, instead of
crashing the entire daemon.

Also remove "lib" symlink code from install() and make_user_data(),
since we're no longer supporting /data/app-lib.  The framework
already uses linklib() to create the right symlink for the selected
ISA-specific library dir.

Bug: 19993667
Change-Id: Ib9343575ffb62bf3981e19375de8f3822fc31e28

9 years agoinstalld: Add support for SELF_PATCHOAT_NEEDED.
Richard Uhler [Thu, 26 Mar 2015 22:47:38 +0000 (15:47 -0700)]
installd: Add support for SELF_PATCHOAT_NEEDED.

Change-Id: Ib9a6373f98474f1242367b5285086251a9d580e5

9 years agoam 172ff24c: am 5977851b: am 00afb817: Merge "libgui: Plumb detachBuffer through...
Dan Stoza [Tue, 7 Apr 2015 23:18:48 +0000 (23:18 +0000)]
am 172ff24c: am 5977851b: am 00afb817: Merge "libgui: Plumb detachBuffer through ConsumerBase"

* commit '172ff24ccbc232cdf244a2bcbbb51df754929521':
  libgui: Plumb detachBuffer through ConsumerBase

9 years agoam 5977851b: am 00afb817: Merge "libgui: Plumb detachBuffer through ConsumerBase"
Dan Stoza [Tue, 7 Apr 2015 22:58:47 +0000 (22:58 +0000)]
am 5977851b: am 00afb817: Merge "libgui: Plumb detachBuffer through ConsumerBase"

* commit '5977851b80549f24cd9164ec075b79c6c6291fa5':
  libgui: Plumb detachBuffer through ConsumerBase

9 years agoam 00afb817: Merge "libgui: Plumb detachBuffer through ConsumerBase"
Dan Stoza [Tue, 7 Apr 2015 22:47:50 +0000 (22:47 +0000)]
am 00afb817: Merge "libgui: Plumb detachBuffer through ConsumerBase"

* commit '00afb8177fdbf144c75c00e9eacc915589807d35':
  libgui: Plumb detachBuffer through ConsumerBase

9 years agoMerge "libgui: Plumb detachBuffer through ConsumerBase"
Dan Stoza [Tue, 7 Apr 2015 22:38:00 +0000 (22:38 +0000)]
Merge "libgui: Plumb detachBuffer through ConsumerBase"

9 years agoam 6b4f28a7: am a53e955a: Merge "libgui: Plumb attach/detach through Surface" into...
Dan Stoza [Tue, 7 Apr 2015 22:33:07 +0000 (22:33 +0000)]
am 6b4f28a7: am a53e955a: Merge "libgui: Plumb attach/detach through Surface" into stage-aosp-master

* commit '6b4f28a7930c115f4b9e0d4fdfcd41b3bb58bf58':
  libgui: Plumb attach/detach through Surface

9 years agoam a53e955a: Merge "libgui: Plumb attach/detach through Surface" into stage-aosp...
Dan Stoza [Tue, 7 Apr 2015 22:12:33 +0000 (22:12 +0000)]
am a53e955a: Merge "libgui: Plumb attach/detach through Surface" into stage-aosp-master

* commit 'a53e955ad882793bb6fea00d4d110a3d8878ab57':
  libgui: Plumb attach/detach through Surface

9 years agolibgui: Plumb detachBuffer through ConsumerBase
Dan Stoza [Fri, 3 Apr 2015 21:22:05 +0000 (14:22 -0700)]
libgui: Plumb detachBuffer through ConsumerBase

Exposes IGraphicBufferConsumer::detachBuffer as a ConsumerBase
method. attachBuffer is not currently exposed, because all current
clients will be recycling buffers through the allocator.

Bug: 19628705
Change-Id: I3e519767fa43d5d880c1d5695e31b60f6ad588af

9 years agoMerge "libgui: Plumb attach/detach through Surface" into stage-aosp-master
Dan Stoza [Tue, 7 Apr 2015 22:00:36 +0000 (22:00 +0000)]
Merge "libgui: Plumb attach/detach through Surface" into stage-aosp-master

9 years agoam 6d9e3dc5: am e55cae86: Merge "libgui: Remove IGBC::BufferItem" into stage-aosp...
Dan Stoza [Tue, 7 Apr 2015 21:53:20 +0000 (21:53 +0000)]
am 6d9e3dc5: am e55cae86: Merge "libgui: Remove IGBC::BufferItem" into stage-aosp-master

* commit '6d9e3dc5ca8e519218053f3f2f0e5068c835aba9':
  libgui: Remove IGBC::BufferItem

9 years agoam eb3704a5: am 9e99fce8: am 1cd030be: Merge "Switch installd to compile as C++."
Jeff Sharkey [Tue, 7 Apr 2015 21:53:19 +0000 (21:53 +0000)]
am eb3704a5: am 9e99fce8: am 1cd030be: Merge "Switch installd to compile as C++."

* commit 'eb3704a58e62c0f85cfea776df1040b677263c80':
  Switch installd to compile as C++.

9 years agoam f3529d9a: am dc10342d: am 2d42dc74: Merge "Valid APK paths now include expanded...
Jeff Sharkey [Tue, 7 Apr 2015 21:53:18 +0000 (21:53 +0000)]
am f3529d9a: am dc10342d: am 2d42dc74: Merge "Valid APK paths now include expanded storage."

* commit 'f3529d9aba9030ed4f3b7ac9570db0f401d9c1fb':
  Valid APK paths now include expanded storage.

9 years agoam e55cae86: Merge "libgui: Remove IGBC::BufferItem" into stage-aosp-master
Dan Stoza [Tue, 7 Apr 2015 21:24:02 +0000 (21:24 +0000)]
am e55cae86: Merge "libgui: Remove IGBC::BufferItem" into stage-aosp-master

* commit 'e55cae86e6217a86d94bf280c6c8442bef2dd908':
  libgui: Remove IGBC::BufferItem

9 years agoam 9e99fce8: am 1cd030be: Merge "Switch installd to compile as C++."
Jeff Sharkey [Tue, 7 Apr 2015 21:24:01 +0000 (21:24 +0000)]
am 9e99fce8: am 1cd030be: Merge "Switch installd to compile as C++."

* commit '9e99fce820c2d520f5618cb620cc1e37aed57b9d':
  Switch installd to compile as C++.

9 years agoam dc10342d: am 2d42dc74: Merge "Valid APK paths now include expanded storage."
Jeff Sharkey [Tue, 7 Apr 2015 21:24:00 +0000 (21:24 +0000)]
am dc10342d: am 2d42dc74: Merge "Valid APK paths now include expanded storage."

* commit 'dc10342dc9031883046b4b44d009a4422545e7e2':
  Valid APK paths now include expanded storage.

9 years agoMerge "libgui: Remove IGBC::BufferItem" into stage-aosp-master
Dan Stoza [Tue, 7 Apr 2015 21:16:33 +0000 (21:16 +0000)]
Merge "libgui: Remove IGBC::BufferItem" into stage-aosp-master

9 years agoam 1cd030be: Merge "Switch installd to compile as C++."
Jeff Sharkey [Tue, 7 Apr 2015 21:13:43 +0000 (21:13 +0000)]
am 1cd030be: Merge "Switch installd to compile as C++."

* commit '1cd030be59c108cde25234f0d2da83a68a7cdd26':
  Switch installd to compile as C++.

9 years agoam 2d42dc74: Merge "Valid APK paths now include expanded storage."
Jeff Sharkey [Tue, 7 Apr 2015 21:13:42 +0000 (21:13 +0000)]
am 2d42dc74: Merge "Valid APK paths now include expanded storage."

* commit '2d42dc74e9b647345a5d4ba79bcdadbf700002e2':
  Valid APK paths now include expanded storage.

9 years agoMerge "Switch installd to compile as C++."
Jeff Sharkey [Tue, 7 Apr 2015 21:04:28 +0000 (21:04 +0000)]
Merge "Switch installd to compile as C++."