OSDN Git Service

android-x86/frameworks-base.git
10 years agoNPE in BluetoothSocket.write()
Zhihai Xu [Tue, 17 Dec 2013 19:39:20 +0000 (11:39 -0800)]
NPE in BluetoothSocket.write()

If calling connect succeed, we should not see this NPE.
An IOException may happen after call BluetoothSocket.connect.
If you still call write after the IOException,
you will get this NPE.
add NPE protection for possible wrong calling sequence from application,
To make bluetoothSocket more error-tolerant.

bug:12104154
Change-Id: I7fa4e847b500ca9b9d2a43df432f31a1bb016c0a

10 years agoam 03d65b4b: am 9865216e: am 18bf3b1d: am 5e15e1ab: Merge "docs: Fixed typo." into...
Ricardo Cervera [Tue, 14 Jan 2014 00:30:18 +0000 (00:30 +0000)]
am 03d65b4b: am 9865216e: am 18bf3b1d: am 5e15e1ab: Merge "docs: Fixed typo." into klp-docs

* commit '03d65b4b8a0893d57c5bb00f7f8d02a7869ff12c':
  docs: Fixed typo.

10 years agoam cfbc332f: am f4494e6c: am faca5e3c: am ac5ad7b9: docs: Fixed typos.
Ricardo Cervera [Tue, 14 Jan 2014 00:30:11 +0000 (00:30 +0000)]
am cfbc332f: am f4494e6c: am faca5e3c: am ac5ad7b9: docs: Fixed typos.

* commit 'cfbc332f6f63de09a126b45fa78e093a92eef09e':
  docs: Fixed typos.

10 years agoam 9865216e: am 18bf3b1d: am 5e15e1ab: Merge "docs: Fixed typo." into klp-docs
Ricardo Cervera [Tue, 14 Jan 2014 00:26:41 +0000 (00:26 +0000)]
am 9865216e: am 18bf3b1d: am 5e15e1ab: Merge "docs: Fixed typo." into klp-docs

* commit '9865216eb1c747b03cb60245772b196fc039a1b6':
  docs: Fixed typo.

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

* commit 'f4494e6c8f7fc610795337a72d774e0f6cdc94ac':
  docs: Fixed typos.

10 years agoam 18bf3b1d: am 5e15e1ab: Merge "docs: Fixed typo." into klp-docs
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.

10 years agoam faca5e3c: am ac5ad7b9: docs: Fixed typos.
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.

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 agoMerge "Use new DisplayManager flag to show own content only." into klp-modular-dev
Craig Mautner [Tue, 14 Jan 2014 00:00:00 +0000 (00:00 +0000)]
Merge "Use new DisplayManager flag to show own content only." into klp-modular-dev

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 agoMerge "Fix broken homekey on devices without keyguard" into klp-modular-dev
Jim Miller [Mon, 13 Jan 2014 22:25:03 +0000 (22:25 +0000)]
Merge "Fix broken homekey on devices without keyguard" into klp-modular-dev

10 years agoam cf77c059: am c809bd8b: am d8dfa528: am 301b1fac: am 26c6c15f: am b3c96c4c: am...
David Christie [Mon, 13 Jan 2014 21:10:05 +0000 (21:10 +0000)]
am cf77c059: am c809bd8b: 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 'cf77c05988dee8410d9235b9818dbcdf01c48f4f':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

10 years agoam c809bd8b: am d8dfa528: am 301b1fac: am 26c6c15f: am b3c96c4c: am 1d151607: am...
David Christie [Mon, 13 Jan 2014 21:06:24 +0000 (21:06 +0000)]
am c809bd8b: 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 'c809bd8b39c2ab8874d6eb2e7189ca9e72f4c9ed':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

10 years agoam d8dfa528: am 301b1fac: am 26c6c15f: am b3c96c4c: am 1d151607: am 4013c4b1: am...
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

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 agoUse new DisplayManager flag to show own content only.
Craig Mautner [Mon, 13 Jan 2014 20:55:33 +0000 (12:55 -0800)]
Use new DisplayManager flag to show own content only.

Change-Id: I8b2666e5849e57b5eb2ed73ed3d5e39da2dbd55d

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 555b8ebf: am e29ff50a: am fe7bfdd3: am af2f2f76: am 9ecadd7c: am 6f34b938: am...
Daniel Cashman [Mon, 13 Jan 2014 19:10:08 +0000 (19:10 +0000)]
am 555b8ebf: am e29ff50a: 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 '555b8ebfd6e4ee1f60752459061f6dae2fd45981':
  Clear cached locations when location providers disabled Bug: 12118307

