OSDN Git Service

android-x86/frameworks-base.git
10 years agoam 094efb3f: am 407f74f4: Merge "Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE defau...
Christopher Tate [Thu, 23 Jan 2014 01:47:04 +0000 (17:47 -0800)]
am 094efb3f: am 407f74f4: Merge "Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value"

* commit '094efb3f5350b3ce95dcc790bc237c5caa901a20':
  Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value

10 years agoam 407f74f4: Merge "Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value"
Christopher Tate [Thu, 23 Jan 2014 01:43:52 +0000 (17:43 -0800)]
am 407f74f4: Merge "Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value"

* commit '407f74f494e5374d9bdceae9d9fb453aa8270f6b':
  Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value

10 years agoMerge "Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value"
Christopher Tate [Thu, 23 Jan 2014 01:40:37 +0000 (01:40 +0000)]
Merge "Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value"

10 years agoam 9971cbe9: am 94ac4f68: Add samples TOC generated from browsable sources.
Dirk Dougherty [Thu, 23 Jan 2014 00:36:34 +0000 (16:36 -0800)]
am 9971cbe9: am 94ac4f68: Add samples TOC generated from browsable sources.

* commit '9971cbe92284e589d6540cbf22f17c816692bb62':
  Add samples TOC generated from browsable sources.

10 years agoam 94ac4f68: Add samples TOC generated from browsable sources.
Dirk Dougherty [Thu, 23 Jan 2014 00:33:06 +0000 (00:33 +0000)]
am 94ac4f68: Add samples TOC generated from browsable sources.

* commit '94ac4f6855d84c6d40006002f43ad1f1a0447954':
  Add samples TOC generated from browsable sources.

10 years agoAdd samples TOC generated from browsable sources.
Dirk Dougherty [Wed, 27 Nov 2013 18:34:47 +0000 (10:34 -0800)]
Add samples TOC generated from browsable sources.

(cherry picked from commit 1c64e2f429bfc97fcf64ebeaa0b3aa2d6b609a1d)

Change-Id: I085b68646565bbf904e70734008efe5cc9f21eda

10 years agoam 0e3df216: am cc81bcec: Merge "Only send storage intents after boot complete"
Christopher Tate [Wed, 22 Jan 2014 23:53:58 +0000 (15:53 -0800)]
am 0e3df216: am cc81bcec: Merge "Only send storage intents after boot complete"

* commit '0e3df21642122ae8a43be1a35723782bdd417b7a':
  Only send storage intents after boot complete

10 years agoam cc81bcec: Merge "Only send storage intents after boot complete"
Christopher Tate [Wed, 22 Jan 2014 23:50:31 +0000 (15:50 -0800)]
am cc81bcec: Merge "Only send storage intents after boot complete"

* commit 'cc81bcece411794b4eac6b03b7700a0214fdbb87':
  Only send storage intents after boot complete

10 years agoMerge "Only send storage intents after boot complete"
Christopher Tate [Wed, 22 Jan 2014 23:46:57 +0000 (23:46 +0000)]
Merge "Only send storage intents after boot complete"

10 years agoam 0cb965a6: am 5020a873: Merge "cherrypick from jb-mr2-docs docs: Training class...
quddusc [Wed, 22 Jan 2014 04:13:48 +0000 (20:13 -0800)]
am 0cb965a6: am 5020a873: Merge "cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da" into klp-docs

* commit '0cb965a69aac9c2a83798960a0efeaa6e596e445':
  cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da

10 years agoam 5020a873: Merge "cherrypick from jb-mr2-docs docs: Training class for game control...
quddusc [Wed, 22 Jan 2014 04:10:13 +0000 (04:10 +0000)]
am 5020a873: Merge "cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da" into klp-docs

* commit '5020a8736f3319d295d31bed421f837788878451':
  cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da

10 years agoMerge "cherrypick from jb-mr2-docs docs: Training class for game controllers. Change...
quddusc [Wed, 22 Jan 2014 04:07:17 +0000 (04:07 +0000)]
Merge "cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da" into klp-docs

10 years agocherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id...
quddusc [Mon, 1 Jul 2013 23:57:26 +0000 (16:57 -0700)]
cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da

Change-Id: I40b79aee2302f1e32a9e8bc11d0b0415dcbe7705

10 years agoam d9d41f2d: am fbdcf317: fix code typo
Scott Main [Wed, 22 Jan 2014 01:52:05 +0000 (17:52 -0800)]
am d9d41f2d: am fbdcf317: fix code typo

* commit 'd9d41f2db29a4bd9bcf3b064067f41742a9265e9':
  fix code typo

10 years agoam fbdcf317: fix code typo
Scott Main [Wed, 22 Jan 2014 01:49:36 +0000 (01:49 +0000)]
am fbdcf317: fix code typo

* commit 'fbdcf317fa751dc7d629b5c38688369ea2acf0ad':
  fix code typo

