OSDN Git Service
quddusc [Wed, 22 Jan 2014 05:46:32 +0000 (05:46 +0000)]
am
c99557c9: am
0cb965a6: am
5020a873: Merge "cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da" into klp-docs
* commit '
c99557c92c9bebc089c4eb7bf37a63dca8f28a6a':
cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da
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
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
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
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
Scott Main [Wed, 22 Jan 2014 01:55:31 +0000 (01:55 +0000)]
Scott Main [Wed, 22 Jan 2014 01:52:05 +0000 (17:52 -0800)]
Christopher Tate [Wed, 22 Jan 2014 01:51:34 +0000 (01:51 +0000)]
am
a7a9327b: am
5474f085: am
9fc157a4: Merge "FLAG_PRIVILEGED disappears if privileged app is updated and rebooted"
* commit '
a7a9327be8b2b2ee2a461d1a0558c0c7b5b9271c':
FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
Scott Main [Wed, 22 Jan 2014 01:49:36 +0000 (01:49 +0000)]
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
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
Christopher Tate [Wed, 22 Jan 2014 01:42:50 +0000 (01:42 +0000)]
Merge "FLAG_PRIVILEGED disappears if privileged app is updated and rebooted"
Scott Main [Tue, 21 Jan 2014 18:12:07 +0000 (10:12 -0800)]
fix code typo
Change-Id: I66c86cb778a7e2237e71a7a70dee420d82a5e557
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
Elliott Hughes [Sat, 18 Jan 2014 02:42:01 +0000 (02:42 +0000)]
am
8da106eb: am
aa80f1a3: am
c9a60b0f: Merge "Don\'t confuse stat and stat64."
* commit '
8da106ebf31d725c00c1910a51f6e1cfb0d8c052':
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.
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.
Elliott Hughes [Sat, 18 Jan 2014 02:32:39 +0000 (02:32 +0000)]
Merge "Don'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
Chris Craik [Fri, 17 Jan 2014 19:27:34 +0000 (19:27 +0000)]
am
e9a7d229: am
66b5a2b2: am
5150eb8f: Merge "Initialize pointer members to NULL to avoid illegal reference"
* commit '
e9a7d22963739bfdace392b9a1707cb0936d25b3':
Initialize pointer members to NULL to avoid illegal reference
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
Narayan Kamath [Fri, 17 Jan 2014 19:23:12 +0000 (19:23 +0000)]
am
e66fa5c1: am
251de854: am
53e9bfae: Merge "Fix error checking in MemoryFile."
* commit '
e66fa5c1851f48dce95364dc0acbde1b9f39f160':
Fix error checking in MemoryFile.
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
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.
Chris Craik [Fri, 17 Jan 2014 18:41:14 +0000 (18:41 +0000)]
Merge "Initialize pointer members to NULL to avoid illegal reference"
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.
Narayan Kamath [Fri, 17 Jan 2014 10:25:27 +0000 (10:25 +0000)]
Merge "Fix error checking in MemoryFile."
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
Joe Fernandez [Thu, 16 Jan 2014 22:56:15 +0000 (22:56 +0000)]
am
12382d13: am
fcab250d: am
16fe3737: Merge "docs: Added note to Support Library Setup page: mediarouter to appcompat dependency" into klp-docs
* commit '
12382d13ff70c591ee31ed6b9004298a037b38e9':
docs: Added note to Support Library Setup page: mediarouter to appcompat dependency
Joe Fernandez [Thu, 16 Jan 2014 22:55:52 +0000 (22:55 +0000)]
am
75a09a75: am
94149cfb: am
acf2b906: Merge "Fixing bugs in MediaPlayer docs" into klp-docs
* commit '
75a09a752aaf276cc3defee2874270cd20bd8a69':
Fixing bugs in MediaPlayer docs
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
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
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
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
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
Joe Fernandez [Thu, 16 Jan 2014 22:46:17 +0000 (22:46 +0000)]
Merge "Fixing bugs in MediaPlayer docs" into klp-docs
quddusc [Thu, 16 Jan 2014 16:11:25 +0000 (16:11 +0000)]
am
c2cc2999: am
7e8a997f: am
62729b15: Merge "docs: Removed obsolete screenshot of Play Store purchase flow. Bug:
9846095" into klp-docs
* commit '
c2cc2999983d221b293d561dd6af8ac0820266c4':
docs: Removed obsolete screenshot of Play Store purchase flow. Bug:
9846095
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
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
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
Narayan Kamath [Thu, 16 Jan 2014 15:38:34 +0000 (15:38 +0000)]
am
d569e21d: am
48de490c: am
486544f7: Merge "AArch64: Use long for pointers in view/input classes"
* commit '
d569e21dac38fffe0e6a7f935e9a6965495b87d4':
AArch64: Use long for pointers in view/input classes
Narayan Kamath [Thu, 16 Jan 2014 15:38:29 +0000 (15:38 +0000)]
am
42defa02: am
faa62aac: am
84ee7930: Merge "AArch64: Use long for pointers in android/os/MessageQueue"
* commit '
42defa02337b94d25714fe737f749f2c3300c790':
AArch64: Use long for pointers in android/os/MessageQueue
Narayan Kamath [Thu, 16 Jan 2014 15:38:24 +0000 (15:38 +0000)]
am
6b81bfd1: am
caea42fd: am
98002dfb: Merge "AArch64: Use long for pointers in graphics/PathMeasure"
* commit '
6b81bfd10f63c166ff6e4afb0f267ce9e5275366':
AArch64: Use long for pointers in graphics/PathMeasure
Narayan Kamath [Thu, 16 Jan 2014 15:38:19 +0000 (15:38 +0000)]
am
87a82800: am
aef12450: am
1b0f0be0: Merge "Make YuvToJpegEncoder more JNI compliant"
* commit '
87a82800658c9bcad75881d9761b412a024d7969':
Make YuvToJpegEncoder more JNI compliant
Narayan Kamath [Thu, 16 Jan 2014 15:38:15 +0000 (15:38 +0000)]
am
03e8be75: am
8796ab7f: am
bb35356d: Merge changes Id54087dd,I946325e4,I2a2b2e68
* commit '
03e8be757d2703d52fad3fd153c6bcf0b13ed1d1':
AArch64: Use long for pointers in BitmapRegionDecoder
AArch64: Use long for pointers in Movie class
AArch64: Add AssetInputStream.getNativeAsset
Narayan Kamath [Thu, 16 Jan 2014 15:38:10 +0000 (15:38 +0000)]
am
ab220dee: am
947d88a0: am
138d67c8: Merge "AArch64: Use long for pointers in MotionEvent class"
* commit '
ab220deeb8a413649335d5ef47d974dfdc3ac5ec':
AArch64: Use long for pointers in MotionEvent class
Narayan Kamath [Thu, 16 Jan 2014 15:38:05 +0000 (15:38 +0000)]
am
e488f2c1: am
a0b25d41: am
d85bba8e: Merge "AArch64: Use long for pointers in VelocityTracker class"
* commit '
e488f2c154f089141709279dd93bcd641c85659b':
AArch64: Use long for pointers in VelocityTracker class
Narayan Kamath [Thu, 16 Jan 2014 15:38:00 +0000 (15:38 +0000)]
am
31f10bb2: am
80b3dd0d: am
27a647bf: Merge "AArch64: Use long for pointers in android/os/MemoryFile"
* commit '
31f10bb21b24824c5dbf60b420239513f02b9e55':
AArch64: Use long for pointers in android/os/MemoryFile
Narayan Kamath [Thu, 16 Jan 2014 15:37:55 +0000 (15:37 +0000)]
am
c1abb5e3: am
53321d99: am
f19c50d6: Merge "AArch64: Use long for pointers in KeyCharacterMap class"
* commit '
c1abb5e3957f6abdd9cea8f2717290a3f130a216':
AArch64: Use long for pointers in KeyCharacterMap class
Narayan Kamath [Thu, 16 Jan 2014 15:37:50 +0000 (15:37 +0000)]
am
24d63a83: am
bc0468e6: am
6f17adba: Merge "AArch64: Use long for pointers in media classes"
* commit '
24d63a838211db019bf7ea970a0d844d8033b729':
AArch64: Use long for pointers in media classes
Elliott Hughes [Thu, 16 Jan 2014 15:37:45 +0000 (15:37 +0000)]
am
c3be4ba3: am
12377887: am
991e9818: Merge "AArch64: Use long for pointers in speech/srec classes"
* commit '
c3be4ba304196f1624818dce3da43492156b62fe':
AArch64: Use long for pointers in speech/srec 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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Ricardo Cervera [Thu, 16 Jan 2014 15:27:25 +0000 (15:27 +0000)]
am
8f8a6145: 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 '
8f8a614534bf9de38b214b74d28a7aea69959f18':
docs: Fixed typos in audio-focus.jd. Bug:
12528498 HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html
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
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
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
Narayan Kamath [Thu, 16 Jan 2014 12:12:15 +0000 (12:12 +0000)]
Merge "AArch64: Use long for pointers in view/input classes"
Narayan Kamath [Thu, 16 Jan 2014 12:11:39 +0000 (12:11 +0000)]
Merge "AArch64: Use long for pointers in android/os/MessageQueue"
Narayan Kamath [Thu, 16 Jan 2014 12:12:11 +0000 (12:12 +0000)]
Merge "AArch64: Use long for pointers in graphics/PathMeasure"
Narayan Kamath [Thu, 16 Jan 2014 12:12:00 +0000 (12:12 +0000)]
Merge "Make YuvToJpegEncoder more JNI compliant"
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
Narayan Kamath [Thu, 16 Jan 2014 12:11:53 +0000 (12:11 +0000)]
Merge "AArch64: Use long for pointers in MotionEvent class"
Narayan Kamath [Thu, 16 Jan 2014 12:11:50 +0000 (12:11 +0000)]
Merge "AArch64: Use long for pointers in VelocityTracker class"
Narayan Kamath [Thu, 16 Jan 2014 12:11:45 +0000 (12:11 +0000)]
Merge "AArch64: Use long for pointers in android/os/MemoryFile"
Narayan Kamath [Thu, 16 Jan 2014 12:11:42 +0000 (12:11 +0000)]
Merge "AArch64: Use long for pointers in KeyCharacterMap class"
Narayan Kamath [Thu, 16 Jan 2014 12:11:37 +0000 (12:11 +0000)]
Merge "AArch64: Use long for pointers in media classes"
Elliott Hughes [Thu, 16 Jan 2014 01:38:51 +0000 (01:38 +0000)]
Merge "AArch64: 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>
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
quddusc [Thu, 16 Jan 2014 00:41:59 +0000 (00:41 +0000)]
am
bf6d0797: am
2f1c2e32: am
3126ce6e: Merge "docs: Fixed typo in InstrumentationTestRunner page. Bug:
11386360" into klp-docs
* commit '
bf6d079783a48b9e0a05d9fc650d04c324c431a7':
docs: Fixed typo in InstrumentationTestRunner page. Bug:
11386360
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
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
quddusc [Thu, 16 Jan 2014 00:32:21 +0000 (00:32 +0000)]
Merge "docs: Fixed typo in InstrumentationTestRunner page. Bug:
11386360" into klp-docs
Ricardo Cervera [Thu, 16 Jan 2014 00:27:29 +0000 (00:27 +0000)]
am
04666c91: 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 '
04666c91808c5e5efa39d9a490b6f18161e65968':
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
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
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
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
Dirk Dougherty [Thu, 16 Jan 2014 00:17:18 +0000 (00:17 +0000)]
am
7be6af67: am
d7a50a62: am
57801123: Merge "Doc change: add Drive API feature page. fix link text on several pages" into klp-docs
* commit '
7be6af670e25db5390bb5d79bc1a35973bd0c5aa':
Doc change: add Drive API feature page. fix link text on several pages
Dirk Dougherty [Thu, 16 Jan 2014 00:17:13 +0000 (00:17 +0000)]
am
dd8def1e: 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 '
dd8def1e15bf0726ea087f46f91c0f1d533621c9':
Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore.
OSDN Git Service
