OSDN Git Service

android-x86/frameworks-base.git
10 years agoam 72159ab0: Merge "docs: Fixed declarations for ArrayList<String> variables in the...
quddusc [Tue, 14 Jan 2014 20:31:51 +0000 (20:31 +0000)]
am 72159ab0: Merge "docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug: 9316251" into klp-docs

* commit '72159ab085c48f4451ccf44a436e8b2122716fd4':
  docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug: 9316251

10 years agoMerge "docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code...
quddusc [Tue, 14 Jan 2014 20:28:55 +0000 (20:28 +0000)]
Merge "docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug: 9316251" into klp-docs

10 years agoam 85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs
John Spurlock [Tue, 14 Jan 2014 19:50:38 +0000 (19:50 +0000)]
am 85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs

* commit '85f98508366e8422f71553d2a5e682eb804c7419':
  Docfixes: three typos and escape */*.

10 years agoMerge "Docfixes: three typos and escape */*." into klp-docs
John Spurlock [Tue, 14 Jan 2014 19:48:12 +0000 (19:48 +0000)]
Merge "Docfixes: three typos and escape */*." into klp-docs

10 years agoam 1a21c16b: Merge "docs: Fixed typo in AlertDialog code snippet." into klp-docs
Ricardo Cervera [Tue, 14 Jan 2014 17:36:07 +0000 (17:36 +0000)]
am 1a21c16b: Merge "docs: Fixed typo in AlertDialog code snippet." into klp-docs

* commit '1a21c16b2bd74c022d6b83177027b78992dc42b5':
  docs: Fixed typo in AlertDialog code snippet.

10 years agoMerge "docs: Fixed typo in AlertDialog code snippet." into klp-docs
Ricardo Cervera [Tue, 14 Jan 2014 17:34:21 +0000 (17:34 +0000)]
Merge "docs: Fixed typo in AlertDialog code snippet." into klp-docs

10 years agoam c174288d: Fix issue #12031685: Sticky Service Breakage in Android 4.4.1
Dianne Hackborn [Tue, 14 Jan 2014 01:42:01 +0000 (17:42 -0800)]
am c174288d: Fix issue #12031685: Sticky Service Breakage in Android 4.4.1

* commit 'c174288d345d4a80b326b12ff4c10a6c99570997':
  Fix issue #12031685: Sticky Service Breakage in Android 4.4.1

10 years agoFix issue #12031685: Sticky Service Breakage in Android 4.4.1
Dianne Hackborn [Mon, 9 Dec 2013 19:26:11 +0000 (11:26 -0800)]
Fix issue #12031685: Sticky Service Breakage in Android 4.4.1

Got a little too aggressive about cleaning up service state; need to
avoid removing services from an app until we are in the second loop
doing the final cleanup, otherwise we can leave services around with
restarting their process.

Also fix crash:

W/BinderNative(  667): Uncaught exception from death notification
W/BinderNative(  667): java.lang.ArrayIndexOutOfBoundsException: length=0; index=0
W/BinderNative(  667):  at android.util.ArraySet.valueAt(ArraySet.java:301)
W/BinderNative(  667):  at com.android.server.am.ActiveServices.killServicesLocked(ActiveServices.java:2069)
W/BinderNative(  667):  at com.android.server.am.ActivityManagerService.cleanUpApplicationRecordLocked(ActivityManagerService.java:12412)
W/BinderNative(  667):  at com.android.server.am.ActivityManagerService.handleAppDiedLocked(ActivityManagerService.java:3596)
W/BinderNative(  667):  at com.android.server.am.ActivityManagerService.appDiedLocked(ActivityManagerService.java:3744)
W/BinderNative(  667):  at com.android.server.am.ActivityManagerService$AppDeathRecipient.binderDied(ActivityManagerService.java:1024)
W/BinderNative(  667):  at android.os.BinderProxy.sendDeathNotice(Binder.java:493)
W/BinderNative(  667):  at dalvik.system.NativeStart.run(Native Method)