10 years agoam 5474f085: am 9fc157a4: Merge "FLAG_PRIVILEGED disappears if privileged app is...
Christopher Tate [Wed, 22 Jan 2014 01:48:35 +0000 (17:48 -0800)]
am 5474f085: am 9fc157a4: Merge "FLAG_PRIVILEGED disappears if privileged app is updated and rebooted"

* commit '5474f085b05b527f7e1dc7c6f536736c2f043fb0':
  FLAG_PRIVILEGED disappears if privileged app is updated and rebooted

10 years agoam 9fc157a4: Merge "FLAG_PRIVILEGED disappears if privileged app is updated and rebooted"
Christopher Tate [Wed, 22 Jan 2014 01:45:00 +0000 (17:45 -0800)]
am 9fc157a4: Merge "FLAG_PRIVILEGED disappears if privileged app is updated and rebooted"

* commit '9fc157a4767f54d1cff53dc9489638b67aec2da3':
  FLAG_PRIVILEGED disappears if privileged app is updated and rebooted

10 years agoMerge "FLAG_PRIVILEGED disappears if privileged app is updated and rebooted"
Christopher Tate [Wed, 22 Jan 2014 01:42:50 +0000 (01:42 +0000)]
Merge "FLAG_PRIVILEGED disappears if privileged app is updated and rebooted"

10 years agofix code typo
Scott Main [Tue, 21 Jan 2014 18:12:07 +0000 (10:12 -0800)]
fix code typo

Change-Id: I66c86cb778a7e2237e71a7a70dee420d82a5e557

10 years agoFLAG_PRIVILEGED disappears if privileged app is updated and rebooted
Naofumi Harada [Tue, 21 Jan 2014 01:29:36 +0000 (10:29 +0900)]
FLAG_PRIVILEGED disappears if privileged app is updated and rebooted

Since Kitkat, an app pre-loaded under /system/priv-app/ has
FLAG_PRIVILEGED. However, if the app updated and the device
rebooted, privileged flag is unset from pkgFlags. This patch
fix issue to assign privileged flag when scanning the updated
packages.

Bug: 12640283

Change-Id: Ic24b5882f65dabdfae9cc39da3d68661bed4fc31

10 years agoOnly send storage intents after boot complete
Johan Redestig [Sat, 18 Jan 2014 21:46:56 +0000 (22:46 +0100)]
Only send storage intents after boot complete

It is not possible to send a broadcast before the system
boot is completed. If you do it anyway you will get an
IllegalStateException: Cannot broadcast before boot completed.

If a memory card is inserted or removed while the phone is
booting up, there is a risk that the MountService will try to
broadcast a storage intent too early, and cause the device
to crash.

Use FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT to avoid
problems with too early broadcasts.

Change-Id: Ied36a13d235df37c9788e45a35de40d919ae0cd0

10 years agoam aa80f1a3: am c9a60b0f: Merge "Don\'t confuse stat and stat64."
Elliott Hughes [Sat, 18 Jan 2014 02:38:17 +0000 (18:38 -0800)]
am aa80f1a3: am c9a60b0f: Merge "Don\'t confuse stat and stat64."

* commit 'aa80f1a3caf6271f1c48a779e260811f2802a9f0':
  Don't confuse stat and stat64.

10 years agoam c9a60b0f: Merge "Don\'t confuse stat and stat64."
Elliott Hughes [Sat, 18 Jan 2014 02:36:02 +0000 (18:36 -0800)]
am c9a60b0f: Merge "Don\'t confuse stat and stat64."

* commit 'c9a60b0f77525244ac4f970258703b8dc62ee140':
  Don't confuse stat and stat64.

10 years agoMerge "Don't confuse stat and stat64."
Elliott Hughes [Sat, 18 Jan 2014 02:32:39 +0000 (02:32 +0000)]
Merge "Don't confuse stat and stat64."

10 years agoDon't confuse stat and stat64.
Elliott Hughes [Sat, 18 Jan 2014 02:27:27 +0000 (18:27 -0800)]
Don't confuse stat and stat64.

Bug: 11865851
Change-Id: I45e65036d86c58943b9c273777f3f8be79a6966f

10 years agoam 66b5a2b2: am 5150eb8f: Merge "Initialize pointer members to NULL to avoid illegal...
Chris Craik [Fri, 17 Jan 2014 19:24:02 +0000 (11:24 -0800)]
am 66b5a2b2: am 5150eb8f: Merge "Initialize pointer members to NULL to avoid illegal reference"

* commit '66b5a2b25bbe9844fc538e383922a0866c0baec0':
  Initialize pointer members to NULL to avoid illegal reference

10 years agoam 5150eb8f: Merge "Initialize pointer members to NULL to avoid illegal reference"
Chris Craik [Fri, 17 Jan 2014 19:20:38 +0000 (11:20 -0800)]
am 5150eb8f: Merge "Initialize pointer members to NULL to avoid illegal reference"

