git.osdn.net Git - android-x86/frameworks-base.git/log

OSDN Git Service

(root) / android-x86 / frameworks-base.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Narayan Kamath [Thu, 16 Jan 2014 15:41:52 +0000 (15:41 +0000)]

am 775667c0: am 03e8be75: am 8796ab7f: am bb35356d: Merge changes Id54087dd,I946325e4,I2a2b2e68

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

commit | commitdiff | tree

Narayan Kamath [Thu, 16 Jan 2014 15:41:47 +0000 (15:41 +0000)]

am 19bd2c28: am ab220dee: am 947d88a0: am 138d67c8: Merge "AArch64: Use long for pointers in MotionEvent class"

* commit '19bd2c28f9c3e4db12cad93ed2a69c17c95e42fd':
AArch64: Use long for pointers in MotionEvent class

commit | commitdiff | tree

Narayan Kamath [Thu, 16 Jan 2014 15:41:41 +0000 (15:41 +0000)]

am 8e96d73a: am e488f2c1: am a0b25d41: am d85bba8e: Merge "AArch64: Use long for pointers in VelocityTracker class"

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

commit | commitdiff | tree

Narayan Kamath [Thu, 16 Jan 2014 15:41:35 +0000 (15:41 +0000)]

am d7a54c65: am 31f10bb2: am 80b3dd0d: am 27a647bf: Merge "AArch64: Use long for pointers in android/os/MemoryFile"

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

commit | commitdiff | tree

Narayan Kamath [Thu, 16 Jan 2014 15:41:30 +0000 (15:41 +0000)]

am 425b08f1: am c1abb5e3: am 53321d99: am f19c50d6: Merge "AArch64: Use long for pointers in KeyCharacterMap class"

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

commit | commitdiff | tree

Narayan Kamath [Thu, 16 Jan 2014 15:41:24 +0000 (15:41 +0000)]

am 1d78ae42: am 24d63a83: am bc0468e6: am 6f17adba: Merge "AArch64: Use long for pointers in media classes"

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

commit | commitdiff | tree

Elliott Hughes [Thu, 16 Jan 2014 15:41:18 +0000 (15:41 +0000)]

am c12410f1: am c3be4ba3: am 12377887: am 991e9818: Merge "AArch64: Use long for pointers in speech/srec classes"

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Ricardo Cervera [Thu, 16 Jan 2014 15:29:55 +0000 (15:29 +0000)]

am bb6c94f9: 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 'bb6c94f96767ad9f97d35763ef97b8aa17b32c9c':
docs: Fixed typos in audio-focus.jd. Bug: 12528498 HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Narayan Kamath [Thu, 16 Jan 2014 12:11:53 +0000 (12:11 +0000)]

Merge "AArch64: Use long for pointers in MotionEvent class"

commit | commitdiff | tree

Narayan Kamath [Thu, 16 Jan 2014 12:11:50 +0000 (12:11 +0000)]

Merge "AArch64: Use long for pointers in VelocityTracker class"

commit | commitdiff | tree

Narayan Kamath [Thu, 16 Jan 2014 12:11:45 +0000 (12:11 +0000)]

Merge "AArch64: Use long for pointers in android/os/MemoryFile"

commit | commitdiff | tree

Narayan Kamath [Thu, 16 Jan 2014 12:11:42 +0000 (12:11 +0000)]

Merge "AArch64: Use long for pointers in KeyCharacterMap class"

commit | commitdiff | tree

Narayan Kamath [Thu, 16 Jan 2014 12:11:37 +0000 (12:11 +0000)]

Merge "AArch64: Use long for pointers in media classes"

commit | commitdiff | tree

Craig Mautner [Thu, 16 Jan 2014 01:55:51 +0000 (17:55 -0800)]

Fix NPE when destroyActivity occurs after detach.

*** FATAL EXCEPTION IN SYSTEM PROCESS: ActivityManager
java.lang.NullPointerException
at com.android.server.am.ActivityStack.removeTask(ActivityStack.java:3627)
at com.android.server.am.ActivityStack.removeActivityFromHistoryLocked(ActivityStack.java:2693)
at com.android.server.am.ActivityStack.activityDestroyedLocked(ActivityStack.java:2878)
at com.android.server.am.ActivityStack$ActivityStackHandler.handleMessage(ActivityStack.java:296)
at android.os.Handler.dispatchMessage(Handler.java:102)
at android.os.Looper.loop(Looper.java:136)
at com.android.server.am.ActivityManagerService$AThread.run(ActivityManagerService.java:1868)

Change-Id: Ifaf0fe6c62d1f63897d57dc96b4d86d8111b45db

commit | commitdiff | tree

Craig Mautner [Thu, 16 Jan 2014 01:49:23 +0000 (01:49 +0000)]

Merge "Cleanup after ActivityView" into klp-modular-dev

commit | commitdiff | tree

Craig Mautner [Mon, 13 Jan 2014 05:11:08 +0000 (21:11 -0800)]