10 years agodocs: Fixed typo in AlertDialog code snippet.
Ricardo Cervera [Tue, 14 Jan 2014 00:44:19 +0000 (16:44 -0800)]
docs: Fixed typo in AlertDialog code snippet.

Bug-ID:10797361

Review URL:
http://quixote.mtv.corp.google.com:8001/guide/topics/ui/dialogs.html#AlertDialog

Change-Id: If93e140d624c2a4360a27bfae630f19fce24d7ab

10 years agoam 5e15e1ab: Merge "docs: Fixed typo." into klp-docs
Ricardo Cervera [Tue, 14 Jan 2014 00:19:55 +0000 (00:19 +0000)]
am 5e15e1ab: Merge "docs: Fixed typo." into klp-docs

* commit '5e15e1abe8a14f95ab40cf8181ac2a4f8b5d76e2':
  docs: Fixed typo.

10 years agoam ac5ad7b9: docs: Fixed typos.
Ricardo Cervera [Tue, 14 Jan 2014 00:19:51 +0000 (00:19 +0000)]
am ac5ad7b9: docs: Fixed typos.

* commit 'ac5ad7b9e488a967ffee56fd1b168c010c1d62e8':
  docs: Fixed typos.

10 years agoMerge "docs: Fixed typo." into klp-docs
Ricardo Cervera [Tue, 14 Jan 2014 00:18:23 +0000 (00:18 +0000)]
Merge "docs: Fixed typo." into klp-docs

10 years agodocs: Fixed typos.
Ricardo Cervera [Mon, 13 Jan 2014 21:48:45 +0000 (13:48 -0800)]
docs: Fixed typos.

bug:10732654
Change-Id: I5a580cf40e2670485f9c57e2376efd20bcf7b60d

Review URL: http://quixote.mtv.corp.google.com:8002/training/articles/security-tips.html

10 years agodocs: Fixed typo.
Ricardo Cervera [Mon, 13 Jan 2014 21:27:47 +0000 (13:27 -0800)]
docs: Fixed typo.

bug:10797855
Change-Id: I2fdfa02046827a51eb7263e1892a04acfd4f0453

Review fix URL:
http://quixote.mtv.corp.google.com:8001/distribute/index.html

10 years agoam 301b1fac: am 26c6c15f: am b3c96c4c: am 1d151607: am 4013c4b1: am 42d7a0bf: am...
David Christie [Mon, 13 Jan 2014 20:59:20 +0000 (12:59 -0800)]
am 301b1fac: am 26c6c15f: am b3c96c4c: am 1d151607: am 4013c4b1: am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge

* commit '301b1facb23d148efebd7a2aa5c174cd7c04cc6f':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

10 years agoam 26c6c15f: am b3c96c4c: am 1d151607: am 4013c4b1: am 42d7a0bf: am a7d13fab: am...
David Christie [Mon, 13 Jan 2014 20:56:27 +0000 (12:56 -0800)]
am 26c6c15f: am b3c96c4c: am 1d151607: am 4013c4b1: am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge

* commit '26c6c15f54231c154bb2f7febb053d034cbe40c5':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

10 years agoam b3c96c4c: am 1d151607: am 4013c4b1: am 42d7a0bf: am a7d13fab: am 45aaa377: am...
David Christie [Mon, 13 Jan 2014 20:53:27 +0000 (12:53 -0800)]
am b3c96c4c: am 1d151607: am 4013c4b1: am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge

* commit 'b3c96c4c57cb97924f828ea917b1c4d63b2c9d00':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

10 years agoam 1d151607: am 4013c4b1: am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am...
David Christie [Mon, 13 Jan 2014 20:50:18 +0000 (12:50 -0800)]
am 1d151607: am 4013c4b1: am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge

* commit '1d151607fbee65fc9fc2bb1cb38a850c1f68bede':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