* commit '5150eb8f5f66104a8bc0884f9eb348e3f08ee6fb':
  Initialize pointer members to NULL to avoid illegal reference

10 years agoam 251de854: am 53e9bfae: Merge "Fix error checking in MemoryFile."
Narayan Kamath [Fri, 17 Jan 2014 19:19:57 +0000 (11:19 -0800)]
am 251de854: am 53e9bfae: Merge "Fix error checking in MemoryFile."

* commit '251de854f02a22ae613964de7ec96f2e0816e503':
  Fix error checking in MemoryFile.

10 years agoMerge "Initialize pointer members to NULL to avoid illegal reference"
Chris Craik [Fri, 17 Jan 2014 18:41:14 +0000 (18:41 +0000)]
Merge "Initialize pointer members to NULL to avoid illegal reference"

10 years agoam 53e9bfae: Merge "Fix error checking in MemoryFile."
Narayan Kamath [Fri, 17 Jan 2014 17:36:23 +0000 (09:36 -0800)]
am 53e9bfae: Merge "Fix error checking in MemoryFile."

* commit '53e9bfaee1064f1858c307409e51aa4566ae4b95':
  Fix error checking in MemoryFile.

10 years agoMerge "Fix error checking in MemoryFile."
Narayan Kamath [Fri, 17 Jan 2014 10:25:27 +0000 (10:25 +0000)]
Merge "Fix error checking in MemoryFile."

10 years agoInitialize pointer members to NULL to avoid illegal reference
lina.x.pi [Thu, 9 Jan 2014 10:17:03 +0000 (18:17 +0800)]
Initialize pointer members to NULL to avoid illegal reference

mBitmap and mTexture is not initialized to NULL which causes
illegal address access when it fails to be created from
oversized bitmap.

Change-Id: Iea54bec8788bc5f3a10040fdb43f416c0d41a14c

10 years agoam fcab250d: am 16fe3737: Merge "docs: Added note to Support Library Setup page:...
Joe Fernandez [Thu, 16 Jan 2014 22:52:56 +0000 (14:52 -0800)]
am fcab250d: am 16fe3737: Merge "docs: Added note to Support Library Setup page: mediarouter to appcompat dependency" into klp-docs

* commit 'fcab250de89352613e3dd8fe6efa180c0a7df4d0':
  docs: Added note to Support Library Setup page: mediarouter to appcompat dependency

10 years agoam 94149cfb: am acf2b906: Merge "Fixing bugs in MediaPlayer docs" into klp-docs
Joe Fernandez [Thu, 16 Jan 2014 22:52:51 +0000 (14:52 -0800)]
am 94149cfb: am acf2b906: Merge "Fixing bugs in MediaPlayer docs" into klp-docs

* commit '94149cfb3409244fa2d91ee87c0b4d531447110a':
  Fixing bugs in MediaPlayer docs

10 years agoam 16fe3737: Merge "docs: Added note to Support Library Setup page: mediarouter to...
Joe Fernandez [Thu, 16 Jan 2014 22:49:46 +0000 (22:49 +0000)]
am 16fe3737: Merge "docs: Added note to Support Library Setup page: mediarouter to appcompat dependency" into klp-docs

* commit '16fe3737457ac844da09cd062e23abedbcc1f3e8':
  docs: Added note to Support Library Setup page: mediarouter to appcompat dependency

10 years agoam acf2b906: Merge "Fixing bugs in MediaPlayer docs" into klp-docs
Joe Fernandez [Thu, 16 Jan 2014 22:49:42 +0000 (22:49 +0000)]
am acf2b906: Merge "Fixing bugs in MediaPlayer docs" into klp-docs

* commit 'acf2b906b34d7c1d16ecb039390f656784c6d034':
  Fixing bugs in MediaPlayer docs

10 years agoMerge "docs: Added note to Support Library Setup page: mediarouter to appcompat depen...
Joe Fernandez [Thu, 16 Jan 2014 22:46:56 +0000 (22:46 +0000)]
Merge "docs: Added note to Support Library Setup page: mediarouter to appcompat dependency" into klp-docs

10 years agoMerge "Fixing bugs in MediaPlayer docs" into klp-docs
Joe Fernandez [Thu, 16 Jan 2014 22:46:17 +0000 (22:46 +0000)]
Merge "Fixing bugs in MediaPlayer docs" into klp-docs

10 years agoam 7e8a997f: am 62729b15: Merge "docs: Removed obsolete screenshot of Play Store...
quddusc [Thu, 16 Jan 2014 16:08:24 +0000 (08:08 -0800)]
am 7e8a997f: am 62729b15: Merge "docs: Removed obsolete screenshot of Play Store purchase flow. Bug: 9846095" into klp-docs

* commit '7e8a997fdf8acb90d81d57e1563a8d9f858464bd':
  docs: Removed obsolete screenshot of Play Store purchase flow. Bug: 9846095