Cleanup after ActivityView

- Release Surface and VirtualDisplay when shutting down ActivityView.
- Shut down child stacks when relaunching parent activity.

Change-Id: I60314b2b43bd2da5406cf6ec871293b5baca157c

commit | commitdiff | tree

Elliott Hughes [Thu, 16 Jan 2014 01:38:51 +0000 (01:38 +0000)]

Merge "AArch64: Use long for pointers in speech/srec classes"

commit | commitdiff | tree

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>

commit | commitdiff | tree

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

commit | commitdiff | tree

quddusc [Thu, 16 Jan 2014 00:44:54 +0000 (00:44 +0000)]

am fc6b772f: am bf6d0797: am 2f1c2e32: am 3126ce6e: Merge "docs: Fixed typo in InstrumentationTestRunner page. Bug: 11386360" into klp-docs

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

quddusc [Thu, 16 Jan 2014 00:32:21 +0000 (00:32 +0000)]

Merge "docs: Fixed typo in InstrumentationTestRunner page. Bug: 11386360" into klp-docs

commit | commitdiff | tree

Ricardo Cervera [Thu, 16 Jan 2014 00:30:36 +0000 (00:30 +0000)]

am 7984122e: 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 '7984122e5e2fbb516e43ccc0cbc3211a82197ca7':
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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Dirk Dougherty [Thu, 16 Jan 2014 00:20:16 +0000 (00:20 +0000)]

am 26f9d980: am 7be6af67: am d7a50a62: am 57801123: Merge "Doc change: add Drive API feature page. fix link text on several pages" into klp-docs

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

commit | commitdiff | tree

Dirk Dougherty [Thu, 16 Jan 2014 00:20:11 +0000 (00:20 +0000)]

am b888739d: 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 'b888739d3857e26308942574363e072d5cfbcbad':
Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Wink Saville [Thu, 16 Jan 2014 00:03:13 +0000 (00:03 +0000)]

am ab092bb0: am 46988138: am 57756970: am a6aa3199: Merge "Fixed mistaken reference to "LTE". Bug 7637224"

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

commit | commitdiff | tree

Wink Saville [Thu, 16 Jan 2014 00:00:18 +0000 (00:00 +0000)]

am 46988138: am 57756970: am a6aa3199: Merge "Fixed mistaken reference to "LTE". Bug 7637224"

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

quddusc [Wed, 15 Jan 2014 23:47:45 +0000 (23:47 +0000)]

am cf280856: am f6490353: am 77916b9a: am bf43ef27: Merge "docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature." into klp-docs

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

commit | commitdiff | tree

quddusc [Wed, 15 Jan 2014 23:47:39 +0000 (23:47 +0000)]

am 18ae7b08: am dba65d6f: am 57edc17c: am 563daeea: cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release. Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda

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

commit | commitdiff | tree

Wink Saville [Wed, 15 Jan 2014 23:44:53 +0000 (23:44 +0000)]

Merge "Fixed mistaken reference to "LTE". Bug 7637224"

commit | commitdiff | tree

quddusc [Wed, 15 Jan 2014 23:43:52 +0000 (23:43 +0000)]

am f6490353: am 77916b9a: am bf43ef27: Merge "docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature." into klp-docs

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

commit | commitdiff | tree

quddusc [Wed, 15 Jan 2014 23:43:47 +0000 (23:43 +0000)]

am dba65d6f: am 57edc17c: am 563daeea: cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release. Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

quddusc [Wed, 4 Dec 2013 03:31:14 +0000 (19:31 -0800)]

cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release. Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda

Change-Id: I6b00a0b0c209b2703db62ea7fd103ac6a58b36a8

commit | commitdiff | tree

Ricardo Cervera [Wed, 15 Jan 2014 21:50:43 +0000 (13:50 -0800)]

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

Change-Id: I2198e4e27661b374d7c812bc7f26658073feae20

commit | commitdiff | tree

Ricardo Cervera [Wed, 15 Jan 2014 21:18:07 +0000 (21:18 +0000)]

am 6150b2c6: am 4f216e1d: am c919f4f4: am bab2235a: Merge "docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954" into klp-docs

* commit '6150b2c6ac95dc9b0bd3556d6e542402b5899da6':
docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954

commit | commitdiff | tree

Ricardo Cervera [Wed, 15 Jan 2014 21:13:41 +0000 (21:13 +0000)]

am 4f216e1d: am c919f4f4: am bab2235a: Merge "docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954" into klp-docs

* commit '4f216e1db9c01e5bbdf461fe25d41bad2874c082':
docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954

commit | commitdiff | tree

Ricardo Cervera [Wed, 15 Jan 2014 21:11:13 +0000 (13:11 -0800)]

am c919f4f4: am bab2235a: Merge "docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954" into klp-docs

* commit 'c919f4f47787245ddda32d0e41e7bae0facd0ee8':
docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954

commit | commitdiff | tree