10 years agoam 4013c4b1: am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge...
David Christie [Mon, 13 Jan 2014 20:46:35 +0000 (12:46 -0800)]
am 4013c4b1: am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge

* commit '4013c4b18ccc66b510f4cdb222d4c04597975843':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

10 years agoam 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc397...
David Christie [Mon, 13 Jan 2014 20:43:47 +0000 (12:43 -0800)]
am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge

* commit '42d7a0bff5da6aeb8323ae0c797e9c4e116b637b':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

10 years agoam a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into...
David Christie [Mon, 13 Jan 2014 20:41:48 +0000 (12:41 -0800)]
am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge

* commit 'a7d13fabd6184e411215e9a841cf16097f1a5127':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

10 years agoam 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge
David Christie [Mon, 13 Jan 2014 20:40:04 +0000 (12:40 -0800)]
am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge

* commit '45aaa377c5d090003c6cf5fb54fff856a0807c4f':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

10 years agoam a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge
David Christie [Mon, 13 Jan 2014 20:36:49 +0000 (12:36 -0800)]
am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge

* commit 'a1b89310d58df14570f7f6f5abb677c976c63a7a':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

10 years agoam a87bdc1f: Merge commit \'bc39746e\' into manualmerge
David Christie [Mon, 13 Jan 2014 20:33:39 +0000 (12:33 -0800)]
am a87bdc1f: Merge commit \'bc39746e\' into manualmerge

* commit 'a87bdc1f8ff308f90ec7a3234c4848c79d4c3988':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

10 years agoam af2f2f76: am 9ecadd7c: am 6f34b938: am 3238d0d9: Merge "Clear cached locations...
Daniel Cashman [Mon, 13 Jan 2014 19:00:02 +0000 (11:00 -0800)]
am af2f2f76: am 9ecadd7c: am 6f34b938: am 3238d0d9: Merge "Clear cached locations when location providers disabled Bug: 12118307" into jb-mr2-dev

* commit 'af2f2f767a1673f10a2b44f913832cacefda341b':
  Clear cached locations when location providers disabled Bug: 12118307

10 years agoam 9ecadd7c: am 6f34b938: am 3238d0d9: Merge "Clear cached locations when location...
Daniel Cashman [Mon, 13 Jan 2014 18:56:41 +0000 (10:56 -0800)]
am 9ecadd7c: am 6f34b938: am 3238d0d9: Merge "Clear cached locations when location providers disabled Bug: 12118307" into jb-mr2-dev

* commit '9ecadd7cedc492faef163a314713caddbd5da39a':
  Clear cached locations when location providers disabled Bug: 12118307

10 years agoam 6f34b938: am 3238d0d9: Merge "Clear cached locations when location providers disab...
Daniel Cashman [Mon, 13 Jan 2014 18:53:31 +0000 (10:53 -0800)]
am 6f34b938: am 3238d0d9: Merge "Clear cached locations when location providers disabled Bug: 12118307" into jb-mr2-dev

* commit '6f34b9382f0dac64952e0e5c05e96ea2ef3e28e8':
  Clear cached locations when location providers disabled Bug: 12118307

10 years agoam 3238d0d9: Merge "Clear cached locations when location providers disabled Bug:...
Daniel Cashman [Mon, 13 Jan 2014 18:50:03 +0000 (10:50 -0800)]
am 3238d0d9: Merge "Clear cached locations when location providers disabled Bug: 12118307" into jb-mr2-dev

* commit '3238d0d9f98d4d0972e52a81a4e9b8d2aea0436d':
  Clear cached locations when location providers disabled Bug: 12118307

10 years agoam 4503409a: Merge "Clear cached locations when location providers disabled Bug:...
Daniel Cashman [Mon, 13 Jan 2014 18:49:40 +0000 (10:49 -0800)]
am 4503409a: Merge "Clear cached locations when location providers disabled Bug: 12118307" into klp-dev