10 years agoam 62729b15: Merge "docs: Removed obsolete screenshot of Play Store purchase flow...
quddusc [Thu, 16 Jan 2014 16:05:54 +0000 (16:05 +0000)]
am 62729b15: Merge "docs: Removed obsolete screenshot of Play Store purchase flow. Bug: 9846095" into klp-docs

* commit '62729b15a91525cef4dd27226099c245d38e6495':
  docs: Removed obsolete screenshot of Play Store purchase flow. Bug: 9846095

10 years agoMerge "docs: Removed obsolete screenshot of Play Store purchase flow. Bug: 9846095...
quddusc [Thu, 16 Jan 2014 16:03:06 +0000 (16:03 +0000)]
Merge "docs: Removed obsolete screenshot of Play Store purchase flow. Bug: 9846095" into klp-docs

10 years agoam 48de490c: am 486544f7: Merge "AArch64: Use long for pointers in view/input classes"
Narayan Kamath [Thu, 16 Jan 2014 15:35:25 +0000 (07:35 -0800)]
am 48de490c: am 486544f7: Merge "AArch64: Use long for pointers in view/input classes"

* commit '48de490c33cac16ed82d753799d7add804f72977':
  AArch64: Use long for pointers in view/input classes

10 years agoam faa62aac: am 84ee7930: Merge "AArch64: Use long for pointers in android/os/Message...
Narayan Kamath [Thu, 16 Jan 2014 15:35:20 +0000 (07:35 -0800)]
am faa62aac: am 84ee7930: Merge "AArch64: Use long for pointers in android/os/MessageQueue"

* commit 'faa62aaca5f4a149f20487d42279fefc7d356428':
  AArch64: Use long for pointers in android/os/MessageQueue

10 years agoam caea42fd: am 98002dfb: Merge "AArch64: Use long for pointers in graphics/PathMeasure"
Narayan Kamath [Thu, 16 Jan 2014 15:35:16 +0000 (07:35 -0800)]
am caea42fd: am 98002dfb: Merge "AArch64: Use long for pointers in graphics/PathMeasure"

* commit 'caea42fd2daabedaed383105e10c11150f52b7df':
  AArch64: Use long for pointers in graphics/PathMeasure

10 years agoam aef12450: am 1b0f0be0: Merge "Make YuvToJpegEncoder more JNI compliant"
Narayan Kamath [Thu, 16 Jan 2014 15:35:10 +0000 (07:35 -0800)]
am aef12450: am 1b0f0be0: Merge "Make YuvToJpegEncoder more JNI compliant"

* commit 'aef12450d2f863fe3ce82458e46f3778b791cc33':
  Make YuvToJpegEncoder more JNI compliant

10 years agoam 8796ab7f: am bb35356d: Merge changes Id54087dd,I946325e4,I2a2b2e68
Narayan Kamath [Thu, 16 Jan 2014 15:35:06 +0000 (07:35 -0800)]
am 8796ab7f: am bb35356d: Merge changes Id54087dd,I946325e4,I2a2b2e68

* commit '8796ab7f22d3e9f5b85571e8851851c023416f96':
  AArch64: Use long for pointers in BitmapRegionDecoder
  AArch64: Use long for pointers in Movie class
  AArch64: Add AssetInputStream.getNativeAsset

10 years agoam 947d88a0: am 138d67c8: Merge "AArch64: Use long for pointers in MotionEvent class"
Narayan Kamath [Thu, 16 Jan 2014 15:35:02 +0000 (07:35 -0800)]
am 947d88a0: am 138d67c8: Merge "AArch64: Use long for pointers in MotionEvent class"

* commit '947d88a0eacafb2e5ec5ce5eaaae8be32ecb9aa9':
  AArch64: Use long for pointers in MotionEvent class

10 years agoam a0b25d41: am d85bba8e: Merge "AArch64: Use long for pointers in VelocityTracker...
Narayan Kamath [Thu, 16 Jan 2014 15:34:57 +0000 (07:34 -0800)]
am a0b25d41: am d85bba8e: Merge "AArch64: Use long for pointers in VelocityTracker class"

* commit 'a0b25d41d556d2c37852b6036aaf6f33b0e8c5a8':
  AArch64: Use long for pointers in VelocityTracker class

10 years agoam 80b3dd0d: am 27a647bf: Merge "AArch64: Use long for pointers in android/os/MemoryFile"
Narayan Kamath [Thu, 16 Jan 2014 15:34:53 +0000 (07:34 -0800)]
am 80b3dd0d: am 27a647bf: Merge "AArch64: Use long for pointers in android/os/MemoryFile"

* commit '80b3dd0d8e333905e9f2a3a844bc524d41df7da2':
  AArch64: Use long for pointers in android/os/MemoryFile