10 years agoam e29ff50a: am fe7bfdd3: am af2f2f76: am 9ecadd7c: am 6f34b938: am 3238d0d9: Merge...
Daniel Cashman [Mon, 13 Jan 2014 19:05:49 +0000 (19:05 +0000)]
am e29ff50a: 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 'e29ff50aae302ef05b0592e4bab6b3090a59254a':
  Clear cached locations when location providers disabled Bug: 12118307

10 years agoam fe7bfdd3: am af2f2f76: am 9ecadd7c: am 6f34b938: am 3238d0d9: Merge "Clear cached...
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

10 years agoam 21a801d0: am 0d30e07d: am 3d5ea26f: am 4503409a: Merge "Clear cached locations...
Daniel Cashman [Mon, 13 Jan 2014 19:00:37 +0000 (19:00 +0000)]
am 21a801d0: am 0d30e07d: am 3d5ea26f: am 4503409a: Merge "Clear cached locations when location providers disabled Bug: 12118307" into klp-dev

* commit '21a801d0885d65f128b84a593140b07fd0d4e980':
  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 0d30e07d: am 3d5ea26f: am 4503409a: Merge "Clear cached locations when location...
Daniel Cashman [Mon, 13 Jan 2014 18:57:19 +0000 (18:57 +0000)]
am 0d30e07d: am 3d5ea26f: am 4503409a: Merge "Clear cached locations when location providers disabled Bug: 12118307" into klp-dev

* commit '0d30e07d23e9a2bcea4c1b3e61e12e68f5111fe2':
  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 3d5ea26f: am 4503409a: Merge "Clear cached locations when location providers disab...
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

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 agoam 6fba240b: am 6d3700b3: am 47235e8b: am 90cadb35: Merge "MountService listeners...
Jeff Sharkey [Mon, 13 Jan 2014 18:47:41 +0000 (18:47 +0000)]
am 6fba240b: am 6d3700b3: am 47235e8b: am 90cadb35: Merge "MountService listeners can not be unregistered"

* commit '6fba240b72e9ae2bc66c98b058e78aecd568ae3f':
  MountService listeners can not be unregistered

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 agoam 6d3700b3: am 47235e8b: am 90cadb35: Merge "MountService listeners can not be unreg...
Jeff Sharkey [Mon, 13 Jan 2014 18:44:43 +0000 (18:44 +0000)]
am 6d3700b3: am 47235e8b: am 90cadb35: Merge "MountService listeners can not be unregistered"

* commit '6d3700b394c7137ef95580d35223a402a3dd0e7c':
  MountService listeners can not be unregistered

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 47235e8b: am 90cadb35: Merge "MountService listeners can not be unregistered"
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

10 years agoam 90cadb35: Merge "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

10 years agoMerge "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"

10 years agoam f588d2df: am d0ec6d8c: am bc2a449a: am cb4d3ec1: Merge "Fix preference puts with...
Narayan Kamath [Mon, 13 Jan 2014 13:07:47 +0000 (13:07 +0000)]
am f588d2df: am d0ec6d8c: am bc2a449a: am cb4d3ec1: Merge "Fix preference puts with "null" values."

* commit 'f588d2dff2ca6000fe02c5ac6e85f97133477767':
  Fix preference puts with "null" values.

10 years agoam d0ec6d8c: am bc2a449a: am cb4d3ec1: Merge "Fix preference puts with "null" values."
Narayan Kamath [Mon, 13 Jan 2014 13:04:28 +0000 (13:04 +0000)]
am d0ec6d8c: am bc2a449a: am cb4d3ec1: Merge "Fix preference puts with "null" values."

* commit 'd0ec6d8c505142a51a6c1bfb3637d4a49aa05f32':
  Fix preference puts with "null" values.

10 years agoam bc2a449a: am cb4d3ec1: Merge "Fix preference puts with "null" values."
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.

10 years agoam cb4d3ec1: Merge "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.

10 years agoMerge "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."

10 years agoMerge "Add display synchronously." into klp-modular-dev
Craig Mautner [Mon, 13 Jan 2014 05:33:51 +0000 (05:33 +0000)]
Merge "Add display synchronously." into klp-modular-dev

10 years agoAdd display synchronously.
Craig Mautner [Mon, 13 Jan 2014 05:19:06 +0000 (21:19 -0800)]
Add display synchronously.

Adding the virtual display to window manager through a handler message
causes timing issues. Add the display directly to fix it.

Change-Id: I3ad6b16ce6dff2a48abd120a8e873e11a028e2c3