* commit '4503409a477f3fca2eb60e4105d804069d7b0cad':
  Clear cached locations when location providers disabled Bug: 12118307

10 years agoMerge "Clear cached locations when location providers disabled Bug: 12118307" into...
Daniel Cashman [Mon, 13 Jan 2014 18:44:45 +0000 (18:44 +0000)]
Merge "Clear cached locations when location providers disabled Bug: 12118307" into jb-mr2-dev

10 years agoMerge "Clear cached locations when location providers disabled Bug: 12118307" into...
Daniel Cashman [Mon, 13 Jan 2014 18:44:37 +0000 (18:44 +0000)]
Merge "Clear cached locations when location providers disabled Bug: 12118307" into klp-dev

10 years agoam ccc5ca14: Doc change: dashboard update.
Dirk Dougherty [Fri, 10 Jan 2014 23:06:16 +0000 (23:06 +0000)]
am ccc5ca14: Doc change: dashboard update.

* commit 'ccc5ca144c2d6e21df5118870d0a3f3c65055686':
  Doc change: dashboard update.

10 years agoDoc change: dashboard update.
Dirk Dougherty [Wed, 8 Jan 2014 23:52:27 +0000 (15:52 -0800)]
Doc change: dashboard update.

Change-Id: Ic65cd8d6bf2435fa3efd73f3337c462c02a752ed