10 years agoam 53321d99: am f19c50d6: Merge "AArch64: Use long for pointers in KeyCharacterMap...
Narayan Kamath [Thu, 16 Jan 2014 15:34:48 +0000 (07:34 -0800)]
am 53321d99: am f19c50d6: Merge "AArch64: Use long for pointers in KeyCharacterMap class"

* commit '53321d9990cae810da28b7ae9f6f9b3fe7455020':
  AArch64: Use long for pointers in KeyCharacterMap class

10 years agoam bc0468e6: am 6f17adba: Merge "AArch64: Use long for pointers in media classes"
Narayan Kamath [Thu, 16 Jan 2014 15:34:43 +0000 (07:34 -0800)]
am bc0468e6: am 6f17adba: Merge "AArch64: Use long for pointers in media classes"

* commit 'bc0468e67626937300e9afd182656469463d96a1':
  AArch64: Use long for pointers in media classes

10 years agoam 12377887: am 991e9818: Merge "AArch64: Use long for pointers in speech/srec classes"
Elliott Hughes [Thu, 16 Jan 2014 15:34:39 +0000 (07:34 -0800)]
am 12377887: am 991e9818: Merge "AArch64: Use long for pointers in speech/srec classes"

* commit '12377887e3a74a69100071e0a383f6d9a54046c9':
  AArch64: Use long for pointers in speech/srec classes

10 years agoam 486544f7: Merge "AArch64: Use long for pointers in view/input classes"
Narayan Kamath [Thu, 16 Jan 2014 15:32:03 +0000 (07:32 -0800)]
am 486544f7: Merge "AArch64: Use long for pointers in view/input classes"

* commit '486544f763bd27eb92c95101e23f939c79c9890e':
  AArch64: Use long for pointers in view/input classes

10 years agoam 84ee7930: Merge "AArch64: Use long for pointers in android/os/MessageQueue"
Narayan Kamath [Thu, 16 Jan 2014 15:32:01 +0000 (07:32 -0800)]
am 84ee7930: Merge "AArch64: Use long for pointers in android/os/MessageQueue"

* commit '84ee7930bb0f91f6a19662efa4c3f7c7044be426':
  AArch64: Use long for pointers in android/os/MessageQueue

10 years agoam 98002dfb: Merge "AArch64: Use long for pointers in graphics/PathMeasure"
Narayan Kamath [Thu, 16 Jan 2014 15:31:58 +0000 (07:31 -0800)]
am 98002dfb: Merge "AArch64: Use long for pointers in graphics/PathMeasure"

* commit '98002dfb60a20caf62d6682659547c042a4a3342':
  AArch64: Use long for pointers in graphics/PathMeasure

10 years agoam 1b0f0be0: Merge "Make YuvToJpegEncoder more JNI compliant"
Narayan Kamath [Thu, 16 Jan 2014 15:31:56 +0000 (07:31 -0800)]
am 1b0f0be0: Merge "Make YuvToJpegEncoder more JNI compliant"

* commit '1b0f0be0979cbe00641d5d386691e87d668a2aa8':
  Make YuvToJpegEncoder more JNI compliant

10 years agoam bb35356d: Merge changes Id54087dd,I946325e4,I2a2b2e68
Narayan Kamath [Thu, 16 Jan 2014 15:31:53 +0000 (07:31 -0800)]
am bb35356d: Merge changes Id54087dd,I946325e4,I2a2b2e68

* commit 'bb35356dc05632664e1d65588c9d0570c185280b':
  AArch64: Use long for pointers in BitmapRegionDecoder
  AArch64: Use long for pointers in Movie class
  AArch64: Add AssetInputStream.getNativeAsset

10 years agoam 138d67c8: Merge "AArch64: Use long for pointers in MotionEvent class"
Narayan Kamath [Thu, 16 Jan 2014 15:31:50 +0000 (07:31 -0800)]
am 138d67c8: Merge "AArch64: Use long for pointers in MotionEvent class"

* commit '138d67c8476a846030be74ced1b1990d497402e0':
  AArch64: Use long for pointers in MotionEvent class

10 years agoam d85bba8e: Merge "AArch64: Use long for pointers in VelocityTracker class"
Narayan Kamath [Thu, 16 Jan 2014 15:31:48 +0000 (07:31 -0800)]
am d85bba8e: Merge "AArch64: Use long for pointers in VelocityTracker class"

* commit 'd85bba8ebd24257cb52867b6a082350746e97ad2':
  AArch64: Use long for pointers in VelocityTracker class

10 years agoam 27a647bf: Merge "AArch64: Use long for pointers in android/os/MemoryFile"
Narayan Kamath [Thu, 16 Jan 2014 15:31:45 +0000 (07:31 -0800)]
am 27a647bf: Merge "AArch64: Use long for pointers in android/os/MemoryFile"

* commit '27a647bf382f12aea6d0c9584302423e1c44fbb0':
  AArch64: Use long for pointers in android/os/MemoryFile