10 years agoFix broken homekey on devices without keyguard
Jim Miller [Wed, 8 Jan 2014 22:57:54 +0000 (14:57 -0800)]
Fix broken homekey on devices without keyguard

Fixes bug 12447288

Change-Id: I580dbeac03b56c01d33844f094eaac20d7aba119

10 years agoam 1ae17633: am 411350dd: am 739ae9b3: am 868173a5: Merge "Fix a JNI local reference...
Jason Sams [Sat, 11 Jan 2014 00:57:22 +0000 (00:57 +0000)]
am 1ae17633: am 411350dd: am 739ae9b3: am 868173a5: Merge "Fix a JNI local reference leak in MediaDrm"

* commit '1ae176335548f0273e040b6ac0c34e2274789b88':
  Fix a JNI local reference leak in MediaDrm

10 years agoam 411350dd: am 739ae9b3: am 868173a5: Merge "Fix a JNI local reference leak in MediaDrm"
Jason Sams [Sat, 11 Jan 2014 00:54:18 +0000 (00:54 +0000)]
am 411350dd: am 739ae9b3: am 868173a5: Merge "Fix a JNI local reference leak in MediaDrm"

* commit '411350dd234dcf246adf884b66751ac1def64cc0':
  Fix a JNI local reference leak in MediaDrm

10 years agoam 739ae9b3: am 868173a5: Merge "Fix a JNI local reference leak in MediaDrm"
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

10 years agoam 868173a5: Merge "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

10 years agoMerge "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"

10 years agoam 5d8936b4: am 27581792: am 54f99137: am 3747768b: Merge "Fix visibility of multiple...
Craig Mautner [Sat, 11 Jan 2014 00:09:22 +0000 (00:09 +0000)]
am 5d8936b4: am 27581792: am 54f99137: am 3747768b: Merge "Fix visibility of multiple non-fullscreen activities."

* commit '5d8936b4cfdb14941536e533c2cc376e99b9f7d5':
  Fix visibility of multiple non-fullscreen activities.

10 years agoam 27581792: am 54f99137: am 3747768b: Merge "Fix visibility of multiple non-fullscre...
Craig Mautner [Sat, 11 Jan 2014 00:05:55 +0000 (00:05 +0000)]
am 27581792: am 54f99137: am 3747768b: Merge "Fix visibility of multiple non-fullscreen activities."

* commit '275817929a584b220a54b5c8206c7a7425da16d4':
  Fix visibility of multiple non-fullscreen activities.

10 years agoam 54f99137: am 3747768b: Merge "Fix visibility of multiple non-fullscreen activities."
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.

10 years agoam 3747768b: Merge "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.

10 years agoMerge "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."

10 years agoam cc33c350: am d45a76db: am d8849489: am ccc5ca14: Doc change: dashboard update.
Dirk Dougherty [Fri, 10 Jan 2014 23:18:09 +0000 (23:18 +0000)]
am cc33c350: am d45a76db: am d8849489: am ccc5ca14: Doc change: dashboard update.

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

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

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

10 years agoam d8849489: am ccc5ca14: Doc change: dashboard update.
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.

10 years agoMerge "Remove misleading warnings." into klp-modular-dev
Craig Mautner [Fri, 10 Jan 2014 23:06:50 +0000 (23:06 +0000)]
Merge "Remove misleading warnings." into klp-modular-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 agoRemove misleading warnings.
Craig Mautner [Fri, 10 Jan 2014 23:05:29 +0000 (15:05 -0800)]
Remove misleading warnings.

Error messages that are obsolete and/or incorrect.

Fixes bug 12421138.

Change-Id: I43f095048757f7ae9bff47abed594dd34d8387ce

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 881e1fe7: am dc622f5e: am 36788815: am a4bd5931: am c454bbe8: (-s ours) am b15429a...
David Christie [Fri, 10 Jan 2014 21:41:24 +0000 (21:41 +0000)]
am 881e1fe7: am dc622f5e: 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: 1211

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

10 years agoam dc622f5e: am 36788815: am a4bd5931: am c454bbe8: (-s ours) am b15429a6: am 503c5a3...
David Christie [Fri, 10 Jan 2014 21:37:40 +0000 (21:37 +0000)]
am dc622f5e: 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 'dc622f5e117031b494de750ab7729b07aa787243':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

10 years agoam 36788815: am a4bd5931: am c454bbe8: (-s ours) am b15429a6: am 503c5a32: am ea47cb6...
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

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 agoFix invalid stackId bug.
Craig Mautner [Fri, 10 Jan 2014 21:28:10 +0000 (13:28 -0800)]
Fix invalid stackId bug.