10 years agoam a4bd5931: am c454bbe8: (-s ours) am b15429a6: am 503c5a32: am ea47cb67: (-s ours...
David Christie [Fri, 10 Jan 2014 21:30:36 +0000 (13:30 -0800)]
am a4bd5931: am c454bbe8: (-s ours) am b15429a6: am 503c5a32: am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

* commit 'a4bd5931554ccf8e93b1c773a8f3cb4f15fdd23c':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

10 years agoam c454bbe8: (-s ours) am b15429a6: am 503c5a32: am ea47cb67: (-s ours) am bf6cecc2...
David Christie [Fri, 10 Jan 2014 21:27:26 +0000 (13:27 -0800)]
am c454bbe8: (-s ours) am b15429a6: am 503c5a32: am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

* commit 'c454bbe805bd6ed096ec6b4b811c4e4b67a86225':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

10 years agoam b15429a6: am 503c5a32: am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b395...
David Christie [Fri, 10 Jan 2014 21:24:05 +0000 (13:24 -0800)]
am b15429a6: am 503c5a32: am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

* commit 'b15429a6853472207c2a4aefd22dd009e851edb7':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

10 years agoam 503c5a32: am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d829...
David Christie [Fri, 10 Jan 2014 21:18:58 +0000 (13:18 -0800)]
am 503c5a32: am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

* commit '503c5a32a4e718282b88f73e602c09e1bda49aec':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

10 years agoMerge commit 'bc39746e' into manualmerge
David Christie [Fri, 10 Jan 2014 21:17:01 +0000 (13:17 -0800)]
Merge commit 'bc39746e' into manualmerge

10 years agoam ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387...
David Christie [Fri, 10 Jan 2014 21:14:04 +0000 (13:14 -0800)]
am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

* commit 'ea47cb6763d36fcc916c63dd764b48b4b6f1ff01':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

10 years agoam bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear...
David Christie [Fri, 10 Jan 2014 21:10:12 +0000 (13:10 -0800)]
am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

* commit 'bf6cecc21f50d1bc98e0d2dec41bef3ce259a23f':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

10 years agoam 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locati...
David Christie [Fri, 10 Jan 2014 21:05:35 +0000 (13:05 -0800)]
am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

* commit '5716e4bfb980c8bab01b51944c1e715d76d59b1d':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

10 years agoam 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when...
David Christie [Fri, 10 Jan 2014 21:02:48 +0000 (13:02 -0800)]
am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

* commit '776b3956a9742b868b037dffd2b24c17b2dfa0e6':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

10 years agoam 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location provider...
David Christie [Fri, 10 Jan 2014 21:00:09 +0000 (13:00 -0800)]
am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

* commit '7f4d82932c812fbac1d99ceaf9462b7a763f5231':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

10 years agoam 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled...
David Christie [Fri, 10 Jan 2014 20:55:24 +0000 (12:55 -0800)]
am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

* commit '6826387e50f9f272d53ca1f725f573bbddcdf5c1':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

10 years agoam 8e0c7768: DO NOT MERGE: Clear cached locations when location providers disabled...
David Christie [Fri, 10 Jan 2014 20:53:41 +0000 (12:53 -0800)]
am 8e0c7768: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

* commit '8e0c7768c87014fef277df84c737dd6c37fb8866':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

10 years agoam 76e5ca81: Fix descriptor leak after accepting connections
Dave Platt [Tue, 7 Jan 2014 19:49:54 +0000 (11:49 -0800)]
am 76e5ca81: Fix descriptor leak after accepting connections

* commit '76e5ca81b3ba5a4f52126f2ec8907679b4356292':
  Fix descriptor leak after accepting connections

10 years agoam 02f042dd: Fix socket descriptor leak from Zygote to child app
Dave Platt [Tue, 7 Jan 2014 19:49:49 +0000 (11:49 -0800)]
am 02f042dd: Fix socket descriptor leak from Zygote to child app

* commit '02f042ddd9ddf47ef88c4f174eb19a9bee296a45':
  Fix socket descriptor leak from Zygote to child app

10 years agoDO NOT MERGE: Clear cached locations when location providers disabled
David Christie [Tue, 7 Jan 2014 02:15:05 +0000 (18:15 -0800)]
DO NOT MERGE: Clear cached locations when location providers disabled
Bug: 12118307

Change-Id: I8595b50d30c0f3ff2cc7dab14141a739cd6b9daa

10 years agoDO NOT MERGE: Clear cached locations when location providers disabled
David Christie [Tue, 7 Jan 2014 01:57:30 +0000 (17:57 -0800)]
DO NOT MERGE: Clear cached locations when location providers disabled
Bug: 12118307

Change-Id: Iae668409be5c5bd715681624b2a54a4daa690932

10 years agoClear cached locations when location providers disabled
David Christie [Wed, 18 Dec 2013 22:33:57 +0000 (14:33 -0800)]
Clear cached locations when location providers disabled
Bug: 12118307

(cherry picked from commit b084fef18ee1b5d24d15cff37dc3a053933d361e)

Change-Id: Ief869b9e38858092bfa3f8d6d090a278dee7d86c

10 years agoClear cached locations when location providers disabled
David Christie [Wed, 18 Dec 2013 22:33:57 +0000 (14:33 -0800)]
Clear cached locations when location providers disabled
Bug: 12118307

(cherry picked from commit b084fef18ee1b5d24d15cff37dc3a053933d361e)

Change-Id: I49eff73f89633052a2587112cdc381ae6d254bfe

10 years agoFix descriptor leak after accepting connections
Dave Platt [Fri, 6 Dec 2013 22:03:47 +0000 (14:03 -0800)]
Fix descriptor leak after accepting connections

After accepting a connection on a listening socket and
storing the resulting FileDescriptor into a newly created
LocalSocketImpl, the new impl's "descriptor was created
locally and should be closed normally" flag should be set.

Bug: 11805817

(cherry picked from commit 3e7305c6bf6062b5cb1e2ddcec6c6d30b4a8bc0d)

Change-Id: I723d7c5544ee4b6858894c215716cbc32a958df1

10 years agoFix socket descriptor leak from Zygote to child app
Dave Platt [Thu, 12 Dec 2013 23:45:49 +0000 (15:45 -0800)]
Fix socket descriptor leak from Zygote to child app

Due to an API change in LocalSocket, Zygote must now
manually close the FileDescriptor it created when it
registered a LocalServerSocket.  The LocalSocket.close()
routine will no longer do so.

Bug: 12114500

(cherry picked from commit 70ef29b04ee4ef7d7acfec79041dbe800961195e)

Change-Id: Ief23a3c99e007dc4aa6f94dfb47a1b2b6c854dad

10 years agoam ff65ca29: Merge "docs: Updated instructions for setting up In-app Billing test...
quddusc [Mon, 6 Jan 2014 21:58:03 +0000 (21:58 +0000)]
am ff65ca29: Merge "docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug: 7044477" into klp-docs

* commit 'ff65ca29a00aa282160dd8a77cdd6ed6855abba7':
  docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug: 7044477

10 years agoMerge "docs: Updated instructions for setting up In-app Billing test accounts to...
quddusc [Mon, 6 Jan 2014 21:55:28 +0000 (21:55 +0000)]
Merge "docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug: 7044477" into klp-docs

10 years agoam fd8be467: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Mon, 6 Jan 2014 21:47:50 +0000 (13:47 -0800)]
am fd8be467: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'fd8be467a38eded82d17740824cf87daa38e25e0':
  Import translations. DO NOT MERGE