10 years agoam f19c50d6: Merge "AArch64: Use long for pointers in KeyCharacterMap class"
Narayan Kamath [Thu, 16 Jan 2014 15:31:42 +0000 (07:31 -0800)]
am f19c50d6: Merge "AArch64: Use long for pointers in KeyCharacterMap class"

* commit 'f19c50d6577b09ddabb5fa8c166b56c35ce2a66d':
  AArch64: Use long for pointers in KeyCharacterMap class

10 years agoam 6f17adba: Merge "AArch64: Use long for pointers in media classes"
Narayan Kamath [Thu, 16 Jan 2014 15:31:39 +0000 (07:31 -0800)]
am 6f17adba: Merge "AArch64: Use long for pointers in media classes"

* commit '6f17adbabc329db1671c2fa6fd9e25cbf6a3fa8e':
  AArch64: Use long for pointers in media classes

10 years agoam 991e9818: Merge "AArch64: Use long for pointers in speech/srec classes"
Elliott Hughes [Thu, 16 Jan 2014 15:31:36 +0000 (07:31 -0800)]
am 991e9818: Merge "AArch64: Use long for pointers in speech/srec classes"

* commit '991e9818c69443fac927970c4c3521adaf687a44':
  AArch64: Use long for pointers in speech/srec classes

10 years agoam 294d5f79: am 1d2a4e7b: Merge "docs: Fixed typos in audio-focus.jd. Bug: 12528498...
Ricardo Cervera [Thu, 16 Jan 2014 15:25:04 +0000 (07:25 -0800)]
am 294d5f79: am 1d2a4e7b: Merge "docs: Fixed typos in audio-focus.jd. Bug: 12528498 HTML: quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html" into klp-docs

* commit '294d5f790a564ac5f21d3dcfd1054abe544505a5':
  docs: Fixed typos in audio-focus.jd. Bug: 12528498 HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html

10 years agoam 1d2a4e7b: Merge "docs: Fixed typos in audio-focus.jd. Bug: 12528498 HTML: http...
Ricardo Cervera [Thu, 16 Jan 2014 15:19:30 +0000 (15:19 +0000)]
am 1d2a4e7b: Merge "docs: Fixed typos in audio-focus.jd. Bug: 12528498 HTML: quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html" into klp-docs

* commit '1d2a4e7b9fddf57e2d8e562ad691653332ea0a4c':
  docs: Fixed typos in audio-focus.jd. Bug: 12528498 HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html

10 years agoFix error checking in MemoryFile.
Narayan Kamath [Thu, 16 Jan 2014 13:17:03 +0000 (13:17 +0000)]
Fix error checking in MemoryFile.

mmap returns MAP_FAILED on failures, not 0 (NULL).
Also, convert some C style casts to C++ since they
make intent clearer.

Change-Id: I367993c73e9ee576f11ebe76e530d2c2f27c662d

10 years agoMerge "AArch64: Use long for pointers in view/input classes"
Narayan Kamath [Thu, 16 Jan 2014 12:12:15 +0000 (12:12 +0000)]
Merge "AArch64: Use long for pointers in view/input classes"

10 years agoMerge "AArch64: Use long for pointers in android/os/MessageQueue"
Narayan Kamath [Thu, 16 Jan 2014 12:11:39 +0000 (12:11 +0000)]
Merge "AArch64: Use long for pointers in android/os/MessageQueue"

10 years agoMerge "AArch64: Use long for pointers in graphics/PathMeasure"
Narayan Kamath [Thu, 16 Jan 2014 12:12:11 +0000 (12:12 +0000)]
Merge "AArch64: Use long for pointers in graphics/PathMeasure"

10 years agoMerge "Make YuvToJpegEncoder more JNI compliant"
Narayan Kamath [Thu, 16 Jan 2014 12:12:00 +0000 (12:12 +0000)]
Merge "Make YuvToJpegEncoder more JNI compliant"

10 years agoMerge changes Id54087dd,I946325e4,I2a2b2e68
Narayan Kamath [Thu, 16 Jan 2014 12:11:58 +0000 (12:11 +0000)]
Merge changes Id54087dd,I946325e4,I2a2b2e68

* changes:
  AArch64: Use long for pointers in BitmapRegionDecoder
  AArch64: Use long for pointers in Movie class
  AArch64: Add AssetInputStream.getNativeAsset

10 years agoMerge "AArch64: Use long for pointers in MotionEvent class"
Narayan Kamath [Thu, 16 Jan 2014 12:11:53 +0000 (12:11 +0000)]
Merge "AArch64: Use long for pointers in MotionEvent class"

10 years agoMerge "AArch64: Use long for pointers in VelocityTracker class"
Narayan Kamath [Thu, 16 Jan 2014 12:11:50 +0000 (12:11 +0000)]
Merge "AArch64: Use long for pointers in VelocityTracker class"

