OSDN Git Service
Marco Nelissen [Wed, 15 Jan 2014 17:22:55 +0000 (09:22 -0800)]
am
0d4916f1: am
c3036a12: Merge "Before requerying a cursor, check if it is closed."
* commit '
0d4916f19f81f80fc83eb7646c6d339630d5f618':
Before requerying a cursor, check if it is closed.
Marco Nelissen [Wed, 15 Jan 2014 17:19:52 +0000 (09:19 -0800)]
am
c3036a12: Merge "Before requerying a cursor, check if it is closed."
* commit '
c3036a12467395465b86e6935af8aa500c1b128d':
Before requerying a cursor, check if it is closed.
Marco Nelissen [Wed, 15 Jan 2014 17:17:05 +0000 (17:17 +0000)]
Merge "Before requerying a cursor, check if it is closed."
quddusc [Tue, 14 Jan 2014 20:35:29 +0000 (12:35 -0800)]
am
916277e4: am
e7eb5996: Merge "docs: Removed stray link. Bug:
11773486" into klp-docs
* commit '
916277e415e6c8186b79dfe929114d36f80d9ee0':
docs: Removed stray link. Bug:
11773486
quddusc [Tue, 14 Jan 2014 20:35:24 +0000 (12:35 -0800)]
am
5e5c9833: am
cec51d66: Merge "docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug:
10797762" into klp-docs
* commit '
5e5c9833f533bb55964c7e981feacf191b63f09f':
docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug:
10797762
quddusc [Tue, 14 Jan 2014 20:35:18 +0000 (12:35 -0800)]
am
21627274: am
cc29a170: Merge "docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug:
11797515" into klp-docs
* commit '
21627274a0b1ddbf68599a3b5fe4bfa751885ddf':
docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug:
11797515
quddusc [Tue, 14 Jan 2014 20:35:14 +0000 (12:35 -0800)]
am
7c865524: am
64231d01: Merge "docs: Fixed typo in IAB training doc. Bug:
10807741" into klp-docs
* commit '
7c865524048695f5dc471e6a357a142cf60495a7':
docs: Fixed typo in IAB training doc. Bug:
10807741
quddusc [Tue, 14 Jan 2014 20:35:08 +0000 (12:35 -0800)]
am
c61e6bc6: am
72159ab0: Merge "docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug:
9316251" into klp-docs
* commit '
c61e6bc613db3d0d5ce7661bda3fe51ecc2f9726':
docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug:
9316251
quddusc [Tue, 14 Jan 2014 20:32:08 +0000 (20:32 +0000)]
am
e7eb5996: Merge "docs: Removed stray link. Bug:
11773486" into klp-docs
* commit '
e7eb5996c2cca421eb7d28325918db18044fe4f7':
docs: Removed stray link. Bug:
11773486
quddusc [Tue, 14 Jan 2014 20:32:04 +0000 (20:32 +0000)]
am
cec51d66: Merge "docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug:
10797762" into klp-docs
* commit '
cec51d6620c1e46c8e4b52f492ff4ed6d75b85a6':
docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug:
10797762
quddusc [Tue, 14 Jan 2014 20:32:00 +0000 (20:32 +0000)]
am
cc29a170: Merge "docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug:
11797515" into klp-docs
* commit '
cc29a17056e4ae656182bf2fb36536b25ab4fcae':
docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug:
11797515
quddusc [Tue, 14 Jan 2014 20:31:55 +0000 (20:31 +0000)]
am
64231d01: Merge "docs: Fixed typo in IAB training doc. Bug:
10807741" into klp-docs
* commit '
64231d01dead59752ff230570cbe07f206d5c9ec':
docs: Fixed typo in IAB training doc. Bug:
10807741
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
quddusc [Tue, 14 Jan 2014 20:30:03 +0000 (20:30 +0000)]
Merge "docs: Removed stray link. Bug:
11773486" into klp-docs
quddusc [Tue, 14 Jan 2014 20:29:46 +0000 (20:29 +0000)]
Merge "docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug:
10797762" into klp-docs
quddusc [Tue, 14 Jan 2014 20:29:28 +0000 (20:29 +0000)]
Merge "docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug:
11797515" into klp-docs
quddusc [Tue, 14 Jan 2014 20:29:13 +0000 (20:29 +0000)]
Merge "docs: Fixed typo in IAB training doc. Bug:
10807741" into klp-docs
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
John Spurlock [Tue, 14 Jan 2014 19:54:25 +0000 (11:54 -0800)]
am
e05190ea: am
85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs
* commit '
e05190eae74be57dd517bb5afbccf901543329bf':
Docfixes: three typos and escape */*.
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 */*.
John Spurlock [Tue, 14 Jan 2014 19:48:12 +0000 (19:48 +0000)]
Merge "Docfixes: three typos and escape */*." into klp-docs
Ricardo Cervera [Tue, 14 Jan 2014 17:39:29 +0000 (09:39 -0800)]
am
7dde7879: am
1a21c16b: Merge "docs: Fixed typo in AlertDialog code snippet." into klp-docs
* commit '
7dde7879a4561a3ec9ffc48921a4d074e40aa74e':
docs: Fixed typo in AlertDialog code snippet.
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.
Ricardo Cervera [Tue, 14 Jan 2014 17:34:21 +0000 (17:34 +0000)]
Merge "docs: Fixed typo in AlertDialog code snippet." into klp-docs
Marco Nelissen [Tue, 14 Jan 2014 16:15:13 +0000 (08:15 -0800)]
am
a9045d24: am
337aa376: Merge "Add NULL check in updateProxyConfig"
* commit '
a9045d24a73faa6aa1e8ad204a1e14a53711a824':
Add NULL check in updateProxyConfig
Marco Nelissen [Tue, 14 Jan 2014 16:11:39 +0000 (08:11 -0800)]
am
337aa376: Merge "Add NULL check in updateProxyConfig"
* commit '
337aa376c09bb97a48afe075b4018f030445534f':
Add NULL check in updateProxyConfig
Marco Nelissen [Tue, 14 Jan 2014 16:08:18 +0000 (16:08 +0000)]
Merge "Add NULL check in updateProxyConfig"
Narayan Kamath [Tue, 14 Jan 2014 10:16:39 +0000 (02:16 -0800)]
am
2db26788: am
e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt.""
* commit '
2db26788ab367f08cb5378d77e22e8939e7a28c2':
Revert "Hide AssetInputStream.getAssetInt."
Narayan Kamath [Tue, 14 Jan 2014 10:13:45 +0000 (02:13 -0800)]
am
e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt.""
* commit '
e71afc2ea72e98c4631e79cad65f678090da87d3':
Revert "Hide AssetInputStream.getAssetInt."
Narayan Kamath [Tue, 14 Jan 2014 10:09:50 +0000 (10:09 +0000)]
Merge "Revert "Hide AssetInputStream.getAssetInt.""
Narayan Kamath [Tue, 14 Jan 2014 10:08:45 +0000 (10:08 +0000)]
Revert "Hide AssetInputStream.getAssetInt."
This reverts commit
842d44ec1765e01f4a37af99cc1935b4d0399758.
Change-Id: I188e49d3651fd4941491c239b6a7c9f475995187
Narayan Kamath [Tue, 14 Jan 2014 09:51:14 +0000 (01:51 -0800)]
am
80213160: am
ac8ccc3c: Merge "Hide AssetInputStream.getAssetInt."
* commit '
8021316010fb4bd18a29751949eb2cda66199b6e':
Hide AssetInputStream.getAssetInt.
Narayan Kamath [Tue, 14 Jan 2014 09:48:37 +0000 (01:48 -0800)]
am
ac8ccc3c: Merge "Hide AssetInputStream.getAssetInt."
* commit '
ac8ccc3c181a27103955b0f7bbf3dddabb0a6305':
Hide AssetInputStream.getAssetInt.
Narayan Kamath [Tue, 14 Jan 2014 09:45:40 +0000 (09:45 +0000)]
Merge "Hide AssetInputStream.getAssetInt."
Narayan Kamath [Fri, 10 Jan 2014 17:32:28 +0000 (17:32 +0000)]
Hide AssetInputStream.getAssetInt.
It returns a pointer to a private data structure, so there's
no sensible use for it. Also, the emergence of 64 bit processors
means that the return value isn't wide enough to represent
values in the native heap.
(cherry picked from commit
f8f09a15a409f373f22aa475bb0defd264088e4f)
Change-Id: I9c9b5bae6db8638e65dda60f924aa3dddd06813a
Dianne Hackborn [Tue, 14 Jan 2014 01:45:16 +0000 (17:45 -0800)]
am
8c359bf4: am
c174288d: Fix issue #
12031685: Sticky Service Breakage in Android 4.4.1
* commit '
8c359bf473b4c31407613dbc1473ba49b0297898':
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
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)
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
Ricardo Cervera [Tue, 14 Jan 2014 00:23:24 +0000 (16:23 -0800)]
am
18bf3b1d: am
5e15e1ab: Merge "docs: Fixed typo." into klp-docs
* commit '
18bf3b1df67f219d70e6cba828216a47d92e3dc5':
docs: Fixed typo.
Ricardo Cervera [Tue, 14 Jan 2014 00:23:19 +0000 (16:23 -0800)]
am
faca5e3c: am
ac5ad7b9: docs: Fixed typos.
* commit '
faca5e3c917a6197b380eb5d2b51893b5d689946':
docs: Fixed typos.
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.
Ricardo Cervera [Tue, 14 Jan 2014 00:19:51 +0000 (00:19 +0000)]
am
ac5ad7b9: docs: Fixed typos.
* commit '
ac5ad7b9e488a967ffee56fd1b168c010c1d62e8':
docs: Fixed typos.
Ricardo Cervera [Tue, 14 Jan 2014 00:18:23 +0000 (00:18 +0000)]
Merge "docs: Fixed typo." into klp-docs
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
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
David Christie [Mon, 13 Jan 2014 21:03:33 +0000 (13:03 -0800)]
am
d8dfa528: 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 '
d8dfa528b86e734318159b6fa75814184fb02c9d':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
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
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
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
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
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
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
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
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
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
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
Daniel Cashman [Mon, 13 Jan 2014 19:02:15 +0000 (11:02 -0800)]
am
fe7bfdd3: am
af2f2f76: am
9ecadd7c: am
6f34b938: am
3238d0d9: Merge "Clear cached locations when location providers disabled Bug:
12118307" into jb-mr2-dev
* commit '
fe7bfdd384f199668ba9b1b751194e06cbb50b3b':
Clear cached locations when location providers disabled Bug:
12118307
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
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
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
Daniel Cashman [Mon, 13 Jan 2014 18:52:54 +0000 (10:52 -0800)]
am
3d5ea26f: am
4503409a: Merge "Clear cached locations when location providers disabled Bug:
12118307" into klp-dev
* commit '
3d5ea26fbb92b1b780cd9763c0731288f48341a3':
Clear cached locations when location providers disabled Bug:
12118307
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
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
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
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
Jeff Sharkey [Mon, 13 Jan 2014 18:42:07 +0000 (10:42 -0800)]
am
47235e8b: am
90cadb35: Merge "MountService listeners can not be unregistered"
* commit '
47235e8b5ce6c622a1182933404cf5a17fcd35dc':
MountService listeners can not be unregistered
Jeff Sharkey [Mon, 13 Jan 2014 18:37:51 +0000 (10:37 -0800)]
am
90cadb35: Merge "MountService listeners can not be unregistered"
* commit '
90cadb35156829ff1d6b7066409596da38fc70e1':
MountService listeners can not be unregistered
Jeff Sharkey [Mon, 13 Jan 2014 18:35:31 +0000 (18:35 +0000)]
Merge "MountService listeners can not be unregistered"
Narayan Kamath [Mon, 13 Jan 2014 13:01:44 +0000 (05:01 -0800)]
am
bc2a449a: am
cb4d3ec1: Merge "Fix preference puts with "null" values."
* commit '
bc2a449a615b30efb81a1a0082a1bb0db515d0f5':
Fix preference puts with "null" values.
Narayan Kamath [Mon, 13 Jan 2014 12:32:19 +0000 (04:32 -0800)]
am
cb4d3ec1: Merge "Fix preference puts with "null" values."
* commit '
cb4d3ec1ea446fc9ce51514cbf5b16da0ec0fa0f':
Fix preference puts with "null" values.
Narayan Kamath [Mon, 13 Jan 2014 12:29:41 +0000 (12:29 +0000)]
Merge "Fix preference puts with "null" values."
Jason Sams [Sat, 11 Jan 2014 00:50:54 +0000 (16:50 -0800)]
am
739ae9b3: am
868173a5: Merge "Fix a JNI local reference leak in MediaDrm"
* commit '
739ae9b3b77458b4c77f799cba56dc68d65ab424':
Fix a JNI local reference leak in MediaDrm
Jason Sams [Sat, 11 Jan 2014 00:48:12 +0000 (16:48 -0800)]
am
868173a5: Merge "Fix a JNI local reference leak in MediaDrm"
* commit '
868173a53f0d1059408b049f30af3402d5b0de64':
Fix a JNI local reference leak in MediaDrm
Jason Sams [Sat, 11 Jan 2014 00:42:19 +0000 (00:42 +0000)]
Merge "Fix a JNI local reference leak in MediaDrm"
Craig Mautner [Sat, 11 Jan 2014 00:03:06 +0000 (16:03 -0800)]
am
54f99137: am
3747768b: Merge "Fix visibility of multiple non-fullscreen activities."
* commit '
54f991375a9c7c2a256e6aec7d4a223be8d36b39':
Fix visibility of multiple non-fullscreen activities.
Craig Mautner [Fri, 10 Jan 2014 23:59:59 +0000 (15:59 -0800)]
am
3747768b: Merge "Fix visibility of multiple non-fullscreen activities."
* commit '
3747768bde14ff9db96279830f07602ec50544cc':
Fix visibility of multiple non-fullscreen activities.
Craig Mautner [Fri, 10 Jan 2014 23:55:43 +0000 (23:55 +0000)]
Merge "Fix visibility of multiple non-fullscreen activities."
Dirk Dougherty [Fri, 10 Jan 2014 23:09:33 +0000 (15:09 -0800)]
am
d8849489: am
ccc5ca14: Doc change: dashboard update.
* commit '
d8849489a79a6b46996f3192b92d5089521e9341':
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.
Dirk Dougherty [Wed, 8 Jan 2014 23:52:27 +0000 (15:52 -0800)]
Doc change: dashboard update.
Change-Id: Ic65cd8d6bf2435fa3efd73f3337c462c02a752ed
David Christie [Fri, 10 Jan 2014 21:34:13 +0000 (13:34 -0800)]
am
36788815: 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 '
36788815be0e9c2d12cdc44d186f0cbe6a9e7122':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
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
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
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
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
David Christie [Fri, 10 Jan 2014 21:17:01 +0000 (13:17 -0800)]
Merge commit '
bc39746e' into manualmerge
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
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
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
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
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
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
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
Christopher Tate [Thu, 9 Jan 2014 20:47:50 +0000 (12:47 -0800)]
am
5fbcb134: am
35b7de4c: Merge "Cursor leakage due to cancellation signal"
* commit '
5fbcb1347494e17dc9e9cd66d8e47a3972a8b90d':
Cursor leakage due to cancellation signal
Christopher Tate [Thu, 9 Jan 2014 20:43:39 +0000 (12:43 -0800)]
am
35b7de4c: Merge "Cursor leakage due to cancellation signal"
* commit '
35b7de4c4562db8af697ad3384c09d2258d183ba':
Cursor leakage due to cancellation signal
Christopher Tate [Thu, 9 Jan 2014 20:41:26 +0000 (20:41 +0000)]
Merge "Cursor leakage due to cancellation signal"
riddle_hsu [Thu, 9 Jan 2014 12:24:34 +0000 (20:24 +0800)]
Fix visibility of multiple non-fullscreen activities.
Issue detail:
Assume X, Y are non-fullscreen activities.
a.Home starts an activity X in task A in application stack.
b.X starts an activity Y in <task A> or <new task B>
c.Activity X will be invisible.
How to fix:
Because the function "isActivityOverHome" means an activity is able to see home.
But there may have many non-fullscreen activities between the top non-fullscreen activity and home.
If flag "behindFullscreen" is set, those middle activities will be invisible.
So it should only take care from who is adjacent to home.
Then check two flags frontOfTask(task root) and mOnTopOfHome for constraining the condition.
Change-Id: I60bcea304976414e44835a0a38675aae365e9e19
Wink Saville [Wed, 8 Jan 2014 19:31:02 +0000 (11:31 -0800)]
am
ad068837: am
76d5cdd8: Merge "telephony: Add same named operator configuration for some operators"
* commit '
ad06883730b4cd4af98c0c3ec69a7e851f9cace9':
telephony: Add same named operator configuration for some operators
Wink Saville [Wed, 8 Jan 2014 19:28:58 +0000 (11:28 -0800)]
am
76d5cdd8: Merge "telephony: Add same named operator configuration for some operators"
* commit '
76d5cdd820b5d81af8de73180c272d7f8a01caae':
telephony: Add same named operator configuration for some operators