10 years agoam 6e15a49e: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 6 Jan 2014 21:47:46 +0000 (13:47 -0800)]
am 6e15a49e: (-s ours) Import translations. DO NOT MERGE

* commit '6e15a49eee1398aaf73f6b994b4148b198b67430':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Mon, 6 Jan 2014 21:45:15 +0000 (21:45 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 6 Jan 2014 21:15:51 +0000 (13:15 -0800)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 6 Jan 2014 20:16:37 +0000 (12:16 -0800)]
Import translations. DO NOT MERGE

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

10 years agodocs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets.
quddusc [Mon, 6 Jan 2014 19:36:07 +0000 (11:36 -0800)]
docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets.
Bug: 9316251

Change-Id: I06779c3f6318058e475621d57898c2982757df38

10 years agoDocfixes: three typos and escape */*.
John Spurlock [Thu, 2 Jan 2014 16:04:18 +0000 (11:04 -0500)]
Docfixes: three typos and escape */*.

Change-Id: I418d855b5d08a1a20eaca3d8e4d2e5d0fca23dd5

10 years agoam 048895b5: Merge "Doc update: update console instructions per new UI." into klp...
Katie McCormick [Fri, 3 Jan 2014 21:12:42 +0000 (21:12 +0000)]
am 048895b5: Merge "Doc update: update console instructions per new UI." into klp-docs

* commit '048895b5a0532fef394a4a3f07af737f8d733335':
  Doc update: update console instructions per new UI.

10 years agoMerge "Doc update: update console instructions per new UI." into klp-docs
Katie McCormick [Fri, 3 Jan 2014 21:09:37 +0000 (21:09 +0000)]
Merge "Doc update: update console instructions per new UI." into klp-docs

10 years agodocs: Updated instructions for setting up In-app Billing test accounts to reflect...
quddusc [Thu, 2 Jan 2014 19:39:02 +0000 (11:39 -0800)]
docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI.
Bug: 7044477

Change-Id: I722dc2e47c8dbe0cba48e44434d62fe28f23714f

10 years agoam 2ae0419f: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 30 Dec 2013 18:47:12 +0000 (10:47 -0800)]
am 2ae0419f: (-s ours) Import translations. DO NOT MERGE

* commit '2ae0419fb1ecd7e0705b7b87f8e73d6b73869bca':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 30 Dec 2013 17:30:42 +0000 (09:30 -0800)]
Import translations. DO NOT MERGE

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