Ricardo Cervera [Wed, 15 Jan 2014 21:07:21 +0000 (21:07 +0000)]

am bab2235a: Merge "docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954" into klp-docs

* commit 'bab2235ae89e37452e9be8a8b6d2581fe59e0162':
docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954

commit | commitdiff | tree

Ricardo Cervera [Wed, 15 Jan 2014 21:03:54 +0000 (21:03 +0000)]

Merge "docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954" into klp-docs

commit | commitdiff | tree

Jeff Hao [Wed, 15 Jan 2014 19:48:18 +0000 (19:48 +0000)]

am 6c13f384: am 56b11064: am 9a5005a3: am f6730d26: Merge "Add sample profiling interface to startMethodTracing."

* commit '6c13f384749150e9fa6f930023a9161fe97402d0':
Add sample profiling interface to startMethodTracing.

commit | commitdiff | tree

Jeff Hao [Wed, 15 Jan 2014 19:45:06 +0000 (19:45 +0000)]

am 56b11064: am 9a5005a3: am f6730d26: Merge "Add sample profiling interface to startMethodTracing."

* commit '56b110649424534de36ca41b3e352a73b6bdf3c0':
Add sample profiling interface to startMethodTracing.

commit | commitdiff | tree

Jeff Hao [Wed, 15 Jan 2014 19:41:30 +0000 (11:41 -0800)]

am 9a5005a3: am f6730d26: Merge "Add sample profiling interface to startMethodTracing."

* commit '9a5005a3bfa419cb856a83ca34a67556d9fd5b74':
Add sample profiling interface to startMethodTracing.

commit | commitdiff | tree

Jeff Hao [Wed, 15 Jan 2014 19:38:01 +0000 (11:38 -0800)]

am f6730d26: Merge "Add sample profiling interface to startMethodTracing."

* commit 'f6730d26841377de0f7ee60fa78c6ef2f8be1f2e':
Add sample profiling interface to startMethodTracing.

commit | commitdiff | tree

Jeff Hao [Wed, 15 Jan 2014 19:34:39 +0000 (19:34 +0000)]

Merge "Add sample profiling interface to startMethodTracing."

commit | commitdiff | tree

Jeff Hao [Mon, 6 Jan 2014 23:52:52 +0000 (15:52 -0800)]

Add sample profiling interface to startMethodTracing.

Frameworks base side of this change. Also changed art and libcore.

Change-Id: Ib5ba0445163dca714d1ae66430750346ff8811be

commit | commitdiff | tree

Ricardo Cervera [Wed, 15 Jan 2014 19:25:10 +0000 (11:25 -0800)]

docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954

Change-Id: I6c247e172b2a6dd0ef25afc6cf33f0960fc0fa8d
Review: http://quixote.mtv.corp.google.com:8101/google/play/publishing/multiple-apks.html

commit | commitdiff | tree

quddusc [Wed, 15 Jan 2014 18:08:32 +0000 (18:08 +0000)]

am 25e1900b: am e8ae214c: am f4011173: am 31573d45: Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754" into klp-docs

* commit '25e1900beee4959be28ede9e00b8c5e8f10c1e17':
docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754

commit | commitdiff | tree

quddusc [Wed, 15 Jan 2014 18:04:31 +0000 (18:04 +0000)]

am e8ae214c: am f4011173: am 31573d45: Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754" into klp-docs

* commit 'e8ae214c31b4c5c2e90538b9d0a5c258e32fafeb':
docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754

commit | commitdiff | tree

quddusc [Wed, 15 Jan 2014 18:00:53 +0000 (10:00 -0800)]

am f4011173: am 31573d45: Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754" into klp-docs

* commit 'f40111731581f03dc1b447b432331b3415fb87b9':
docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754

commit | commitdiff | tree

quddusc [Wed, 15 Jan 2014 17:57:27 +0000 (17:57 +0000)]

am 31573d45: Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754" into klp-docs

* commit '31573d45933886237dd6414978486b79a4dd4f9f':
docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754

commit | commitdiff | tree

quddusc [Wed, 15 Jan 2014 17:55:21 +0000 (17:55 +0000)]

Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754" into klp-docs

commit | commitdiff | tree

Marco Nelissen [Wed, 15 Jan 2014 17:29:43 +0000 (17:29 +0000)]

am e495a5a3: am cb15fb60: am 0d4916f1: am c3036a12: Merge "Before requerying a cursor, check if it is closed."

* commit 'e495a5a3f3feec6319262a6bdab3b7704d6ab843':
Before requerying a cursor, check if it is closed.

commit | commitdiff | tree

Marco Nelissen [Wed, 15 Jan 2014 17:27:19 +0000 (17:27 +0000)]

am cb15fb60: am 0d4916f1: am c3036a12: Merge "Before requerying a cursor, check if it is closed."

* commit 'cb15fb6041e604025d4b76645435f8cbafee754c':
Before requerying a cursor, check if it is closed.

frameworks/base

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.