10 years agoMerge "AArch64: Use long for pointers in android/os/MemoryFile"
Narayan Kamath [Thu, 16 Jan 2014 12:11:45 +0000 (12:11 +0000)]
Merge "AArch64: Use long for pointers in android/os/MemoryFile"

10 years agoMerge "AArch64: Use long for pointers in KeyCharacterMap class"
Narayan Kamath [Thu, 16 Jan 2014 12:11:42 +0000 (12:11 +0000)]
Merge "AArch64: Use long for pointers in KeyCharacterMap class"

10 years agoMerge "AArch64: Use long for pointers in media classes"
Narayan Kamath [Thu, 16 Jan 2014 12:11:37 +0000 (12:11 +0000)]
Merge "AArch64: Use long for pointers in media classes"

10 years agoMerge "AArch64: Use long for pointers in speech/srec classes"
Elliott Hughes [Thu, 16 Jan 2014 01:38:51 +0000 (01:38 +0000)]
Merge "AArch64: Use long for pointers in speech/srec classes"

10 years agoAArch64: Use long for pointers in speech/srec classes
Ashok Bhat [Mon, 6 Jan 2014 11:35:32 +0000 (11:35 +0000)]
AArch64: Use long for pointers in speech/srec classes

For storing pointers, long is used in speech/srec classes,
as native pointers can be 64-bit.

Note corresponding JNI files are in the external/srec project
under srec_jni directory.

Change-Id: Iacd10840e81f5acc3eb202424f83b49ae4eb23ab
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
10 years agoMerge "docs: Fixed typos in audio-focus.jd. Bug: 12528498 HTML: http://quixote.mtv...
Ricardo Cervera [Thu, 16 Jan 2014 01:26:13 +0000 (01:26 +0000)]
Merge "docs: Fixed typos in audio-focus.jd. Bug: 12528498 HTML: quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html" into klp-docs

10 years agoam 2f1c2e32: am 3126ce6e: Merge "docs: Fixed typo in InstrumentationTestRunner page...
quddusc [Thu, 16 Jan 2014 00:38:46 +0000 (16:38 -0800)]
am 2f1c2e32: am 3126ce6e: Merge "docs: Fixed typo in InstrumentationTestRunner page. Bug: 11386360" into klp-docs

* commit '2f1c2e32301018f800e0200c2d7ec01f990e0050':
  docs: Fixed typo in InstrumentationTestRunner page. Bug: 11386360

10 years agoam 3126ce6e: Merge "docs: Fixed typo in InstrumentationTestRunner page. Bug: 11386360...
quddusc [Thu, 16 Jan 2014 00:36:27 +0000 (00:36 +0000)]
am 3126ce6e: Merge "docs: Fixed typo in InstrumentationTestRunner page. Bug: 11386360" into klp-docs

* commit '3126ce6e096bebf4e21aea73d2bb872dcedb0d16':
  docs: Fixed typo in InstrumentationTestRunner page. Bug: 11386360

10 years agoMerge "docs: Fixed typo in InstrumentationTestRunner page. Bug: 11386360" into klp...
quddusc [Thu, 16 Jan 2014 00:32:21 +0000 (00:32 +0000)]
Merge "docs: Fixed typo in InstrumentationTestRunner page. Bug: 11386360" into klp-docs

10 years agoam 96f6ce38: am 291fb4b5: Merge "docs: Added calls to super.onDrawerZZZ() in the...
Ricardo Cervera [Thu, 16 Jan 2014 00:24:18 +0000 (16:24 -0800)]
am 96f6ce38: am 291fb4b5: Merge "docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug: 11371890 HTML: quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html" into klp-docs

* commit '96f6ce38e383c0a2d416678bdfce41426e3f6b45':
  docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug: 11371890 HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html

10 years agoam 291fb4b5: Merge "docs: Added calls to super.onDrawerZZZ() in the HTML for navigati...
Ricardo Cervera [Thu, 16 Jan 2014 00:20:55 +0000 (00:20 +0000)]
am 291fb4b5: Merge "docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug: 11371890 HTML: quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html" into klp-docs

* commit '291fb4b5ff8337d28ff8aa133cc2ea4a8fc09b58':
  docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug: 11371890 HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html

10 years agoMerge "docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples...
Ricardo Cervera [Thu, 16 Jan 2014 00:19:07 +0000 (00:19 +0000)]
Merge "docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug: 11371890 HTML: quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html" into klp-docs

10 years agoam d7a50a62: am 57801123: Merge "Doc change: add Drive API feature page. fix link...
Dirk Dougherty [Thu, 16 Jan 2014 00:14:13 +0000 (16:14 -0800)]
am d7a50a62: am 57801123: Merge "Doc change: add Drive API feature page. fix link text on several pages" into klp-docs

* commit 'd7a50a6282ac8540bcd9924d50c7ad27982a3dc9':
  Doc change: add Drive API feature page. fix link text on several pages