10 years agoam bbeb3135: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 26 Dec 2013 21:00:44 +0000 (13:00 -0800)]
am bbeb3135: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'bbeb313567064b30ad93cdadd49beb8141c3d47b':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 26 Dec 2013 20:58:31 +0000 (20:58 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoam 7bb3e3b9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 26 Dec 2013 19:11:15 +0000 (11:11 -0800)]
am 7bb3e3b9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '7bb3e3b9ee22f2771c9fa71593c71910bbbcafac':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 19:09:48 +0000 (11:09 -0800)]
Import translations. DO NOT MERGE

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

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 26 Dec 2013 19:09:18 +0000 (19:09 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 19:07:34 +0000 (11:07 -0800)]
Import translations. DO NOT MERGE

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

10 years agoam ea227306: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 26 Dec 2013 18:43:19 +0000 (10:43 -0800)]
am ea227306: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'ea227306d68c7097b9cb079b1bfa6157c1ec2d30':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 26 Dec 2013 18:41:55 +0000 (18:41 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 18:16:09 +0000 (10:16 -0800)]
Import translations. DO NOT MERGE

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

10 years agoam d6e863a1: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 17:59:57 +0000 (09:59 -0800)]
am d6e863a1: (-s ours) Import translations. DO NOT MERGE

* commit 'd6e863a19a631fd0003f96d507a21863fe973caa':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 17:53:23 +0000 (09:53 -0800)]
Import translations. DO NOT MERGE

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

10 years agoam cbc5f541: Merge "docs: Added a statement for "android:name" attribute indicating...
quddusc [Sat, 21 Dec 2013 00:15:55 +0000 (00:15 +0000)]
am cbc5f541: Merge "docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug: 11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2" into klp-docs

* commit 'cbc5f5410ff7c2b91e13f80a930f22944ce2ed88':
  docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug: 11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2

10 years agoam fca563a2: docs: Fixed code snippet for unbinding from IAB v3 service. Bug: 11858905
quddusc [Sat, 21 Dec 2013 00:15:49 +0000 (00:15 +0000)]
am fca563a2: docs: Fixed code snippet for unbinding from IAB v3 service. Bug: 11858905

* commit 'fca563a2d600c2e2a4ca0af2446a72e8bb36206e':
  docs: Fixed code snippet for unbinding from IAB v3 service. Bug: 11858905

10 years agoMerge "docs: Added a statement for "android:name" attribute indicating that the descr...
quddusc [Sat, 21 Dec 2013 00:13:56 +0000 (00:13 +0000)]
Merge "docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug: 11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2" into klp-docs

10 years agodocs: Fixed code snippet for unbinding from IAB v3 service.
quddusc [Fri, 20 Dec 2013 23:21:38 +0000 (15:21 -0800)]
docs: Fixed code snippet for unbinding from IAB v3 service.
Bug: 11858905

Change-Id: Id1af4fc50a020ab520b2c836df8182db6c3a35bd

10 years agodocs: Added a statement for "android:name" attribute indicating that the descriptor...
quddusc [Fri, 20 Dec 2013 23:12:58 +0000 (15:12 -0800)]
docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive.
Bug: 11926096
Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2

10 years agoam 70b96ec7: Merge "docs: Added missing elements under "can contain:" list in manifes...
quddusc [Fri, 20 Dec 2013 23:10:33 +0000 (23:10 +0000)]
am 70b96ec7: Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521" into klp-docs

* commit '70b96ec7303c1b34ff9d63a03359efadeec075c2':
  docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521

10 years agoam ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState...
quddusc [Fri, 20 Dec 2013 23:10:28 +0000 (23:10 +0000)]
am ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017" into klp-docs

* commit 'ad7b5993b579994c0b0838783bb8d0a94dffb1ee':
  docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017

10 years agoMerge "docs: Added missing elements under "can contain:" list in manifest-element...
quddusc [Fri, 20 Dec 2013 23:08:07 +0000 (23:08 +0000)]
Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521" into klp-docs

10 years agoMerge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter...
quddusc [Fri, 20 Dec 2013 23:07:34 +0000 (23:07 +0000)]
Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017" into klp-docs