Eliminate race condition by executing window manager createStack
directly from activity manager.

Change-Id: I2dda276d07d0ae09c7c958980bc5ebffe72ebd92

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 agoImplement ActivityView.
Craig Mautner [Fri, 20 Dec 2013 17:06:56 +0000 (09:06 -0800)]
Implement ActivityView.

With an existing ActivityContainer a caller can now create an
ActivityView which consists of a new VirtualDisplay immediately
attached to the ActivityContainer.

Change-Id: Id70333dcbef55d524a87df8f8c92d72ca5579364

10 years agoMerge "Fix a bug where OnTouchListeners in action views could be removed" into klp...
Adam Powell [Fri, 10 Jan 2014 18:30:22 +0000 (18:30 +0000)]
Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-modular-dev

10 years agoMerge "Allow for the possibility of null ActivityContainer" into klp-modular-dev
Craig Mautner [Fri, 10 Jan 2014 18:21:49 +0000 (18:21 +0000)]
Merge "Allow for the possibility of null ActivityContainer" into klp-modular-dev

10 years agoAllow for the possibility of null ActivityContainer
Craig Mautner [Fri, 10 Jan 2014 18:16:43 +0000 (10:16 -0800)]
Allow for the possibility of null ActivityContainer

When BinderProxy is passed in as the IBinder for
getEnclosingActivityContainer the activity manager cannot turn it into
an ActivityRecord. This causes NPE in ActivityThread which is Not Good
(tm).

Allowing null to be returned when requesting an ActivityContainer and
handling it appropriately fixes this bug.

Fixes bug 12473669.

Change-Id: I6937636042f8853b3ddc2df40be010e7391e41a5

10 years agoFix a bug where OnTouchListeners in action views could be removed
Adam Powell [Fri, 10 Jan 2014 18:16:27 +0000 (10:16 -0800)]
Fix a bug where OnTouchListeners in action views could be removed

ActionMenuPresenter should only replace the touch listener when binding
a generated item view.

Bug 12470259

Change-Id: I8c4c6110065605225a20cb7ed872255282085661

10 years agoMerge "Call moveHomeStack before moving any stack." into klp-modular-dev
Craig Mautner [Fri, 10 Jan 2014 16:43:18 +0000 (16:43 +0000)]
Merge "Call moveHomeStack before moving any stack." into klp-modular-dev

10 years agoCall moveHomeStack before moving any stack.
Craig Mautner [Fri, 10 Jan 2014 16:40:23 +0000 (08:40 -0800)]
Call moveHomeStack before moving any stack.

Order matters, otherwise mFocusedStack and mLastStack aren't updated
correctly.

Fixes bug 12478856.

Change-Id: I12e4334678bb3af49d1ff26c4003def3e8d987c2

10 years agoOnly compile the services jar and so when using mmm
Amith Yamasani [Thu, 9 Jan 2014 23:38:12 +0000 (15:38 -0800)]
Only compile the services jar and so when using mmm

Don't build the tests when using "mmm frameworks/base/services"

Change-Id: If1895598381bd0fce0b4d7f5e879f154d8fc44d0

10 years agoMerge "Include subdirectory Android.mks." into klp-modular-dev
Amith Yamasani [Thu, 9 Jan 2014 21:45:09 +0000 (21:45 +0000)]
Merge "Include subdirectory Android.mks." into klp-modular-dev

10 years agoam f1fbe113: am 4ba1bbad: am 5fbcb134: am 35b7de4c: Merge "Cursor leakage due to...
Christopher Tate [Thu, 9 Jan 2014 20:53:45 +0000 (20:53 +0000)]
am f1fbe113: am 4ba1bbad: am 5fbcb134: am 35b7de4c: Merge "Cursor leakage due to cancellation signal"

* commit 'f1fbe1135a2872a7287f5c06af211cf780f16598':
  Cursor leakage due to cancellation signal

10 years agoam 4ba1bbad: am 5fbcb134: am 35b7de4c: Merge "Cursor leakage due to cancellation...
Christopher Tate [Thu, 9 Jan 2014 20:50:22 +0000 (20:50 +0000)]
am 4ba1bbad: am 5fbcb134: am 35b7de4c: Merge "Cursor leakage due to cancellation signal"

* commit '4ba1bbadb784e365f443b0272b111d384f4f2229':
  Cursor leakage due to cancellation signal

10 years agoam 5fbcb134: am 35b7de4c: Merge "Cursor leakage due to cancellation signal"
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

10 years agoam 35b7de4c: Merge "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