10 years agoam 5f26f2c9: am 6ec44a88: Merge "Doc change: update Mobile Ads to reflect new DFP...
Dirk Dougherty [Thu, 16 Jan 2014 00:14:07 +0000 (16:14 -0800)]
am 5f26f2c9: am 6ec44a88: Merge "Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore." into klp-docs

* commit '5f26f2c9d2ae49a3f20bfaa1c73b93ea61881209':
  Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore.

10 years agoam 57801123: Merge "Doc change: add Drive API feature page. fix link text on several...
Dirk Dougherty [Thu, 16 Jan 2014 00:10:38 +0000 (00:10 +0000)]
am 57801123: Merge "Doc change: add Drive API feature page. fix link text on several pages" into klp-docs

* commit '57801123c16a160d03dd265ca2f193b51e876186':
  Doc change: add Drive API feature page. fix link text on several pages

10 years agoam 6ec44a88: Merge "Doc change: update Mobile Ads to reflect new DFP, location, and...
Dirk Dougherty [Thu, 16 Jan 2014 00:10:34 +0000 (00:10 +0000)]
am 6ec44a88: Merge "Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore." into klp-docs

* commit '6ec44a882b87fffb37e9dbafe8c5535f16faf349':
  Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore.

10 years agoMerge "Doc change: add Drive API feature page. fix link text on several pages" into...
Dirk Dougherty [Thu, 16 Jan 2014 00:08:53 +0000 (00:08 +0000)]
Merge "Doc change: add Drive API feature page. fix link text on several pages" into klp-docs

10 years agoMerge "Doc change: update Mobile Ads to reflect new DFP, location, and other support...
Dirk Dougherty [Thu, 16 Jan 2014 00:07:34 +0000 (00:07 +0000)]
Merge "Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore." into klp-docs

10 years agoam 57756970: am a6aa3199: Merge "Fixed mistaken reference to "LTE". Bug 7637224"
Wink Saville [Wed, 15 Jan 2014 23:57:10 +0000 (15:57 -0800)]
am 57756970: am a6aa3199: Merge "Fixed mistaken reference to "LTE". Bug 7637224"

* commit '5775697029760ca886a287ef2c3119d5097ded56':
  Fixed mistaken reference to "LTE". Bug 7637224

10 years agoam a6aa3199: Merge "Fixed mistaken reference to "LTE". Bug 7637224"
Wink Saville [Wed, 15 Jan 2014 23:49:14 +0000 (15:49 -0800)]
am a6aa3199: Merge "Fixed mistaken reference to "LTE". Bug 7637224"

* commit 'a6aa3199bdb676e349c28b861a04c34a4ec136e0':
  Fixed mistaken reference to "LTE". Bug 7637224

10 years agoMerge "Fixed mistaken reference to "LTE". Bug 7637224"
Wink Saville [Wed, 15 Jan 2014 23:44:53 +0000 (23:44 +0000)]
Merge "Fixed mistaken reference to "LTE". Bug 7637224"

10 years agoam 77916b9a: am bf43ef27: Merge "docs: Updated Play Games services landing page to...
quddusc [Wed, 15 Jan 2014 23:40:55 +0000 (15:40 -0800)]
am 77916b9a: am bf43ef27: Merge "docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature." into klp-docs

* commit '77916b9ae1a5780f0aac46eb00d0fc835a8d6c84':
  docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature.

10 years agoam 57edc17c: am 563daeea: cherrypick from klp-ub-dev docs: Added API reference docs...
quddusc [Wed, 15 Jan 2014 23:40:50 +0000 (15:40 -0800)]
am 57edc17c: am 563daeea: cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release.  Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda

* commit '57edc17c398b3b438e1a3264219a6fa7f444341a':
  cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release.  Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda

10 years agoam bf43ef27: Merge "docs: Updated Play Games services landing page to reflect new...
quddusc [Wed, 15 Jan 2014 23:37:08 +0000 (23:37 +0000)]
am bf43ef27: Merge "docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature." into klp-docs

* commit 'bf43ef272ad386ad89d115ab8be1b706ae29034e':
  docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature.

10 years agoam 563daeea: cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi...
quddusc [Wed, 15 Jan 2014 23:37:04 +0000 (23:37 +0000)]
am 563daeea: cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release.  Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda

* commit '563daeeaf11bb17c8570e11de63d1f1d6fb0c8bc':
  cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release.  Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda

10 years agoMerge "docs: Updated Play Games services landing page to reflect new turn-based multi...
quddusc [Wed, 15 Jan 2014 23:34:49 +0000 (23:34 +0000)]
Merge "docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature." into klp-docs

10 years agodocs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug...
Ricardo Cervera [Wed, 15 Jan 2014 23:16:30 +0000 (15:16 -0800)]
docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug: 11371890
HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html

Change-Id: I08c63828b0250ca727b69dfbcf37f01a0328dcf9