10 years agodocs: Added missing elements under "can contain:" list in manifest-element.html.
quddusc [Fri, 20 Dec 2013 22:44:51 +0000 (14:44 -0800)]
docs: Added missing elements under "can contain:" list in manifest-element.html.
Bug: 5793521

Change-Id: I4340a8d043ebcf80634ad8cc1967b2a476a151d8

10 years agoam 12182bc2: Merge "docs: Fixed deprecated constructor. Bug: 10581815" into klp-docs
quddusc [Fri, 20 Dec 2013 23:01:28 +0000 (23:01 +0000)]
am 12182bc2: Merge "docs: Fixed deprecated constructor. Bug: 10581815" into klp-docs

* commit '12182bc236dd8e120a1f25d1a1862db744425558':
  docs: Fixed deprecated constructor. Bug: 10581815

10 years agoMerge "docs: Fixed deprecated constructor. Bug: 10581815" into klp-docs
quddusc [Fri, 20 Dec 2013 22:59:05 +0000 (22:59 +0000)]
Merge "docs: Fixed deprecated constructor. Bug: 10581815" into klp-docs

10 years agodocs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description.
quddusc [Fri, 20 Dec 2013 22:55:09 +0000 (14:55 -0800)]
docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description.
Bug: 6804017

Change-Id: I1e08fc7a9a5db85341c57f6ec04c434a94183cd0

10 years agodocs: Fixed deprecated constructor.
quddusc [Fri, 20 Dec 2013 22:07:45 +0000 (14:07 -0800)]
docs: Fixed deprecated constructor.
Bug: 10581815

Change-Id: I057acf1ad3037418c7247f865b6cb0847a9eb7b6

10 years agoam 240aca33: docs: Changed the title of the class to "Making Your App Content Searcha...
quddusc [Fri, 20 Dec 2013 20:37:30 +0000 (20:37 +0000)]
am 240aca33: docs: Changed the title of the class to "Making Your App Content Searchable by Google."

* commit '240aca333e340445f977d2a0e268a7c8d3a591e0':
  docs: Changed the title of the class to "Making Your App Content Searchable by Google."

10 years agodocs: Changed the title of the class to "Making Your App Content Searchable by Google."
quddusc [Fri, 20 Dec 2013 00:59:17 +0000 (16:59 -0800)]
docs: Changed the title of the class to "Making Your App Content Searchable by Google."

Change-Id: Icc640ffffc553c5e8825178453515cedcdc8a63f

10 years agoam 7cd6cd31: NDK release notes for r9c for review
David Friedman [Thu, 19 Dec 2013 21:51:22 +0000 (21:51 +0000)]
am 7cd6cd31: NDK release notes for r9c for review

* commit '7cd6cd3178b8fb3b25a2c2ddeaff2733bfab9f43':
  NDK release notes for r9c for review

10 years agoNDK release notes for r9c for review
David Friedman [Tue, 26 Nov 2013 22:32:22 +0000 (14:32 -0800)]
NDK release notes for r9c for review

Staged at http://boku.mtv.corp.google.co:9196/tools/sdk/ndk/index.html

Change-Id: Id058d39e10ce64fff2def3dea746ac5e11eff2b4
(cherry picked from commit 51501634c7d530d691f4345990a2434a00603ba2)

10 years agoam c5b19fd3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 19 Dec 2013 04:52:34 +0000 (20:52 -0800)]
am c5b19fd3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'c5b19fd397f0c42fa64d79a50edec4e20394241f':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 19 Dec 2013 04:49:33 +0000 (04:49 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Dec 2013 00:36:21 +0000 (16:36 -0800)]
Import translations. DO NOT MERGE

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

10 years agoam 50391871: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 19 Dec 2013 00:16:30 +0000 (16:16 -0800)]
am 50391871: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '50391871e61e491cf766fc83e261a8345d1cb5b6':
  Import translations. DO NOT MERGE